diff --git a/src/screens/Disputes/Disputes.res b/src/screens/Disputes/Disputes.res
index b94f1d29f..6b5dcdd92 100644
--- a/src/screens/Disputes/Disputes.res
+++ b/src/screens/Disputes/Disputes.res
@@ -70,16 +70,16 @@ let make = () => {
   <div>
     <div className="flex justify-between items-center">
       <PageUtils.PageHeading title="Disputes" subTitle="View and manage all disputes" />
-      <OMPSwitchHelper.OMPViews
-        views={OMPSwitchUtils.transactionViewList(~checkUserEntity)}
-        selectedEntity={transactionEntity}
-        onChange={updateTransactionEntity}
-      />
-    </div>
-    <div className="flex w-full justify-end pb-3 gap-3">
-      <RenderIf condition={generateReport && disputesData->Array.length > 0}>
-        <GenerateReport entityName={DISPUTE_REPORT} />
-      </RenderIf>
+      <div className="flex gap-4">
+        <OMPSwitchHelper.OMPViews
+          views={OMPSwitchUtils.transactionViewList(~checkUserEntity)}
+          selectedEntity={transactionEntity}
+          onChange={updateTransactionEntity}
+        />
+        <RenderIf condition={true && disputesData->Array.length > 0}>
+          <GenerateReport entityName={DISPUTE_REPORT} />
+        </RenderIf>
+      </div>
     </div>
     <PageLoaderWrapper screenState customUI>
       <div className="flex flex-col gap-4">
diff --git a/src/screens/Refunds/Refund.res b/src/screens/Refunds/Refund.res
index 0061b00b5..07dcde526 100644
--- a/src/screens/Refunds/Refund.res
+++ b/src/screens/Refunds/Refund.res
@@ -68,11 +68,16 @@ let make = () => {
     <div className="min-h-[50vh]">
       <div className="flex justify-between items-center">
         <PageUtils.PageHeading title="Refunds" subTitle="View and manage all refunds" />
-        <OMPSwitchHelper.OMPViews
-          views={OMPSwitchUtils.transactionViewList(~checkUserEntity)}
-          selectedEntity={transactionEntity}
-          onChange={updateTransactionEntity}
-        />
+        <div className="flex gap-4">
+          <OMPSwitchHelper.OMPViews
+            views={OMPSwitchUtils.transactionViewList(~checkUserEntity)}
+            selectedEntity={transactionEntity}
+            onChange={updateTransactionEntity}
+          />
+          <RenderIf condition={generateReport && refundData->Array.length > 0}>
+            <GenerateReport entityName={REFUND_REPORT} />
+          </RenderIf>
+        </div>
       </div>
       <div className="flex justify-between gap-3">
         <div className="flex-1">
@@ -92,10 +97,6 @@ let make = () => {
             title="Refunds"
           />
         </div>
-        <RenderIf condition={generateReport && refundData->Array.length > 0}>
-          <GenerateReport entityName={REFUND_REPORT} />
-        </RenderIf>
-        <PortalCapture key={`RefundsCustomizeColumn`} name={`RefundsCustomizeColumn`} />
       </div>
       <PageLoaderWrapper screenState customUI>
         <LoadedTableWithCustomColumns