Continuing work on Edit/Delete

Edit too seems to work fine now