Added more functionality to navigation