Update templates to improve ability to style
Merge branch 'template-fixes'