Adding event back in
Set everything to use NavigationController(...)