Final bit of tidy up of generated html