Changed sections to a template