Reorganized templates

Made it so that the divs are inside the child templates so it's easier to change things.
Merge branch 'reorganize-templates'

I messed up a push. Oops.