Fixing navigation bar for smaller displays.
Merge branch 'master' into charter