Add Navbar and update Toolbar integrations