Updated NavigatorController