Additional NavBar fixes