[#60376478] make the nav bar more or less work