Improve options UI in angular instrument creation refactor