Clean up the HTML structure of layout.html a bit