Moving section HTML to template, cleaning up templates.