improved a bit the nav bar breaking behaviour