7359 navbar review

Fixes gh-7359