revised templates to match new markup from default layout
Merge branch 'update-templates' into dev