Updated NavBar from blocs prototype