added combo box in table
added conditions
added a method for edit