Updates to templating system. Changing the templates slightly