unitsXComboBox has been changed
Moved strings to string constants