delete action added
minimal style modifications
feature edit_and_delete merged resolved on develope