Fixed more of the HTML/CSS
Merge branch 'Sophie'