just moving some lines

- moved templates out of and below the #container section
- this should help make it easier to find any given template content
whitespace changes (indentation + deleting a few empty lines)