Tidy up HTML and CSS