fixed some nav-bar issues