diff --git a/app/Views/configlisting.php b/app/Views/configlisting.php
index 0796b75a..aec8b2ad 100755
--- a/app/Views/configlisting.php
+++ b/app/Views/configlisting.php
@@ -172,7 +172,7 @@
 
                         <td><?= $record->isActive == 1 ? 'Active' : 'InActive'; ?></td>
                         <td>
-                          <a 
+                          <a     class="edit-btn"
                                 onclick="editConfig(event)"
                                 href="<?php echo base_url() . 'configurationctrl/editconfig?ConfigID=' . $record->Config_ID; ?>"
                                 data-toggle="tooltip"
@@ -231,6 +231,18 @@
       }
     });
 
+    $('#config_list_table').on('click', '.edit-btn', function () {
+          const pageInfo = table.page.info(); // Now this works
+          sessionStorage.setItem("datatablePage", pageInfo.page);
+      });
+
+      // Restore page
+      let startPage = sessionStorage.getItem("datatablePage");
+      if (startPage !== null) {
+          table.page(parseInt(startPage)).draw('page');
+          sessionStorage.removeItem("datatablePage");
+      }
+
     // Ensure the saved page is a valid number
     let savedPage =<?= $page ?? 0 ?>; // Default to 1 if not set
           
diff --git a/app/Views/costListing.php b/app/Views/costListing.php
index a6a70462..7d49da7e 100755
--- a/app/Views/costListing.php
+++ b/app/Views/costListing.php
@@ -134,7 +134,7 @@
                                                             <i class="fa fa-key" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
                                                         </a>
                                                     <?php } else { ?>
-                                                        <a data-toggle="modal" href="#ccwizard" data-id="<?php echo $record->id; ?>"
+                                                        <a data-toggle="modal" class="edit-btn" href="#ccwizard" data-id="<?php echo $record->id; ?>"
                                                             data-name="<?php echo $record->CostCenterName; ?>"><i
                                                                 class="fas fa-edit"></i>&nbsp;&nbsp;</a>
                                                         <a onclick="confirmDelete(event)" style="cursor:pointer;" class="auditor-restricted-btn"
@@ -314,6 +314,18 @@
             }
         });
 
+          $('#cost_listing').on('click', '.edit-btn', function () {
+                const pageInfo = table.page.info(); // Now this works
+                sessionStorage.setItem("datatablePage", pageInfo.page);
+            });
+
+            // Restore page
+            let startPage = sessionStorage.getItem("datatablePage");
+            if (startPage !== null) {
+                table.page(parseInt(startPage)).draw('page');
+                sessionStorage.removeItem("datatablePage");
+            }
+
         // Date range filter function
         $.fn.dataTable.ext.search.push(
             function (settings, data, dataIndex) {
diff --git a/app/Views/departmentListing.php b/app/Views/departmentListing.php
index f3f63c6f..96e178d9 100755
--- a/app/Views/departmentListing.php
+++ b/app/Views/departmentListing.php
@@ -168,7 +168,7 @@
 
                           <?php } else { ?>
 
-                            <a 
+                            <a  class="edit-btn"
                               href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>"
                               data-toggle="tooltip"
                               title="<?php echo $record->DEPCode ?>  - Click here to View Department Details"><i
@@ -236,6 +236,19 @@
       }
     });
 
+
+    $('#department_list_table').on('click', '.edit-btn', function () {
+            const pageInfo = table.page.info(); // Now this works
+            sessionStorage.setItem("datatablePage", pageInfo.page);
+        });
+
+        // Restore page
+        let startPage = sessionStorage.getItem("datatablePage");
+        if (startPage !== null) {
+            table.page(parseInt(startPage)).draw('page');
+            sessionStorage.removeItem("datatablePage");
+        }
+
     // Date range filter function
     $.fn.dataTable.ext.search.push(
       function (settings, data, dataIndex) {
diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php
index 4cf8da5b..9670a293 100755
--- a/app/Views/editconfig.php
+++ b/app/Views/editconfig.php
@@ -196,7 +196,7 @@ if (!empty($master)) {
                                                     <!-- edit section -->
                                                      
                                                                 <a 
-                                                                    class="editConfigurationBtn"
+                                                                    class="editConfigurationBtn edit-btn"
 
                                                                     data-id="<?php echo $index; ?>"
                                                                     data-key="<?php echo $con->Key; ?>" 
@@ -840,10 +840,22 @@ if (!empty($master)) {
 <!-- data table added for the config value table -->
 <script>
       document.addEventListener("DOMContentLoaded", function () {
-            new DataTable("#configtable", {
+            var table = new DataTable("#configtable", {
                 paging: true,    // Enable Pagination
                 ordering: true,  // Enable Sorting
                 searching: true  // Enable Search
             });
+
+            // $('#datatable').on('click', '.edit-btn', function () {
+            //     const pageInfo = table.page.info(); // Now this works
+            //     sessionStorage.setItem("datatablePage", pageInfo.page);
+            // });
+
+            // // Restore page
+            // let startPage = sessionStorage.getItem("datatablePage");
+            // if (startPage !== null) {
+            //     table.page(parseInt(startPage)).draw('page');
+            //     sessionStorage.removeItem("datatablePage");
+            // }
         });
 </script>
\ No newline at end of file
diff --git a/app/Views/factoryMachineMasterDetails.php b/app/Views/factoryMachineMasterDetails.php
index a3545514..4b752a24 100644
--- a/app/Views/factoryMachineMasterDetails.php
+++ b/app/Views/factoryMachineMasterDetails.php
@@ -170,7 +170,7 @@
                                                         <?php } else { ?>
 
 
-                                                            <a data-toggle="tooltip"
+                                                            <a data-toggle="tooltip" class="edit-btn"
                                                                 href="<?php echo base_url() ?>loadView_updateFactoryMachineMasterDetail?id=<?php echo $record['id'] ?>">
                                                                 <i class="fa fa-edit" data-toggle="tooltip"
                                                                     title="Click here to Edit machine detail "></i>
@@ -241,6 +241,18 @@
             e.preventDefault();
             table.draw();
         });
+
+        $('#datatable').on('click', '.edit-btn', function () {
+            const pageInfo = table.page.info(); // Now this works
+            sessionStorage.setItem("datatablePage", pageInfo.page);
+        });
+
+        // Restore page
+        let startPage = sessionStorage.getItem("datatablePage");
+        if (startPage !== null) {
+            table.page(parseInt(startPage)).draw('page');
+            sessionStorage.removeItem("datatablePage");
+        }
     });
 </script>
 
diff --git a/app/Views/supplierListing.php b/app/Views/supplierListing.php
index 7500691f..e0df865e 100755
--- a/app/Views/supplierListing.php
+++ b/app/Views/supplierListing.php
@@ -155,7 +155,7 @@
 
                                                         <?php } else { ?>
 
-                                                            <a class="a-tag-link"
+                                                            <a class="a-tag-link edit-btn"
                                                                 href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>"
                                                                 data-toggle="tooltip"
                                                                 title="<?= $record->SupplierID ?> - Click here to edit Supplier details"><i
@@ -428,6 +428,18 @@ function formatNumberToIndianCurrency(number) {
             }
         });
 
