Fixed merge conflicts and adjusted product and category functions and scripts to evolve with design.

Fixed merge conflicts and adjusted product and category functions and scripts to evolve with design.