Fixed DELETE and EDIT