fixed some navigation issues