simple changes to templates
transitioning into multi-file templates. You know. The right way
Merged with dev-alex