Navbar improvements
more improvements