added "Edit" and "Remove" event-handlers and methods