Merge "CategoryView modified to use css columns"