nav-bar fixes 7