Added navigation functionality