More wiring of navigation