Made updates to the navigation
Merge branch 'master' into gh-pages