more fixes to the nav