Navbar review

Fixes gh-7359