Navbar Improvements