! Some HTML5 validation fixes

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1399 from Arantor/release-2.1

! Some HTML5 validation fixes