Navbar improvements
More minor navbar improvements