Stuart's 2,1,3 layout and HTML5 tweaks