Fixes to Navbar