Add device selection for Navigation Mode