Some HTML fixes and remove Modernizr