Mostly style fixes and swapping to html5