[ticket/2820] Changed code to match the HTML5 standards

Alright we are out of the XHTML standard now, can someone just tell me how to add multiple commits to this PR?