A little work on the product template