fixed navigation functionality