More html fixes