Added a few fixes on product page