Edit Add Delete fix