nav-bar fixes 2