Added some more content to the page and tweaked the links in the top-nav.
Merge branch 'gh-pages' into feature-design