Product page new fixes