Updated navigation
Merge branch 'gh-pages-v3' into gh-pages