refactored
Merge branch 'ProductPageRefactor'