Removed unfinished visual feedback
added proper names for comboBox items.