Converted to new HTML structure (missed it on original pass)
Fixes for HTML5 validation.