Fix navbar toggles
Merge pull request #8058 from burnsra/3.0.0-wip-navbar-toggle

Fix navbar toggles