Fix editing. Fix binding to combox
Remove old code
Fix saving of values to JSON form