Improved collection pages and added more facets