some tweaks to the navbar
Merge branch 'master' into release