reworked the product and collection templates