Fix HTML5 validation errors
Merge pull request #398 from ZDroid/validation

Fix HTML5 validation errors