Fix item edit and delete