A bunch of html-validity fixes