Make 100% HTML5 compliant