Fixed navBar issue