Improvements to template.twjr.