Further fixed HTML5 BoilerPlate issues