Added NONE = not mapped state for mission and return switches
navigator: use switches to select nav state