Upgraded category list pages
Manual Merge
Manual merge