Modifications to have valid HTML5