improvements to product detail page
fix merge conflicts
fix tests
Fix merge conflicts and tests