Navbar switch fix