fix edit and delete