Tidy up HTML, fix headers