Fix navbar on phone/tablet devices after navbar overhaul
Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul

Fix navbar on phone/tablet devices after navbar overhaul