Merge "Revert "CategoryView modified to use css columns""