NavBar fix 5.1