Refactor products pages