Change to comboboxes