Tidy up html and css