Clean up the HTML structure of layout.html a bit
Merge pull request #207 from guidow/layout_cleanup

Clean up the HTML structure of layout.html a bit