fixes #6732 more thorough cleanup/control of navigation bar
Merge branch 'test' into prod