Updated template to fit my new design