Updates evaluation to use JComboBox