Enabling navigator, does not do anything useful yet
Fix the direction of the override switch for the new state machine