Update navigation for a wider compatibilty
Merge branch 'refactor-settings' into gh-pages