Spruce up templates

Note I disabled server-side template caching