Navbar fix #2