Updated NavBar

Done!