Finished category and product template overhaul