Navbar improvements #17034