some fixes on index page and product page