Navbar updates as requested in #58