Update layout to be HTML5 ready
Improve generated ERB markup a bit