+        $('#datatable').on('click', '.edit-btn', function () {
+            const pageInfo = table.page.info(); // Now this works
+            sessionStorage.setItem("datatablePage", pageInfo.page);
+        });
+
+        // Restore page
+        let startPage = sessionStorage.getItem("datatablePage");
+        if (startPage !== null) {
+            table.page(parseInt(startPage)).draw('page');
+            sessionStorage.removeItem("datatablePage");
+        }
+
         // Date range filter function
         $.fn.dataTable.ext.search.push(
             function (settings, data, dataIndex) {
diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php
index d9f66eb9..23930e94 100755
--- a/app/Views/transporterListing.php
+++ b/app/Views/transporterListing.php
@@ -174,10 +174,10 @@
                                                             href="<?php echo base_url() . 'reActivateTransporter?id=' . $record->id; ?>"><i
                                                                 class="fa fa-key" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;</a>
                                                     <?php } else { ?>
-                                                        <a data-toggle="modal" href="#transporterwizard"
+                                                        <a data-toggle="modal" href="#transporterwizard" 
                                                             data-id="<?php echo $record->id; ?>"
                                                             data-name="<?php echo $record->name; ?>"><i
-                                                                class="fa fa-edit"></i>&nbsp;&nbsp;</a>
+                                                                class="fa fa-edit edit-btn"></i>&nbsp;&nbsp;</a>
                                                         <a onclick="confirmDelete(event)"
                                                             href="<?php echo base_url() . 'deleteTransporter?id=' . $record->id; ?>"><i
                                                                 class="fa fa-trash auditor-restricted-btn"></i>&nbsp;&nbsp;&nbsp;</a>
@@ -351,6 +351,18 @@
             }
         });
 
+        $('#transporter_list').on('click', '.edit-btn', function () {
+            const pageInfo = table.page.info(); // Now this works
+            sessionStorage.setItem("datatablePage", pageInfo.page);
+        });
+
+        // Restore page
+        let startPage = sessionStorage.getItem("datatablePage");
+        if (startPage !== null) {
+            table.page(parseInt(startPage)).draw('page');
+            sessionStorage.removeItem("datatablePage");
+        }
+
         // Date range filter function
         $.fn.dataTable.ext.search.push(
             function (settings, data, dataIndex) {
diff --git a/app/Views/userListing.php b/app/Views/userListing.php
index 1150bddd..77693d12 100755
--- a/app/Views/userListing.php
+++ b/app/Views/userListing.php
@@ -151,7 +151,7 @@
                                                 <td>
                                                     <?php if ($record->isDeleted == 1) { ?>
                                                     <span class="auditor-restricted">
-                                                    <a class="auditor-restricted-btn" onclick="confirmReActivateUser(event)"
+                                                    <a class="auditor-restricted-btn"  onclick="confirmReActivateUser(event)"
                                                         href="<?php echo base_url() . 'user/reActivateUser?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
                                                         <i class="fas fa-key"></i>
                                                     </a>
@@ -160,7 +160,7 @@
 
                                                     <?php } else { ?>
 
-                                                    <a href="<?php echo base_url() . 'user/editOld?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
+                                                    <a class="edit-btn" href="<?php echo base_url() . 'user/editOld?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
                                                       <i class="fas fa-edit"></i>
                                                     </a> 
                                                     
@@ -207,6 +207,8 @@
         var answer = confirm(" Do you want to delete the user from the List?")
         if (answer) {return;}else{event.preventDefault();}
     }
+
+    
 </script>
 <script>
     $.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
@@ -294,6 +296,19 @@
                 toDateInput.value = fromDate;
             }
         });
+
+
+        $('#user_list_table').on('click', '.edit-btn', function () {
+            const pageInfo = table.page.info(); // Now this works
+            sessionStorage.setItem("datatablePage", pageInfo.page);
+        });
+
+        // Restore page
+        let startPage = sessionStorage.getItem("datatablePage");
+        if (startPage !== null) {
+            table.page(parseInt(startPage)).draw('page');
+            sessionStorage.removeItem("datatablePage");
+        }
     });
 
 </script>
@@ -303,4 +318,6 @@
         console.log("Checkbox changed, submitting form...");
         $("#archiveFormId").submit();
     });
-</script>
\ No newline at end of file
+</script>
+
+