Refactor navigation watchdog