Lots of html changes
Merge and fix images