Completed productlisttemplate and categorytemplate overhaul