diff --git a/src/components/organisms/AssetActions/Compute.tsx b/src/components/organisms/AssetActions/Compute.tsx
index 7f98f9306..d1202ec0a 100644
--- a/src/components/organisms/AssetActions/Compute.tsx
+++ b/src/components/organisms/AssetActions/Compute.tsx
@@ -128,17 +128,20 @@ export default function Compute({
       <Dropzone multiple={false} handleOnDrop={onDrop} />
 
       <div className={styles.actions}>
-        <Button
-          style="primary"
-          onClick={() => startJob()}
-          disabled={isComputeButtonDisabled}
-        >
-          {hasDatatoken ? 'Start job' : 'Buy'}
-        </Button>
+        {isLoading ? (
+          <Loader message={computeStepText} />
+        ) : (
+          <Button
+            style="primary"
+            onClick={() => startJob()}
+            disabled={isComputeButtonDisabled}
+          >
+            {hasDatatoken ? 'Start job' : 'Buy'}
+          </Button>
+        )}
       </div>
 
       <footer className={styles.feedback}>
-        {isLoading && <Loader message={computeStepText} />}
         {computeError !== undefined && (
           <Alert text={computeError} state="error" />
         )}
diff --git a/src/components/pages/History/PoolTransactions.tsx b/src/components/pages/History/PoolTransactions.tsx
index 7f68f71d1..1482662f9 100644
--- a/src/components/pages/History/PoolTransactions.tsx
+++ b/src/components/pages/History/PoolTransactions.tsx
@@ -97,8 +97,8 @@ export default function PoolTransactions(): ReactElement {
       data={logs}
       className={styles.table}
       noHeader
-      pagination={logs?.length >= 19}
-      paginationPerPage={20}
+      pagination={logs?.length >= 9}
+      paginationPerPage={10}
       noDataComponent={<Empty />}
     />
   )