Navbar Update

updated navbar according to Jeff's pref