Navbar branch with latest Rizzo master.