bugfix: navbar labels
Merge branch 'master' into gh-pages
bugfix: navbar labels