Merging Ben's changes to HTML and CSS with some previous changes