Lots of html changes