diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 2e8d6fb3..96252c3f 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -3,6 +3,13 @@
 use CodeIgniter\Router\RouteCollection;
 
 
+
+// Allow OPTIONS for all routes
+$routes->options('(:any)', function() {
+    // This will never be called because the CORS filter returns early
+    // But having this route ensures OPTIONS isn't rejected as 404
+});
+
 /**
  * @var RouteCollection $routes
  */
diff --git a/app/Controllers/RuleImportController.php b/app/Controllers/RuleImportController.php
index 1fc562b9..d1647bae 100644
--- a/app/Controllers/RuleImportController.php
+++ b/app/Controllers/RuleImportController.php
@@ -37,6 +37,7 @@ class RuleImportController extends AdminController
             'motor' => [
                 'department',
                 'vehicle_type',
+                'vehicle_sub_type',
                 'policy_type',
                 'vehicle_age',
                 'is_new_vehicle',
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 29f89df4..d0151013 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -108,7 +108,7 @@ class ThzController extends BaseController
 
             $data = $this->request->getGet();
 
-            if ($returnType === 'web' && in_array(get_role_id(), [3, 4])) {
+            if ($returnType === 'web' && in_array(get_role_id(), [4])) {
                 $data['assign_to'] = $data['assign_to'] ?? get_session_userid();
             }
 
diff --git a/app/Libraries/RuleImportService.php b/app/Libraries/RuleImportService.php
index cebc2e9f..33fdab3d 100644
--- a/app/Libraries/RuleImportService.php
+++ b/app/Libraries/RuleImportService.php
@@ -1111,31 +1111,31 @@ class RuleImportService
         if ($weightMin !== '' && $weightMax !== '') {
             if ($weightMin === $weightMax) {
                 $conditions[] = [
-                    'field' => 'vehicle_weight',
+                    'field' => 'weight',
                     'operator' => '==',
                     'value' => (float)$weightMin
                 ];
             } else {
                 $conditions[] = [
-                    'field' => 'vehicle_weight',
+                    'field' => 'weight',
                     'operator' => '>=',
                     'value' => (float)$weightMin
                 ];
                 $conditions[] = [
-                    'field' => 'vehicle_weight',
+                    'field' => 'weight',
                     'operator' => '<=',
                     'value' => (float)$weightMax
                 ];
             }
         } elseif ($weightMin !== '') {
             $conditions[] = [
-                'field' => 'vehicle_weight',
+                'field' => 'weight',
                 'operator' => '>=',
                 'value' => (float)$weightMin
             ];
         } elseif ($weightMax !== '') {
             $conditions[] = [
-                'field' => 'vehicle_weight',
+                'field' => 'weight',
                 'operator' => '<=',
                 'value' => (float)$weightMax
             ];
@@ -1147,13 +1147,13 @@ class RuleImportService
             
             if (count($states) > 1) {
                 $conditions[] = [
-                    'field' => 'rto_state',
+                    'field' => 'geo_rto_state',
                     'operator' => 'in',
                     'value' => $states
                 ];
             } else {
                 $conditions[] = [
-                    'field' => 'rto_state',
+                    'field' => 'geo_rto_state',
                     'operator' => '==',
                     'value' => $states[0]
                 ];
@@ -1166,13 +1166,13 @@ class RuleImportService
             
             if (count($cities) > 1) {
                 $conditions[] = [
-                    'field' => 'rto_city',
+                    'field' => 'geo_rto_city',
                     'operator' => 'in',
                     'value' => $cities
                 ];
             } else {
                 $conditions[] = [
-                    'field' => 'rto_city',
+                    'field' => 'geo_rto_city',
                     'operator' => '==',
                     'value' => $cities[0]
                 ];
@@ -1191,7 +1191,7 @@ class RuleImportService
         // Policy Name
         if (!empty($rowData[self::COL_POLICY_NAME])) {
             $conditions[] = [
-                'field' => 'policy_name',
+                'field' => 'product',
                 'operator' => '==',
                 'value' => $this->sanitize($rowData[self::COL_POLICY_NAME])
             ];
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index a991670d..01db38eb 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -339,6 +339,7 @@ table.dataTable tbody td {
         border: 1px solid #ddd;   /* matches border-width:1px */
         padding: 3px;
     }
+    .dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -440,7 +441,7 @@ table.dataTable tbody td {
                                     <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cd =  date("j F Y", strtotime($row['created_at']));
-                                        $ct =  date("h:i a", strtotime($row['created_at']));
+                                        $ct =  date("h:i A", strtotime($row['created_at']));
                                         echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
                                         endif;
                                     ?>
@@ -448,7 +449,7 @@ table.dataTable tbody td {
                                     <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $ud =  date("j F Y", strtotime($row['updated_at']));
-                                        $ut =  date("h:i a", strtotime($row['updated_at']));
+                                        $ut =  date("h:i A", strtotime($row['updated_at']));
                                         echo $ud . "<br><span class='time'> " . $ut . "</span>"; 
                                         endif;
                                     ?>
@@ -863,7 +864,7 @@ table.dataTable tbody td {
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
             dom: "<'row'<'col-sm-3'f><'col-sm-9'B>>" + 
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                 // {
diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php
index 034923f6..ff3770a1 100755
--- a/app/Views/add_image_list.php
+++ b/app/Views/add_image_list.php
@@ -16,6 +16,9 @@ table.dataTable thead th {
 
     max-width: 98% !important;
 }
+
+.dataTables_length label {height: 21px !important;}
+
 </style>
 
 <div class="row" id="client_list">
@@ -227,7 +230,7 @@ $(document).ready(function() {
         //      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
         dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
              "<'row'<'col-sm-12'tr>>" +
-             "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+             "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         buttons: [
             {
diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php
index 7e66110d..123950fb 100755
--- a/app/Views/batch_list.php
+++ b/app/Views/batch_list.php
@@ -13,6 +13,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
 }
+.dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="col-12" id="second_page">
@@ -241,7 +242,7 @@
             // },
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [{
                         extend: 'collection',
diff --git a/app/Views/bds_multi_report.php b/app/Views/bds_multi_report.php
index 69d3b787..dab4e951 100644
--- a/app/Views/bds_multi_report.php
+++ b/app/Views/bds_multi_report.php
@@ -19,6 +19,7 @@
     .right-align-input {
         text-align: right;
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 
@@ -94,7 +95,7 @@
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                 {
diff --git a/app/Views/bds_renewal_report_list.php b/app/Views/bds_renewal_report_list.php
index d1dd8c17..c4873dda 100644
--- a/app/Views/bds_renewal_report_list.php
+++ b/app/Views/bds_renewal_report_list.php
@@ -14,6 +14,8 @@ table.dataTable tbody td {
     table[data-custom-table-css="table"].dataTable thead th {
         padding-right: 20px !important;
     }
+    .dataTables_length label {height: 21px !important;}
+
 </style>
 
 <div class="col-12" id="inception_list">    
@@ -122,7 +124,7 @@ $(document).ready(function() {
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
             {
diff --git a/app/Views/bds_report_Insurer_wise_Data.php b/app/Views/bds_report_Insurer_wise_Data.php
index a6e6e2a9..b122a7e1 100644
--- a/app/Views/bds_report_Insurer_wise_Data.php
+++ b/app/Views/bds_report_Insurer_wise_Data.php
@@ -23,6 +23,7 @@ table.dataTable tbody td {
 #scroll-horizontal-datatable tfoot .right-align-input {
     text-align: right !important;
 }
+.dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="col-12">
@@ -79,7 +80,7 @@ table.dataTable tbody td {
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/bds_report_bap_wise_data.php b/app/Views/bds_report_bap_wise_data.php
index 8a5b467a..812f0abf 100644
--- a/app/Views/bds_report_bap_wise_data.php
+++ b/app/Views/bds_report_bap_wise_data.php
@@ -23,6 +23,7 @@ table.dataTable tbody td {
 #scroll-horizontal-datatable tfoot .right-align-input {
     text-align: right !important;
 }
+.dataTables_length label {height: 21px !important;}
 
 
 </style>
@@ -81,7 +82,7 @@ table.dataTable tbody td {
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/bds_tat_wise_report.php b/app/Views/bds_tat_wise_report.php
index 41f85f71..6d904cec 100644
--- a/app/Views/bds_tat_wise_report.php
+++ b/app/Views/bds_tat_wise_report.php
@@ -19,6 +19,7 @@
     .right-align-input {
         text-align: right;
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 
@@ -109,7 +110,7 @@
                 // ],
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php
index c00fcd6e..3a91bf1e 100644
--- a/app/Views/business_team_list.php
+++ b/app/Views/business_team_list.php
@@ -43,6 +43,7 @@
         color: #16181b !important;
         cursor: pointer !important;
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 
@@ -343,7 +344,7 @@
             //      "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                 {
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index 30c20b60..139a0c75 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -51,6 +51,8 @@ table.dataTable thead th {
 .dataTables_filter {
     position: absolute;
 }
+.dataTables_length label {height: 21px !important;}
+
 
 </style>
 
@@ -222,7 +224,7 @@ table.dataTable thead th {
         //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + 
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [  
               {
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index a2f27a80..696d97ce 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -21,6 +21,7 @@
         position: absolute;
     }
 
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <!-- <div class="row">
@@ -90,7 +91,7 @@
                                 <td style="overflow: hidden;" class="reload truncate" data-toggle="tooltip" data-placement="top" title="<?php echo $file['file_name'] ?>">
                                     <?php echo $file['file_name'] ?>
                                 </td>
-                                <td><?php echo change_date_format($file['created_at'], 'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $file['user_name'] . '</strong>' ?> </td>
+                                <td><?php echo change_date_format($file['created_at'], 'Y-m-d H:i:s', 'd M Y h:i A') . ' by <strong>' . $file['user_name'] . '</strong>' ?> </td>
                                 <td>
                                     <?php if ($file['status'] == "failed") { ?>
                                         <span style="color : #BD0707 ;"> <?= $file['status'] ?> </span> 
@@ -289,7 +290,7 @@
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/claims_report_acc_manager_wise.php b/app/Views/claims_report_acc_manager_wise.php
index 066514d9..20da49f2 100644
--- a/app/Views/claims_report_acc_manager_wise.php
+++ b/app/Views/claims_report_acc_manager_wise.php
@@ -18,6 +18,9 @@
     #scroll-horizontal-datatable tbody tr:hover {
         background-color: #e0e0e0;
     }
+
+    .dataTables_length label {height: 21px !important;}
+
 </style>
 
 <div class="col-12">
@@ -89,7 +92,7 @@
                 //      "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + 
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/claims_report_tpa_wise.php b/app/Views/claims_report_tpa_wise.php
index 55711b3e..0293a466 100644
--- a/app/Views/claims_report_tpa_wise.php
+++ b/app/Views/claims_report_tpa_wise.php
@@ -15,6 +15,7 @@
     .right-align-input {
         text-align: right;
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="col-12">
@@ -87,7 +88,7 @@
                 //      "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + 
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/client_deposit_list.php b/app/Views/client_deposit_list.php
index 10aa6c74..7dc309e9 100755
--- a/app/Views/client_deposit_list.php
+++ b/app/Views/client_deposit_list.php
@@ -72,7 +72,7 @@ $(document).ready(function() {
         // dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>",
         dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>",
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         buttons: [
                     {
@@ -115,6 +115,7 @@ $(document).ready(function() {
         },
 
     });
+    $('.dataTables_length label').css('height', '21px');
 
 })
 </script>
\ No newline at end of file
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index 0df5b975..798bfaa8 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -65,6 +65,8 @@ table.dataTable thead th {
     text-decoration: underline ;
 }
 
+.dataTables_length label {height: 21px !important;}
+
 
 
 
@@ -303,7 +305,7 @@ $(document).ready(function()
         //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
         dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         buttons: [
             {
diff --git a/app/Views/commission_file_upload.php b/app/Views/commission_file_upload.php
index 4bec2202..7d1ca6fd 100644
--- a/app/Views/commission_file_upload.php
+++ b/app/Views/commission_file_upload.php
@@ -144,6 +144,9 @@
         color: #16181b !important;
         cursor: pointer !important;
     }
+
+    .dataTables_length label {height: 21px !important;}
+
 </style>
 
 <div class="row" id="inception_list">
@@ -179,7 +182,7 @@
                                             <td><?php echo ucfirst($row['department']) ?> </td>
                                             <td><?php echo $row['rules_count'] ?></td>
                                             <td><?php echo ucfirst($row['file_status']) ?> </td>
-                                            <td><?php echo change_date_format($row['created_at'],'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $row['created_user_name'] . '</strong>' ?>
+                                            <td><?php echo change_date_format($row['created_at'],'Y-m-d H:i:s', 'd M Y h:i A') . ' by <strong>' . $row['created_user_name'] . '</strong>' ?>
                                             <td>
                                                 <div class="btn-group dropdown">
                                                     <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
@@ -377,7 +380,7 @@
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [{
                     text: 'Upload <i class="mdi mdi-upload"></i>',
diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php
index d09d3062..f3e1bad0 100644
--- a/app/Views/dms_search.php
+++ b/app/Views/dms_search.php
@@ -22,6 +22,9 @@
     .autocomplete-suggestion:hover {
         background-color: #e9e9e9;
     }
+
+    .dataTables_length label {height: 21px !important;}
+
 </style>
 
 <div class="row">
@@ -178,7 +181,7 @@
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
                 dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [{
                     extend: 'collection',
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index f01ca1dc..9bdc75d5 100755
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -76,6 +76,9 @@
         border-radius: 5px;
         box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
     }
+
+    .dataTables_length label {height: 21px !important;}
+
 </style>
 
 <?php $pro_rata_total = 0; $gst_total = 0 ?>
@@ -346,7 +349,7 @@
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php
index 8eb95ddd..a5535107 100755
--- a/app/Views/endorsement_list.php
+++ b/app/Views/endorsement_list.php
@@ -12,6 +12,8 @@
         position: relative;
         left: 79px;
     }
+    .dataTables_length label {height: 21px !important;}
+
 </style>
 
 <div class="container-fluid-min">
@@ -599,7 +601,7 @@
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [{
                     text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index aec37e3e..2086aeef 100755
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -8,6 +8,9 @@
     cursor: pointer;
 }
 
+.dataTables_length label {height: 21px !important;}
+
+
 </style>
 
 <div class="col-12">
@@ -469,7 +472,7 @@ $(document).ready(function() {
         //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
         dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         buttons: [{
                         extend: 'collection',
diff --git a/app/Views/finance_team_list.php b/app/Views/finance_team_list.php
index 70855a6e..d80aaad5 100644
--- a/app/Views/finance_team_list.php
+++ b/app/Views/finance_team_list.php
@@ -43,6 +43,8 @@
         color: #16181b !important;
         cursor: pointer !important;
     }
+    .dataTables_length label {height: 21px !important;}
+
 </style>
 
 
@@ -342,7 +344,7 @@ $(document).ready(function () {
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                 {
diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php
index 4ecfdd28..00b45f96 100644
--- a/app/Views/hr_activity_history.php
+++ b/app/Views/hr_activity_history.php
@@ -47,6 +47,8 @@ table.dataTable tbody td {
 #hr_activity_history_append_area tbody tr {
   background-color: transparent !important;
 }
+.dataTables_length label {height: 21px !important;}
+
 
 </style>
 
@@ -103,7 +105,7 @@ $(document).ready(function () {
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             language: {
                 search: `
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 4fe317a2..5df2f43e 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -3,6 +3,8 @@
         padding: 5px 7px 5px 0 !important;
         color: #000000;
     }
+    .dataTables_length label {height: 21px !important;}
+
 </style>
 
 <div class="tab-pane fade" id="HR-DOC-tab">
@@ -143,7 +145,7 @@
                         <td><?php echo $file['branch_name'] ?></td>
                         <td><?php echo $file['policy_no'] ?></td>
                         <td><?php echo $file['file_action'] ?></td>
-                        <td><?php echo change_date_format($file['created_at'],'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $file['first_name'] . '</strong>' ?></td>
+                        <td><?php echo change_date_format($file['created_at'],'Y-m-d H:i:s', 'd M Y h:i A') . ' by <strong>' . $file['first_name'] . '</strong>' ?></td>
                         <td><?php echo $file['status']; ?> </td>
                         <td> </td>
                     </tr>
@@ -361,7 +363,7 @@
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [{
                         extend: 'collection',
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 977455a5..5a25fd9e 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -37,6 +37,9 @@
     color: white;
     border: 1px solid rgba(41, 139, 142, 1);
   }
+
+  .dataTables_length label {height: 21px !important;}
+
 </style>
 
 <div class="container-fluid-min">
@@ -187,7 +190,7 @@
         // "<'row'<'col-sm-5'i><'col-sm-7'p>>",
         dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         buttons: [
                     {
diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php
index b0c05935..3728bfff 100644
--- a/app/Views/insurer_statement_list.php
+++ b/app/Views/insurer_statement_list.php
@@ -279,7 +279,7 @@
                                             </span>
 
                                         </td>
-                                        <td><?php echo change_date_format($row['created_at'], 'Y-m-d H:i:s', 'd M Y h:i a') . ' <br> by ' . $row['first_name'] ?></td>
+                                        <td><?php echo change_date_format($row['created_at'], 'Y-m-d H:i:s', 'd M Y h:i A') . ' <br> by ' . $row['first_name'] ?></td>
                                         <td>
                                             <?php if ($row['file_status'] != 'failed') { ?>
                                                 <div class="btn-group dropdown">
diff --git a/app/Views/invoice_policy_mapping_add.php b/app/Views/invoice_policy_mapping_add.php
index a49cf30c..d0160a1a 100755
--- a/app/Views/invoice_policy_mapping_add.php
+++ b/app/Views/invoice_policy_mapping_add.php
@@ -52,6 +52,8 @@ table.dataTable tbody td { padding: 4px 4px !important; }
     .summary-info{width:100%;justify-content:space-around;} 
     .summary-actions{width:100%;} 
 }
+.dataTables_length label {height: 21px !important;}
+
 </style>
 
 <!-- ---- HTML structure remains mostly same ---- -->
@@ -223,7 +225,7 @@ table.dataTable tbody td { padding: 4px 4px !important; }
             dom:
                 "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                 {
@@ -349,7 +351,7 @@ table.dataTable tbody td { padding: 4px 4px !important; }
             dom:
                 "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                 {
diff --git a/app/Views/irda_bap_client_report_list.php b/app/Views/irda_bap_client_report_list.php
index 213423bf..d260a3ab 100644
--- a/app/Views/irda_bap_client_report_list.php
+++ b/app/Views/irda_bap_client_report_list.php
@@ -34,6 +34,7 @@ table.dataTable tbody td {
 #scroll-horizontal-datatable tfoot .right-align-input {
     text-align: right !important;
 }
+.dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -211,7 +212,7 @@ $(document).ready(function() {
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                     {
diff --git a/app/Views/irda_bap_insurer_report_list.php b/app/Views/irda_bap_insurer_report_list.php
index 5b2f2ad9..d02891af 100644
--- a/app/Views/irda_bap_insurer_report_list.php
+++ b/app/Views/irda_bap_insurer_report_list.php
@@ -24,6 +24,7 @@ table.dataTable tbody td {
 #scroll-horizontal-datatable tfoot .right-align-input {
     text-align: right !important;
 }
+.dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="col-12" id="second_page">
@@ -297,7 +298,7 @@ $(document).ready(function() {
             // ],
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                     {
diff --git a/app/Views/irda_client_report_list.php b/app/Views/irda_client_report_list.php
index aca84738..468dc7c0 100644
--- a/app/Views/irda_client_report_list.php
+++ b/app/Views/irda_client_report_list.php
@@ -20,6 +20,7 @@ table.dataTable tbody td {
 .right-align-input {
     text-align: right;
 }
+.dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="col-12" id="second_page">
@@ -133,7 +134,7 @@ $(document).ready(function() {
             // ],
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                     {
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index 54ca556f..fff20bdc 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -38,7 +38,7 @@
     color: white;
     border:1px solid  rgba(41, 139, 142, 1);
 }
-
+.dataTables_length label {height: 21px !important;}
 </style>
 <div class="row" id="kyc_list">
     <div class="col-12">
@@ -181,7 +181,7 @@
         //       "<'row'<'col-sm-5'i><'col-sm-7'p>>" ,
         dom:  "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + 
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         buttons: [
                     {
diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php
index 0ab3ab13..896a1117 100644
--- a/app/Views/leads_list.php
+++ b/app/Views/leads_list.php
@@ -139,7 +139,7 @@ table.dataTable tbody td {
     font-size: 0.9rem;
     padding: 0.5rem 1rem;
 }
-
+.dataTables_length label {height: 21px !important;}
 /* Modeal class */
 
 </style>
@@ -463,7 +463,7 @@ table.dataTable tbody td {
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [            
                     {
diff --git a/app/Views/mail_test.php b/app/Views/mail_test.php
index 776909d3..e7d19666 100755
--- a/app/Views/mail_test.php
+++ b/app/Views/mail_test.php
@@ -8,7 +8,7 @@
             </div>
             <div class="form-group">
                 <label for="subject">Subject:</label>
-                <input type="text" class="form-control" id="subject" name="subject" value="Gmail API Test - . <?php echo date('Y-m-d h:i:s');?>" required>
+                <input type="text" class="form-control" id="subject" name="subject" value="Gmail API Test - . <?php echo date('Y-m-d h:i:s A');?>" required>
             </div>
             <div class="form-group">
                 <label for="content">Content:</label>
diff --git a/app/Views/nhance_branch_list.php b/app/Views/nhance_branch_list.php
index 3f8b2941..ba1536bf 100644
--- a/app/Views/nhance_branch_list.php
+++ b/app/Views/nhance_branch_list.php
@@ -2,6 +2,7 @@
 .dataTables_filter {
     position: absolute;
 }
+.dataTables_length label {height: 21px !important;}
 </style>
 
 <!-- End ADD and EDIT Page HTML -->
@@ -99,7 +100,7 @@
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [            
                 {
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index 2540df0c..ac91143f 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -33,6 +33,7 @@
         padding-right: 15px !important;
         padding-left: 15px !important;
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="container-fluid-min">
@@ -183,7 +184,7 @@
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [{
                     extend: 'collection',
diff --git a/app/Views/payout_list.php b/app/Views/payout_list.php
index a60b63e5..e81a2897 100644
--- a/app/Views/payout_list.php
+++ b/app/Views/payout_list.php
@@ -176,6 +176,7 @@
         min-height: 40px;
         vertical-align: middle;
     }
+    .dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -306,7 +307,7 @@
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index 35bc182c..5d739144 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -164,6 +164,7 @@ table.dataTable thead th {
     .slider.round:before {
         border-radius: 50%;
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="container-fluid-min">
@@ -495,7 +496,7 @@ table.dataTable thead th {
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [            
                    {
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index 762a656d..4a0b6e29 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -142,6 +142,7 @@ table.dataTable tbody td {
     #inception_list{
         margin-left:20px !important;
     }
+    .dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -567,7 +568,7 @@ $(document).ready(function() {
             //         "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [            
                    {
diff --git a/app/Views/policy_type_list.php b/app/Views/policy_type_list.php
index 163a0a83..eeccbb28 100755
--- a/app/Views/policy_type_list.php
+++ b/app/Views/policy_type_list.php
@@ -65,6 +65,7 @@
     z-index: -2;
     pointer-events: none;
   }
+  .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="container-fluid-min">
@@ -232,7 +233,7 @@
         // ],
         dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         buttons: [
                     {
diff --git a/app/Views/report_bds.php b/app/Views/report_bds.php
index 1d0a298a..19e071c7 100644
--- a/app/Views/report_bds.php
+++ b/app/Views/report_bds.php
@@ -33,7 +33,7 @@ table.dataTable tbody td {
   flex-wrap: wrap;
   gap: 8px;
 }
-
+.dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -288,7 +288,7 @@ $(document).ready(function() {
             // ],
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
             {
diff --git a/app/Views/report_bds_new.php b/app/Views/report_bds_new.php
index e6ef2f89..1bb808aa 100644
--- a/app/Views/report_bds_new.php
+++ b/app/Views/report_bds_new.php
@@ -33,6 +33,7 @@
     flex-wrap: wrap;
     gap: 8px;
     }
+    .dataTables_length label {height: 21px !important;}
 
 
     </style>
@@ -357,7 +358,7 @@
                 // ],
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                 {
diff --git a/app/Views/report_bds_old.php b/app/Views/report_bds_old.php
index cd5a3db1..52d16677 100644
--- a/app/Views/report_bds_old.php
+++ b/app/Views/report_bds_old.php
@@ -20,6 +20,7 @@ table.dataTable tbody td {
 .right-align-input {
     text-align: right;
 }
+.dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="col-12" id="second_page">
@@ -154,7 +155,7 @@ $(document).ready(function() {
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                 {
diff --git a/app/Views/retail_endorsement_list.php b/app/Views/retail_endorsement_list.php
index 046dbb37..d01de408 100755
--- a/app/Views/retail_endorsement_list.php
+++ b/app/Views/retail_endorsement_list.php
@@ -28,6 +28,7 @@
         color: #00999E !important;
         transform: scale(1.5);
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="container-fluid-min">
@@ -140,7 +141,7 @@
                                         <td class="text-center"><?php echo $employee['manager_name'] ?? 'N/A' ?></td>
                                         <td class="text-center"><?php if (!empty($employee['created_at'])):
                                                                     $cd =  date("j F Y", strtotime($employee['created_at']));
-                                                                    $ct =  date("h:i a", strtotime($employee['created_at']));
+                                                                    $ct =  date("h:i A", strtotime($employee['created_at']));
                                                                     echo $cd . "<br><span class='time'> " . $ct . "</span>";
                                                                 endif; ?></td>
                                         <td class="text-center"><?php if ($employee['status'] == 'open') {
@@ -363,7 +364,7 @@
             // }],
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [{
                 extend: 'collection',
diff --git a/app/Views/rto_master_list.php b/app/Views/rto_master_list.php
index 375f6dbf..f95d688b 100644
--- a/app/Views/rto_master_list.php
+++ b/app/Views/rto_master_list.php
@@ -1,7 +1,6 @@
 <style>
-.dataTables_filter {
-    position: absolute;
-}
+.dataTables_filter {position: absolute;}
+.dataTables_length label {height: 21px !important;}
 </style>
 
 <!-- End ADD and EDIT Page HTML -->
@@ -122,7 +121,7 @@
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [            
                 {
diff --git a/app/Views/tat_report_band_wise_list.php b/app/Views/tat_report_band_wise_list.php
index 3dc50a4a..d75b74d2 100644
--- a/app/Views/tat_report_band_wise_list.php
+++ b/app/Views/tat_report_band_wise_list.php
@@ -17,6 +17,7 @@
     .right-align-input {
         text-align: right;
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="col-12" id="second_page">
@@ -113,7 +114,7 @@
                 // ],
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {
diff --git a/app/Views/test_members_list.php b/app/Views/test_members_list.php
index d2e1c968..4f880091 100644
--- a/app/Views/test_members_list.php
+++ b/app/Views/test_members_list.php
@@ -120,7 +120,7 @@ th:first-child, td:first-child {
     background-color:#00999E ;
     margin-right:10px;
 }
-
+.dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -544,7 +544,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [{
                     text:'Map Employees',
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index d1af303b..dde7ad77 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -35,6 +35,20 @@ table.dataTable tbody td {
   color: #6c757d !important; 
 }
 
+/* don't erase it. keep it safe
+beccause = dataTables_length and dataTables_paginate need in same line thats why i tried in css ... 
+.dataTables_info,
+.dataTables_length,
+.dataTables_paginate {
+    display: flex;
+    align-items: center;
+} */
+
+.dataTables_length label {
+    height: 21px !important;
+}
+
+
 </style>
 
 <div class="row" id="ticket_list">
@@ -86,7 +100,7 @@ table.dataTable tbody td {
                                     <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cd =  date("j M Y", strtotime($row['created_at']));
-                                        $ct =  date("h:i a", strtotime($row['created_at']));
+                                        $ct =  date("h:i A", strtotime($row['created_at']));
                                         echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
                                         endif;
                                     ?>
@@ -94,7 +108,7 @@ table.dataTable tbody td {
                                     <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $ud =  date("j M Y", strtotime($row['updated_at']));
-                                        $ut =  date("h:i a", strtotime($row['updated_at']));
+                                        $ut =  date("h:i A", strtotime($row['updated_at']));
                                         echo $ud . "<br><span class='time'> " . $ut . "</span>"; 
                                         endif;
                                     ?>
@@ -325,7 +339,7 @@ table.dataTable tbody td {
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [            
                    {
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index b3d26b07..959a1633 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -274,7 +274,7 @@ hr{
                                         <!-- Bottom Row: Name + Date -->
                                         <div class="d-flex justify-content-between small text-muted" style="padding-top: 5px;">
                                             <span class="" style="font-weight: 400 !important;"><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
-                                            <span style="font-size:9px; font-weight: 400 !important;" class=""><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
+                                            <span style="font-size:9px; font-weight: 400 !important;" class=""><?= date("j F Y h:i A", strtotime($conv['created_at'])) ?></span>
                                         </div>
 
                                         <!-- <?php echo $i < count($notes)-1 ? '<hr/>' : ''; ?> -->
@@ -410,7 +410,7 @@ data-backdrop="static"
                                 <small classs="" style="font-size:7px;">
                                     <?php if (!empty($rt['created_at'])):
                                         $cd =  date("j F Y", strtotime($rt['created_at']));
-                                        $ct =  date("h:i a", strtotime($rt['created_at']));
+                                        $ct =  date("h:i A", strtotime($rt['created_at']));
                                         echo $cd . "  " . $ct; 
                                         endif;
                                     ?>
diff --git a/app/Views/ticket_conversation.php b/app/Views/ticket_conversation.php
index 6f4ddcdb..57d8370f 100644
--- a/app/Views/ticket_conversation.php
+++ b/app/Views/ticket_conversation.php
@@ -23,7 +23,7 @@
             </div>
             <div class="col">
                 <div class="mb-3">
-                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i a');?></div>
+                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i A');?></div>
                 </div>
                 <div id="msg_388" class="form-group">
                     <p><?= $message['mail_content'] ?></p> 
@@ -69,7 +69,7 @@
             </div>
             <div class="col">
                 <div class="mb-3">
-                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i a');?></div>
+                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i A');?></div>
                 </div>
                 <div id="msg_394" class="form-group">
                     <p><?= $message['mail_content'] ?></p>
diff --git a/app/Views/ticket_feedback_list.php b/app/Views/ticket_feedback_list.php
index 98949761..048c3663 100644
--- a/app/Views/ticket_feedback_list.php
+++ b/app/Views/ticket_feedback_list.php
@@ -34,7 +34,7 @@ table.dataTable tbody td {
     text-overflow: ellipsis !important;
     white-space: nowrap !important;
 }
-
+.dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -114,7 +114,7 @@ $(document).ready(function() {
             // ],
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
               {
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index f59eab7b..c6ddf052 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -372,7 +372,8 @@
                                             <div class="form-group col-md-3 approved" style="display: none;">
                                                 <label class="label-font-size" for="approved_amount">Approved Amount</label> #
                                                 <input type="text" class="form-control" id="approved_amount" placeholder="Enter Approved Amount"
-                                                    value="<?= isset($ticket_data['approved_amount']) ? $ticket_data['approved_amount'] : '' ?>" name="approved_amount">
+                                                    value="<?= isset($ticket_data['approved_amount']) ? $ticket_data['approved_amount'] : '' ?>" name="approved_amount"
+                                                    oninput="this.value = this.value.replace(/[^0-9]/g, '');">
                                             </div>
 
                                             <div class="form-group col-md-3 approved" style="display: none;">
diff --git a/app/Views/ticket_form_handler.php b/app/Views/ticket_form_handler.php
index 149a9150..6d842f97 100644
--- a/app/Views/ticket_form_handler.php
+++ b/app/Views/ticket_form_handler.php
@@ -54,7 +54,7 @@
     }
 ?>
 
-<div class="modal fade" id="empDetailsModal" role="dialog" aria-labelledby="empDetailsModalLabel" aria-hidden="true">
+<!-- <div class="modal fade" id="empDetailsModal" role="dialog" aria-labelledby="empDetailsModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -63,6 +63,23 @@
                     onclick="toResetTheModelFields()">
                     <span aria-hidden="true">&times;</span>
                 </button>
+            </div> -->
+<div class="modal fade"
+     id="empDetailsModal"
+     tabindex="-1"
+     data-bs-backdrop="static"
+     data-bs-keyboard="false">
+
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+
+            <div class="modal-header">
+                <h5 class="modal-title">Fetch Employee Data</h5>
+                <!-- <button type="button" class="btn-close" data-bs-dismiss="modal"></button> -->
+                <button type="button" class="close" data-dismiss="modal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                
             </div>
             <div class="modal-body">
                 <div class="accordion">
@@ -194,16 +211,110 @@
                     </div>
                 </div>
             </div>
-            <div class="modal-footer">
+            <!-- <div class="modal-footer">
                 <a class="btn btn-primary" data-dismiss="modal" aria-label="Close"
                     onclick="toResetTheModelFields()">Submit</a>
+            </div> -->
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">
+                    Submit
+                </button>
             </div>
         </div>
     </div>
 </div>
 </div>
 
+<div class="modal fade"
+     id="empDetailsModal"
+     role="dialog"
+     tabindex="-1"
+     data-bs-backdrop="static"
+     data-bs-keyboard="false"
+     aria-labelledby="empDetailsModalLabel"
+     aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="empDetailsModalLabel">Fetch Employee Data</h5>
+                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close" onclick="toResetTheModelFields()">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <!-- your modal body content -->
+            </div>
+            <div class="modal-footer">
+                <a class="btn btn-primary" data-bs-dismiss="modal" aria-label="Close" onclick="toResetTheModelFields()">Submit</a>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Inline JS right after modal HTML -->
 <script>
+  
+    var empModal; // global modal instance
+
+    // ✅ Initialize after DOM is fully loaded
+    document.addEventListener("DOMContentLoaded", function () {
+
+        var empModalEl = document.getElementById("empDetailsModal");
+        if (!empModalEl) {
+            console.error("Modal element not found!");
+            return;
+        }
+
+        empModal = new bootstrap.Modal(empModalEl, {
+            backdrop: 'static',
+            keyboard: false
+        });
+    });
+
+    // ✅ FINAL OPEN FUNCTION (RESET → THEN OPEN)
+    function openFetchEmpDataodal() {
+
+        // 1️⃣ FIRST reset everything
+        toResetTheModelFields();
+
+        // 2️⃣ THEN open modal
+        empModal.show();
+    }
+
+    // ✅ FINAL RESET FUNCTION (WORKS FOR INPUT + SELECT + SELECT2)
+    function toResetTheModelFields() {
+
+        var modal = document.getElementById("empDetailsModal");
+        if (!modal) return;
+
+        // ✅ Reset all input fields
+        modal.querySelectorAll("input").forEach(function (el) {
+            el.value = "";
+        });
+
+        // ✅ Reset all select dropdowns
+        modal.querySelectorAll("select").forEach(function (el) {
+            el.selectedIndex = 0;
+        });
+
+        // ✅ Reset Select2 / custom dropdowns
+        if (window.$) {
+            $("#empDetailsModal .SelExample").val(null).trigger("change");
+        }
+
+        // ✅ Optional: Close accordion
+        modal.querySelectorAll(".accordion-content").forEach(function (el) {
+            el.style.display = "none";
+        });
+
+        // ✅ Optional: Reset arrows
+        modal.querySelectorAll(".arrow").forEach(function (el) {
+            el.innerHTML = "➤";
+        });
+
+        console.log("✅ Modal reset completed");
+    }
+
     var client_list = ''; // local variable for storing the client branch list
     var branch_list = ''; // local variable for storing the client branch list
     var policy_list = ''; // local variable for storing the client policy list
@@ -297,10 +408,10 @@
     }
 
 
-    function openFetchEmpDataodal() {
-        var myModal = new bootstrap.Modal(document.getElementById('empDetailsModal'));
-        myModal.show();
-    }
+    // function openFetchEmpDataodal() {
+    //     var myModal = new bootstrap.Modal(document.getElementById('empDetailsModal'));
+    //     myModal.show();
+    // }
 
     //get client , branch, policy data
     function getClientAndBranchAndPolicy() {
@@ -935,7 +1046,8 @@
     function toResetTheModelFields() {
 
         $('#emp_mobile_number_for_claim').val('');
-        $('#employee_data_points').val();
+        $('#employee_data_points').val('emp_code').attr('autocomplete', 'off').trigger('change');
+        $('#mobile_emp_client_data_list').val('0').select2();
         $('#employee_by_number').val('');
         $('#member_by_number').val('0').select2();
         $('#emp_client_data_list').val('0').select2();
diff --git a/app/Views/ticket_history.php b/app/Views/ticket_history.php
index 6fa33c90..384a638d 100644
--- a/app/Views/ticket_history.php
+++ b/app/Views/ticket_history.php
@@ -22,7 +22,7 @@
                             <!-- <td><?php //echo $row['new_value']; ?></td> -->
                             <td><?php echo !empty($row['modified_by'])? $row['modified_by'] : "Created by employee"; ?></td>
                             <!-- <td><?php //echo $row['created_at']; ?></td> -->
-                            <td><?php echo date("d-m-Y H:i:s a", strtotime($row['created_at'])) ?? " - "; ?></td>
+                            <td><?php echo date("d-m-Y h:i:s A", strtotime($row['created_at'])) ?? " - "; ?></td>
                         </tr>
                         <?php } ?>
                         <?php } ?>
@@ -61,7 +61,7 @@ if (ticketsTable.length) {
         // ],
         dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         language: {
                     search: `
@@ -79,6 +79,7 @@ if (ticketsTable.length) {
         pageLength: 10, // Set default number of rows per page (optional)
         ordering: false,
     });
+        $('.dataTables_length label').css('height', '21px');
 } else {
     console.error("Table atet found.");
 }
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index f133cc4e..83bd3754 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -24,6 +24,8 @@ table.dataTable tbody td {
 .addbtnStyle {
     margin-left: 20px !important;
 }
+.dataTables_length label {height: 21px !important;}
+
 </style>
 <style>
 .table th:nth-child(1),
@@ -294,7 +296,7 @@ $(document).ready(function() {
             // ],
             dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
               {
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index b909ade7..e55956db 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -55,7 +55,7 @@
         color: #000 !important;
         background-color: #fff !important; /* optional: ensure white background */
     }
-
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="col-12">
@@ -259,7 +259,7 @@
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [{
                     text: 'Add Template',
diff --git a/app/Views/ticket_type_modal.php b/app/Views/ticket_type_modal.php
index 6120833d..4a4728b1 100644
--- a/app/Views/ticket_type_modal.php
+++ b/app/Views/ticket_type_modal.php
@@ -1,54 +1,3 @@
-<style>
-/* ----- Modal Size: 25% width + 25% height ----- */
-#New_Ticket_modal .modal-dialog {
-    width: 15%;
-    max-width: 15%;
-    height: 25%;
-    max-height: 25%;
-    margin: auto !important;
-}
-
-
-/* Make modal-content fill the dialog & allow flex layout */
-#New_Ticket_modal .modal-content {
-    height: 50%;
-    display: flex;
-    flex-direction: column;
-}
-
-/* Scroll only inside body */
-#New_Ticket_modal .modal-body {
-    flex: 1;
-    overflow-y: auto;
-    padding: 10px;
-}
-
-/* Footer visible always */
-#New_Ticket_modal .modal-footer {
-       position: sticky;
-        bottom: 0;
-        background: #fff;
-        padding: 10px;
-}
-
-/* ----- Small Height Screens Fix ----- */
-@media (max-height: 300px) {
-
-    /* Make modal usable but still centered */
-    #New_Ticket_modal .modal-dialog {
-        width: 50%;
-        max-width: 50%;
-        height: 70%;
-        max-height: 70%;
-    }
-
-    /* Adjust body scroll area */
-    #New_Ticket_modal .modal-body {
-        max-height: calc(80vh - 120px);
-    }
-}
-</style>
-
 <div class="modal fade" id="New_Ticket_modal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index 66451e0d..bec11d92 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -37,6 +37,7 @@
     color: white;
     border: 1px solid rgba(41, 139, 142, 1);
   }
+  .dataTables_length label {height: 21px !important;}
 </style>
 <div class="container-fluid-min">
   <div class="row" id="tpa_list">
@@ -184,7 +185,7 @@
         // "<'row'<'col-sm-5'i><'col-sm-7'p>>",
         dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
         lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
         buttons: [
               {
diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php
index 71d1fe0a..83bcd38b 100644
--- a/app/Views/variance_report_list.php
+++ b/app/Views/variance_report_list.php
@@ -21,6 +21,7 @@
     .center-align-input {
         text-align: center;
     }
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="container-fluid-min">
@@ -226,7 +227,7 @@
                 //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [{
                     extend: 'collection',
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index af2aec48..f4b29f8e 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -60,6 +60,7 @@ table.dataTable tbody td {
         color: white;
         border:1px solid  rgba(41, 139, 142, 1);
     }
+    .dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -475,7 +476,7 @@ $(document).ready(function() {
         //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [  
               {
diff --git a/app/Views/vehicle_type_list.php b/app/Views/vehicle_type_list.php
index 132a5abd..4c7bbb09 100644
--- a/app/Views/vehicle_type_list.php
+++ b/app/Views/vehicle_type_list.php
@@ -301,6 +301,7 @@
         border: 1px solid #ddd;   /* matches border-width:1px */
         padding: 3px;
     }
+    .dataTables_length label {height: 21px !important;}
 
 </style>
 
@@ -395,7 +396,7 @@
                                     <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cd =  date("j F Y", strtotime($row['created_at']));
-                                        $ct =  date("h:i a", strtotime($row['created_at']));
+                                        $ct =  date("h:i A", strtotime($row['created_at']));
                                         echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
                                         endif;
                                     ?>
@@ -403,7 +404,7 @@
                                     <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $ud =  date("j F Y", strtotime($row['updated_at']));
-                                        $ut =  date("h:i a", strtotime($row['updated_at']));
+                                        $ut =  date("h:i A", strtotime($row['updated_at']));
                                         echo $ud . "<br><span class='time'> " . $ut . "</span>"; 
                                         endif;
                                     ?>
@@ -770,7 +771,7 @@
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
             dom: "<'row'<'col-sm-3'f><'col-sm-9'B>>" + 
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [
                 // {
diff --git a/app/Views/vehicle_type_master_list.php b/app/Views/vehicle_type_master_list.php
index 492ccdb5..3f4faa46 100755
--- a/app/Views/vehicle_type_master_list.php
+++ b/app/Views/vehicle_type_master_list.php
@@ -1,8 +1,7 @@
 <style>
-.dataTables_filter {
-    position: absolute;
-}
+.dataTables_filter {position: absolute;}
 .column-header {margin-right: 10px;}
+.dataTables_length label {height: 21px !important;}
 </style>
 
 <!-- End ADD and EDIT Page HTML -->
@@ -100,7 +99,7 @@
             //     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
             dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
             buttons: [            
                 {
diff --git a/app/Views/view_deposit.php b/app/Views/view_deposit.php
index c727b5f1..6e52aa53 100755
--- a/app/Views/view_deposit.php
+++ b/app/Views/view_deposit.php
@@ -5,8 +5,7 @@
         min-width: none;
         max-width: 350px;
     }
-
-
+    .dataTables_length label {height: 21px !important;}
 </style>
 
 <div class="row">
@@ -301,7 +300,7 @@
                 // ],
                 dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
                 "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-3 text-center'l><'col-sm-4 text-end'p>>",
+                "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
                 lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
                 buttons: [
                     {