Fixed HTML5 validation errors, closes #693