fixing some navigation functionality