fixed all the nav issue