Move HTML to pages branch, tweak some css for mobile
Make some tweaks to toby's merge
Merge Toby's changes