Use ComboBox instead of ChoiceBox