[#84108742] product page refactor