Merge "Category view modified to use column width"