fix some navigation issues