NavBar improvements