tidied up pages and transitions
Merge branch 'master' into gh-pages