Fixed more of the HTML/CSS
mockup met sitemap
Merge branch 'Sophie'
Merge branch 'Bas'