UI Navbar improvements