tidy up the home template structure