fixed some navigation functionality