Refactoring of category and product pages