Make navigating event driven