Improve UI of the Instrument Selector [consolidated patch]