Navbar changes, bug fixes recorded on bugzilla