Small DOM changes to template files