Feature/template redesign

Template Redesign done. Merging back into develop.