remove code duplication in InstrumentsDialog and NewWizard
update instrument handling