some nav-bar fixes