make navigator better