Changed the layout a bit to look more balanced out.
Merge branch 'master' into gh-pages