6/9 index page nav bar fix
Merge branch 'master' into gh-pages