Added navigation
Merge branch 'navigation' into gh-pages