Updates to template formatting