fixed edit and delete