+ NavBar improvements