HTML Validation Improvements

Improvements to the markup to match HTML5 standards.