Product page fixes