fixes #6732 more thorough cleanup/control of navigation bar