Edit and Delete Event improved