product templates
js stuff
fixing merge conflicts