Tidy up form html

(hopefully)