HTML5 validation

- Various fixes to ensure the markup validates