Some clean up in the html and css