diff --git a/new-lamassu-admin/src/components/tables/DataTable.js b/new-lamassu-admin/src/components/tables/DataTable.js
index 2c49c7b9..1855a234 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.js
+++ b/new-lamassu-admin/src/components/tables/DataTable.js
@@ -54,7 +54,7 @@ const Row = ({
           size={size}
           className={classnames(trClasses)}
           onClick={() => {
-            expandable && expandRow(id)
+            expandable && expandRow(id, data)
             onClick && onClick(data)
           }}
           error={data.error}
@@ -67,7 +67,7 @@ const Row = ({
           {expandable && (
             <Td width={expWidth} textAlign="center">
               <button
-                onClick={() => expandRow(id)}
+                onClick={() => expandRow(id, data)}
                 className={classes.expandButton}>
                 {expanded && <ExpandOpenIcon />}
                 {!expanded && <ExpandClosedIcon />}
@@ -112,9 +112,14 @@ const DataTable = ({
 
   const classes = useStyles({ width })
 
-  const expandRow = id => {
-    cache.clear(id)
-    setExpanded(id === expanded ? null : id)
+  const expandRow = (id, data) => {
+    if (data.id) {
+      cache.clear(data.id)
+      setExpanded(data.id === expanded ? null : data.id)
+    } else {
+      cache.clear(id)
+      setExpanded(id === expanded ? null : id)
+    }
   }
 
   const cache = new CellMeasurerCache({
@@ -135,12 +140,16 @@ const DataTable = ({
             <Row
               width={width}
               size={rowSize}
-              id={index}
+              id={data[index].id ? data[index].id : index}
               expWidth={expWidth}
               elements={elements}
               data={data[index]}
               Details={Details}
-              expanded={index === expanded}
+              expanded={
+                data[index].id
+                  ? data[index].id === expanded
+                  : index === expanded
+              }
               expandRow={expandRow}
               expandable={expandable}
               onClick={onClick}
diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Transactions/Transactions.js
index fa0b148b..17f22212 100644
--- a/new-lamassu-admin/src/pages/Transactions/Transactions.js
+++ b/new-lamassu-admin/src/pages/Transactions/Transactions.js
@@ -68,7 +68,8 @@ const Transactions = () => {
   const { data: txResponse, loading } = useQuery(GET_TRANSACTIONS, {
     variables: {
       limit: NUM_LOG_RESULTS
-    }
+    },
+    pollInterval: 10000
   })
 
   const redirect = customerId => {