HTML and CSS tidy-up