Navbar: Fixed #33