Fixed edit item and delete item