Started Styling, also tidied up a lot of code/markup
Merge branch 'master' into gh-pages