CSS and markup tidy up