Finishing touches on EDiting and deleting