working comboBox
consolidated textfields into two actions