modified navigation functionality