Changes to product page and category page

Changes to category page, product page