diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index a9cd0ae2..2a41fda8 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -124,6 +124,8 @@ $routes->group("/client", ["filter" => "authMVC"], function ($routes) {
         $routes->post("edit", "ClientController::editClientBranch");
         $routes->get("list/(:any)", "ClientController::getSingleBranchDataById/$1");
         $routes->get("remove/(:any)", "ClientController::removeClientBranch/$1");
+        $routes->post("auto_fetch_branch","ClientController::auto_fetch_branch");
+        $routes->post("auto_fetch_branch_details","ClientController::auto_fetch_branch_details");
     });
 
     $routes->group("relation", ["filter" => "authMVC"], function ($routes) {
@@ -674,6 +676,7 @@ $routes->post('claimStatusCheck','VidalApiController::claimStatusCheck');
 $routes->post('newClaim','VidalApiController::newClaim');
 $routes->post('enrollment','VidalApiController::enrollment');
 
+// General Tickets
 
 $routes->post("ticketSave", "ThzController::ticketSave");
 $routes->get("ticketList", "ThzController::ticketList");
diff --git a/app/Controllers/AppContentManagementController.php b/app/Controllers/AppContentManagementController.php
index 300036be..33d6ce1d 100755
--- a/app/Controllers/AppContentManagementController.php
+++ b/app/Controllers/AppContentManagementController.php
@@ -27,7 +27,8 @@ class AppContentManagementController extends AdminController
     public function add_image_index()
     {   
         $this->myLogger->logme('error','Addvertisement Image list function called');
-        $headerData['page_name'] = 'Addvertisement Image List';
+        $headerData['tab_name'] = 'Addvertisement Images';
+        $headerData['page_name'] = 'Addvertisement Images';
         $data['addImageList'] = $this->addImgModel->findAll();
 
         // dd($data);
@@ -86,6 +87,7 @@ class AppContentManagementController extends AdminController
     public function frontend_content(){
 
         $data['test'] = $this->feContentModel->findAll();
+        $headerData['tab_name'] = 'Front-End Content';
         $headerData['page_name'] = 'Front-End Content';
 
         echo view('layout/header', $headerData);
diff --git a/app/Controllers/BDSReportController.php b/app/Controllers/BDSReportController.php
index c3005aac..355df367 100644
--- a/app/Controllers/BDSReportController.php
+++ b/app/Controllers/BDSReportController.php
@@ -180,6 +180,9 @@ class BDSReportController extends AdminController
                 'BAP-Insurer' => 'bapInsurer',
                 'Client'    => 'client'
             ];
+
+            $data['page_name'] = "IRBA Report";
+
             return $this->loadLayout('irba_report', $data);
         } else {
 
@@ -914,6 +917,7 @@ class BDSReportController extends AdminController
             $data['default_end'] = $default_start->format('d-m-Y');
             $data['default_start']  = $default_start->modify('-60 days')->format('d-m-Y');
             $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
+            $data['tab_name'] = "Renewal Report";
             $data['page_name'] = "Renewal Report";
             return $this->loadLayout('renewal_search', $data);
         } else {
@@ -1013,6 +1017,7 @@ class BDSReportController extends AdminController
 
     public function accountMangerStatusBDSReport()
     {
+        $data['tab_name'] = "Account Manager BDS Report";
         $data['page_name'] = "Account Manager BDS Report";
 
         $sql = "
@@ -1130,6 +1135,7 @@ class BDSReportController extends AdminController
 
     public function getMultiReport($report_type){
 
+        $data['tab_name'] = "BDS Report";
         $data['page_name'] = "BDS Report";
 
         if ($report_type == 1){
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 164bee10..34830575 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -143,9 +143,9 @@ class ClientController extends AdminController
 
         // Perform the query
         $builder = $db->table($table);
-        if(is_array($value)){
+        if (is_array($value)) {
             $isDuplicate = $builder->where($value)->where('is_active', 1)->countAllResults() > 0;
-        }else{
+        } else {
             $isDuplicate = $builder->where($field, $value)->where('is_active', 1)->countAllResults() > 0;
         }
 
@@ -154,9 +154,9 @@ class ClientController extends AdminController
     }
 
     public function smapletest()
-    {   
+    {
         $headers = [
-            'S.No', 
+            'S.No',
             'NAME OF EMP/DEP',
             'EMP ID',
             // 'EMP/DEP TYPE',
@@ -177,13 +177,13 @@ class ClientController extends AdminController
             'PRO RATA PREMIUM',
             'GST',
             'TOTAL AMOUNT'
-        ];        
+        ];
         $filePath = generateExcelWithHeader($headers);
-        echo "Excel file created at: $filePath";   
+        echo "Excel file created at: $filePath";
     }
 
     public function testMailAttachments($email = 'venkateshraman786@gmail.com')
-    {           
+    {
         $message = '<style>body{font-family:Arial,sans-serif;color:#333;line-height:1.6;margin:0;padding:0}.email-container{width:100%;max-width:600px;margin:0 auto;padding:20px;border:1px solid #e0e0e0;background-color:#f9f9f9}.header{background-color:#4a90e2;color:#fff;padding:15px;text-align:center}.header h1{margin:0;font-size:24px}.content{padding:20px;background-color:#fff}.content h2{color:#4a90e2;font-size:20px;margin-top:0}.content p{margin:10px 0}.details-table{width:100%;border-collapse:collapse;margin-top:20px}.details-table td,.details-table th{border:1px solid #ddd;padding:10px;text-align:left}.details-table th{background-color:#f2f2f2}.footer{margin-top:20px;font-size:12px;color:#777;text-align:center}.attachment-note{margin-top:20px;padding:10px;background-color:#f7f7f7;border-left:4px solid #4a90e2;font-style:italic}</style><div class=email-container><div class=header><h1>Request for Quotation (RFQ)</h1></div><div class=content><h2>Dear {{RECIPIENT_NAME}},</h2><p>We are reaching out to request a quotation for the following insurance coverage. Please review the details below and provide your quote at your earliest convenience.<h2>RFQ Details</h2><table data-custom-table-css="table" class=details-table><tr><th>Client name<td>{{CLIENT_NAME}}<tr><th>Coverage Type<td>{{POLICY_LONG_NAME}}<tr><th>Policy Start Date<td>{{POLICY_START_DATE}}<tr><th>Policy Duration<td>{{DURATION}}</table><div class=attachment-note>Please note: Additional terms and details are included in the attachment for your reference.</div><p>Please feel free to reach out if you require any further information to prepare the quote. We look forward to receiving your proposal.<p>Best regards,<p><strong>Nhance India Pvt Ltd</strong><br></div><div class=footer><p>© Nhance India Pvt Ltd. All rights reserved.</div></div>';
 
         // $attachments = [
@@ -192,8 +192,8 @@ class ClientController extends AdminController
         //     ["filePath" => ROOTPATH."public/assets/images/login_bg.jpg","fileName" => "login_bg.jpg"]
         // ];
         $attachments = [];
-        $res = MailHelper::send_email(['mail' => $email, 'subject' => 'Mail Via Attachment Testing URL', 'message' => $message,'attachments' => $attachments]);
-        
+        $res = MailHelper::send_email(['mail' => $email, 'subject' => 'Mail Via Attachment Testing URL', 'message' => $message, 'attachments' => $attachments]);
+
         print_rr($res);
         echo '------------------------------------------------------------------------------------------';
         // print_rr($attachments);
@@ -205,21 +205,20 @@ class ClientController extends AdminController
 
         // dd($client_id, $emp_code, $policy_id, $mail_active);
 
-        if(empty($policy_id)){
+        if (empty($policy_id)) {
 
             $client_policy_ids = $this->employeeModel
-                                ->select('employee_polices.client_policy_id')
-                                ->join('employee_polices', 'employees.id = employee_polices.employee_id')
-                                ->where('employees.client_id', $client_id ) 
-                                ->where('employees.emp_code', $emp_code )
-                                ->where('employee_polices.is_active', 1 )
-                                ->where('employees.is_active', 1 )
-                                ->findAll();
+                ->select('employee_polices.client_policy_id')
+                ->join('employee_polices', 'employees.id = employee_polices.employee_id')
+                ->where('employees.client_id', $client_id)
+                ->where('employees.emp_code', $emp_code)
+                ->where('employee_polices.is_active', 1)
+                ->where('employees.is_active', 1)
+                ->findAll();
 
             $client_policy_ids2 = array_column($client_policy_ids, 'client_policy_id');
             $client_policy_id = array_unique($client_policy_ids2);
-
-        }else{
+        } else {
             $client_policy_id = json_decode($policy_id, true);
         }
 
@@ -233,39 +232,37 @@ class ClientController extends AdminController
         $mail_send_return1 = '';
         $mail_send_return2 = '';
 
-        if (!is_null($client_policy_id) && is_array($client_policy_id))
-        {
+        if (!is_null($client_policy_id) && is_array($client_policy_id)) {
 
-            $empData = $this->employeeModel->where('emp_code', $emp_code )->where('client_id', $client_id ) ->where('is_active', 1 )->findAll();
+            $empData = $this->employeeModel->where('emp_code', $emp_code)->where('client_id', $client_id)->where('is_active', 1)->findAll();
             // dd($empData);
             $filteredEmpData = array_filter($empData, fn($item) => $item['relationship'] === 'Self');
 
             // dd($filteredEmpData);
 
             $array_list = [];
-            foreach ($client_policy_id as $key => $value) 
-            {   
-                $find = $this->employeeModel->getEmpFamilybyEmpCode(client_policy_id: $value,emp_code: $emp_code,client_id: $client_id,emp_status:['draft','enrolled'],policy_status:['draft','enrolled']);
-                if(count($find) > 0){
+            foreach ($client_policy_id as $key => $value) {
+                $find = $this->employeeModel->getEmpFamilybyEmpCode(client_policy_id: $value, emp_code: $emp_code, client_id: $client_id, emp_status: ['draft', 'enrolled'], policy_status: ['draft', 'enrolled']);
+                if (count($find) > 0) {
                     $array_list[] = $find;
                 }
             }
 
             // dd($array_list);
 
-            $notification = $this->notificationModel->where('client_id' ,$client_id)->where('template_name', 'member_review_and_summary_mail')->first();
+            $notification = $this->notificationModel->where('client_id', $client_id)->where('template_name', 'member_review_and_summary_mail')->first();
 
 
             if (isset($notification) && $notification['enabled'] == 1) {
 
-                $params ['array_list'] = $array_list;
-                $params ['client_policy_id'] = $client_policy_id;
-                $params ['emp_code'] = $emp_code;
-                $params ['client_id'] = $client_id;
-                $params ['notification'] = $notification;
+                $params['array_list'] = $array_list;
+                $params['client_policy_id'] = $client_policy_id;
+                $params['emp_code'] = $emp_code;
+                $params['client_id'] = $client_id;
+                $params['notification'] = $notification;
                 $params['common'] = [
-                    'client_id' => $filteredEmpData[0]['client_id'], 
-                    'client_branch_id' => $filteredEmpData[0]['client_branch_id'], 
+                    'client_id' => $filteredEmpData[0]['client_id'],
+                    'client_branch_id' => $filteredEmpData[0]['client_branch_id'],
                     'client_policy_id' => null,
                     'employee_policy_id' => null,
                     'employee_id' => $filteredEmpData[0]['id'],
@@ -274,16 +271,16 @@ class ClientController extends AdminController
 
                 // dd($params);
 
-                $wholeData =sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params);
+                $wholeData = sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params);
                 // print_r($wholeData); die;
 
-                if($mail_active == 1){
+                if ($mail_active == 1) {
                     $mail_send_return =  MailHelper::send_email($wholeData[0]);
                     $this->myLogger->logme("error", $mail_send_return);
                 }
 
                 // if (isset($wholeData)) {
-                    
+
                 //     $params['common']['mail_type'] = 'account_maneger_summary_mail';
                 //     $account_manager_wholeData =sendMailNotification::sendMailNotification('account_maneger_summary_mail', $params);
                 //     // print_r($account_manager_wholeData); die;
@@ -322,12 +319,11 @@ class ClientController extends AdminController
                 //     }
                 // }
 
-            }else{
+            } else {
                 $this->myLogger->logme("error", 'Member Review Mail Configuration not Enable for this client');
             }
-
         }
-    
+
         print_r($wholeData);
 
         echo '<pre>';
@@ -346,26 +342,25 @@ class ClientController extends AdminController
     {
         // dd($client_id, $emp_code, $policy_id, $mail_active);
 
-        if(empty($policy_id)){
+        if (empty($policy_id)) {
 
             $client_policy_ids = $this->employeeModel
-                                ->select('employee_polices.client_policy_id')
-                                ->join('employee_polices', 'employees.id = employee_polices.employee_id')
-                                ->where('employees.client_id', $client_id ) 
-                                ->where('employees.emp_code', $emp_code )
-                                ->where('employee_polices.is_active', 1 )
-                                ->where('employees.is_active', 1 )
-                                ->findAll();
+                ->select('employee_polices.client_policy_id')
+                ->join('employee_polices', 'employees.id = employee_polices.employee_id')
+                ->where('employees.client_id', $client_id)
+                ->where('employees.emp_code', $emp_code)
+                ->where('employee_polices.is_active', 1)
+                ->where('employees.is_active', 1)
+                ->findAll();
 
             $client_policy_ids2 = array_column($client_policy_ids, 'client_policy_id');
             $client_policy_id = array_unique($client_policy_ids2);
-
-        }else{
+        } else {
             $client_policy_id = json_decode($policy_id, true);
         }
 
         // dd($client_policy_id);
-    
+
         if (!is_null($client_policy_id) && is_array($client_policy_id)) {
 
             $empData = $this->employeeModel
@@ -373,9 +368,9 @@ class ClientController extends AdminController
                 ->where('client_id', $client_id)
                 ->where('is_active', 1)
                 ->findAll();
-    
+
             $filteredEmpData = array_filter($empData, fn($item) => $item['relationship'] === 'Self');
-    
+
             if (empty($filteredEmpData)) {
                 return $this->respond([
                     'status' => 'error',
@@ -383,7 +378,7 @@ class ClientController extends AdminController
                     'message' => 'No active employee data found for the given criteria.',
                 ], 404);
             }
-    
+
             $array_list = [];
             foreach ($client_policy_id as $value) {
                 $find = $this->employeeModel->getEmpFamilybyEmpCode(
@@ -393,17 +388,17 @@ class ClientController extends AdminController
                     emp_status: ['draft', 'enrolled'],
                     policy_status: ['draft', 'enrolled']
                 );
-    
+
                 if (count($find) > 0) {
                     $array_list[] = $find;
                 }
             }
-    
+
             $notification = $this->notificationModel
                 ->where('client_id', $client_id)
                 ->where('template_name', 'member_review_and_summary_mail')
                 ->first();
-    
+
             if ($notification && $notification['enabled'] == 1) {
 
                 $params = [
@@ -421,14 +416,14 @@ class ClientController extends AdminController
                         'mail_type' => 'member_review_and_summary_mail',
                     ],
                 ];
-    
+
                 $wholeData = sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params);
-    
+
                 if ($mail_active == 0) {
 
                     // $mail_send_result = [];
                     $mail_send_result = MailHelper::send_email($wholeData[0]);
-    
+
                     if ($mail_send_result['status'] === 'success') {
                         return $this->respond([
                             'status' => 'success',
@@ -445,7 +440,7 @@ class ClientController extends AdminController
                         ], 500);
                     }
                 }
-    
+
                 return $this->respond([
                     'status' => 'success',
                     'code' => 200,
@@ -453,28 +448,29 @@ class ClientController extends AdminController
                     'data' => $wholeData,
                 ], 200);
             }
-    
+
             return $this->respond([
                 'status' => 'error',
                 'code' => 400,
                 'message' => 'Member Review Mail configuration is not enabled for this client.',
             ], 400);
         }
-    
+
         return $this->respond([
             'status' => 'error',
             'code' => 404,
             'message' => 'No active client policy IDs found.',
         ], 404);
     }
-    
+
 
     //--------------------------------------------------------------------------------------------------------
 
     public function index()
     {
         $this->myLogger->logme('error', 'Client list function called');
-        $headerData['page_name'] = 'Client List';
+        $headerData['tab_name'] = 'Client List';
+        $headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same. 
         $data['clientList'] = $this->clientModel->getCreatedByUserName();
         $data['client_rm'] = $this->clientRMModel->getAllClientRM();
         $data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
@@ -599,7 +595,8 @@ class ClientController extends AdminController
     public function clientOnboarding()
     {
         $this->myLogger->logme('error', 'Client Onboarding function called');
-        $headerData['page_name'] = 'Client Onboarding';
+        $headerData['tab_name'] = 'Client Onboarding';
+        $headerData['page_name'] = 'Clients';
 
         $data['entity']        = $this->kycEntityTypeModel->findAll();
         $data['kyc_docs']      = $this->kycDocsModel->findAll();
@@ -621,20 +618,24 @@ class ClientController extends AdminController
 
         // dd($data['placeHolders']);
 
+        // auto fetch client list and branch list from pre
+        $data['auto_fetch_client_list'] =  $this->getClientListFromPre();
+
+
         echo view('layout/header', $headerData);
         echo view('client_onboarding', $data);
         echo view('layout/footer');
     }
 
     // In your controller
-    public function deposit($id = null , $requestFrom = null , $policyId = null)
+    public function deposit($id = null, $requestFrom = null, $policyId = null)
     {
-       
-        $headerData['page_name'] = 'Client Deposit';
-        
+        $headerData['tab_name'] = 'Client Deposit';
+        $headerData['page_name'] = 'Clients';
+
         $data['clientName'] = $this->clientModel->where('id', $id)->find();
-        $data['clientData'] = $this->clientPolicyModel->getinsurerswithclientid($id,$policyId);
-        
+        $data['clientData'] = $this->clientPolicyModel->getinsurerswithclientid($id, $policyId);
+
         $data['depositsummary'] = $this->clientPolicyModel->getDepositlistsummary($id);
 
         // Fetch associated insurer names and balances
@@ -642,14 +643,16 @@ class ClientController extends AdminController
         $data['balances'] = $balances;
 
         // dd($data);
-        if($requestFrom == 'rest'){ return $data; }
+        if ($requestFrom == 'rest') {
+            return $data;
+        }
 
         echo view('layout/header', $headerData);
         echo view('client_deposit_list', $data);
         echo view('layout/footer');
     }
 
-    public function view_Deposit($insurerId , $requestFrom = null , $param = null)
+    public function view_Deposit($insurerId, $requestFrom = null, $param = null)
     {
         // Load your model to fetch data based on $clientId and $insurerId
         // $subTypeOptions = [
@@ -671,26 +674,28 @@ class ClientController extends AdminController
         ];
 
         $data['subTypeOptions'] = $subTypeOptions;
-        $headerData['page_name'] = 'Client Deposit';
+        $headerData['tab_name'] = 'Client Deposit';
+        $headerData['page_name'] = 'Clients';
         $loggedInUserID = get_session_userid();
         // $data['clientData']= $this->clientPolicyModel->getinsurerswithinsurenceid($insurerId);
-        if($requestFrom == 'rest')
-        { 
+        if ($requestFrom == 'rest') {
             $clientId = $param['client_id'];
             $cd_ac_pk = $param['cd_ac_pk'];
-        }else{
+        } else {
             $clientId = $this->request->getGet('client_id');
             $cd_ac_pk = $this->request->getGet('cd_ac_pk');
         }
-        
+
         $data['insurerName'] = $this->insurerModel->getInsurerName($insurerId, $clientId);
         $data['depositdata'] = $this->clientPolicyModel->getdepositData($clientId, $insurerId, $cd_ac_pk, $subTypeOptions);
         $data['clientData'] = $this->clientPolicyModel->getClientById($clientId);
         $data['deposiamount'] = $this->clientPolicyModel->getDepositSummary($clientId, $insurerId, $cd_ac_pk);
         $data['cd_ac_pk'] = $cd_ac_pk;
 
-        if($requestFrom == 'rest'){ return $data; }
-        
+        if ($requestFrom == 'rest') {
+            return $data;
+        }
+
         // Load the view for the new list page;
         echo view('layout/header', $headerData);
         echo view('view_deposit', $data);
@@ -712,12 +717,12 @@ class ClientController extends AdminController
             ->where('is_active', 1)
             ->first();
 
-        
-        if(!empty($record_date)){
+
+        if (!empty($record_date)) {
             // Prepare the array with data
             $date = \DateTime::createFromFormat('d/m/Y', $record_date);
             $record_date = $date->format('Y-m-d');
-        }else{
+        } else {
             $record_date = null;
         }
 
@@ -751,7 +756,8 @@ class ClientController extends AdminController
     {
 
         $this->myLogger->logme('error', 'Edit Client Onboarding function called');
-        $headerData['page_name'] = 'Edit Client Onboarding';
+        $headerData['tab_name'] = 'Edit Client Onboarding';
+        $headerData['page_name'] = 'Clients';
 
         $editData['RM']             = $this->userModel->where('is_active', 1)->findAll();
         $editData['tpa']            = $this->tpaBranchModel->getTpaBranchesWithTpaNames();
@@ -792,8 +798,12 @@ class ClientController extends AdminController
         $editData['client_policy']['role'] = get_role_id();
         $editData['notification'] = $this->notificationModel->select('template_name,enabled')->where('client_id', $id)->findAll();
         $editData['placeHolders'] = ['member_name', 'member_mobile', 'nhance_logo', 'tpa_id', 'ecard_download_link', 'client_logo', 'policy_no', 'member_summary', 'app_link', 'post_enrollment_app_link', 'client_name'];
-        $editData['api_data'] = $this->clientApi->where("client_id", $id)->where("is_active",1)->first();
+        $editData['api_data'] = $this->clientApi->where("client_id", $id)->where("is_active", 1)->first();
         // dd($editData);
+
+        $editData['auto_fetch_client_list'] =  $this->getClientListFromPre();
+
+
         echo view('layout/header', $headerData);
         echo view('client_onboarding', $editData);
         echo view('layout/footer');
@@ -817,7 +827,7 @@ class ClientController extends AdminController
             $data['is_download_btn'] = 1;
         }
 
-        if(empty($data['parent_client_id'])){
+        if (empty($data['parent_client_id'])) {
             $data['parent_client_id'] = null;
         }
 
@@ -851,7 +861,7 @@ class ClientController extends AdminController
             $data['is_download_btn'] = 1;
         }
 
-        if(empty($data['parent_client_id'])){
+        if (empty($data['parent_client_id'])) {
             $data['parent_client_id'] = null;
         }
         // print_r($data);die;
@@ -890,9 +900,9 @@ class ClientController extends AdminController
         $insert = $this->clientKYCDocsModel->insert($data);
         if ($insert) {
             // $kycDocs = $this->clientKYCDocsModel->where('client_id', $this->request->getPost('client_id'))->findAll();
-            if($form_type == "others"){
+            if ($form_type == "others") {
                 $kycDocs = $this->generateKycOthersTable($this->request->getPost('client_id'));
-            }else{
+            } else {
                 $kycDocs = $this->generateKycPrimaryTable($this->request->getPost('client_id'));
             }
             return $this->respond(['status' => true, 'code' => 200, 'data' => $kycDocs, 'file_name' => $File], 200);
@@ -920,9 +930,9 @@ class ClientController extends AdminController
 
         if ($insert) {
             // $kycDocs = $this->clientKYCDocsModel->getKycDocsName($id);
-            if($form_type == "others"){
+            if ($form_type == "others") {
                 $kycDocs = $this->generateKycOthersTable($this->request->getPost('client_id'));
-            }else{
+            } else {
                 $kycDocs = $this->generateKycPrimaryTable($this->request->getPost('client_id'));
             }
             return $this->respond(['status' => true, 'code' => 200, 'data' => $kycDocs], 200);
@@ -1070,7 +1080,7 @@ class ClientController extends AdminController
 
         $this->myLogger->logme('error', 'Client branch CREATE function called');
         $data   = $this->request->getPost();
-        // var_dump($data); die;
+
         if (!isset($data['sez'])) {
             $data['sez'] = 0;
         } elseif ($data['sez']) {
@@ -1122,9 +1132,9 @@ class ClientController extends AdminController
         $units   = $this->request->getPost('units');
 
         $emp_unit_count = 0;
-        $rr_unit_count = 0;
+        $rr_unit_count  = 0;
         $rr_unit_count2 = 0;
-        $total_count = 0;
+        $total_count    = 0;
 
         $list_of_branch_units = $this->clientBranchModel->find($id);
         $units = json_decode($list_of_branch_units['units']);
@@ -1383,9 +1393,9 @@ class ClientController extends AdminController
         $data['insurer_id']        = $insurerId;
 
         $tpaValue                  = (string) $this->request->getPost('tpa');
-        if(!empty($tpaValue) || $tpaValue !== ''){
+        if (!empty($tpaValue) || $tpaValue !== '') {
             list($tpaBranchId, $tpaId) = explode('-', $tpaValue);
-        }else{
+        } else {
             $tpaBranchId = null;
             $tpaId = null;
         }
@@ -1461,7 +1471,7 @@ class ClientController extends AdminController
             $clientPoliceData =  $this->clientPolicyModel->getClientPolicyByClientId($client_id);
             $clientPoliceData['role'] = get_role_id();
 
-            if($policy_transaction_data > 0){
+            if ($policy_transaction_data > 0) {
                 $r = Jobs::addJob(['job_name' => 'updatePolicyTransactionDataWhileClinetPolicyUpdate', 'payload' => [
                     'old_client_policy_data' => $old_client_policy_data ?? null,
                     'new_client_policy_data' => $new_client_policy_data ?? null,
@@ -1497,14 +1507,13 @@ class ClientController extends AdminController
             $update = $this->clientPolicyModel->where('id', $id)->set($data)->update();
 
             if ($update) {
-                
+
                 $policy_transaction_update = $this->deactivatePolicyTransactionsPolicy($id);
 
                 return $this->respond(['status' => true, 'code' => 200], 200);
             } else {
                 return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to remove policy'], 200);
             }
-
         } else {
 
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'The policy has active employees'], 200);
@@ -1536,7 +1545,7 @@ class ClientController extends AdminController
         }
     }
 
-    
+
 
     // Save Rack Rate function
     public function createClientPolicyPremium()
@@ -1990,8 +1999,15 @@ class ClientController extends AdminController
 
             // Check differences and prepare update data
             $fields_to_check = [
-                'client_branch_id', 'policy_type', 'insurer_id', 'insurer_branch_id',
-                'cd_ac_pk', 'policy_end_date', 'policy_start_date', 'tpa_id', 'tpa_branch_id'
+                'client_branch_id',
+                'policy_type',
+                'insurer_id',
+                'insurer_branch_id',
+                'cd_ac_pk',
+                'policy_end_date',
+                'policy_start_date',
+                'tpa_id',
+                'tpa_branch_id'
             ];
 
             foreach ($fields_to_check as $field) {
@@ -2039,18 +2055,16 @@ class ClientController extends AdminController
                 }
 
                 $this->myLogger->logme("error", "Policy transaction(s) updated successfully. Updated IDs: " . json_encode($updated_pt_ids));
-                
+
                 return [
                     'status' => "Success",
                     'message' => "Policy transaction(s) updated.",
                     'updated_ids' => $updated_pt_ids
                 ];
-
             } else {
                 $this->myLogger->logme("error", "No active policy_transaction records found for update.");
                 return ['status' => "Failed", 'message' => "No active policy_transaction records found."];
             }
-
         } catch (\Throwable $e) {
             $this->myLogger->logme("error", "Exception during policy_transaction update: " . $e->getMessage());
             return [
@@ -2096,7 +2110,6 @@ class ClientController extends AdminController
                         $errors[] = "No change or failed update for ID {$row['id']}";
                     }
                 }
-
             } catch (\Exception $e) {
                 $errors[] = "Error updating pt_id {$pt_id}: " . $e->getMessage();
             }
@@ -2185,7 +2198,8 @@ class ClientController extends AdminController
         }
     }
 
-    public function generateKycPrimaryTable($client_id){
+    public function generateKycPrimaryTable($client_id)
+    {
 
         $db = db_connect();
         $builder = $db->table('kyc_docs kd');
@@ -2210,16 +2224,17 @@ class ClientController extends AdminController
 
     }
 
-    public function generateKycOthersTable($client_id){
-        
+    public function generateKycOthersTable($client_id)
+    {
+
         $result['data'] = $this->clientKYCDocsModel
-                ->where('is_active', 1)
-                ->where('client_id', $client_id)
-                ->groupStart()
-                    ->where('kyc_doc_type_id', null)
-                    ->orWhere('kyc_doc_type_id', 0)
-                ->groupEnd()
-                ->findAll();
+            ->where('is_active', 1)
+            ->where('client_id', $client_id)
+            ->groupStart()
+            ->where('kyc_doc_type_id', null)
+            ->orWhere('kyc_doc_type_id', 0)
+            ->groupEnd()
+            ->findAll();
 
         $result['client_id'] = $client_id;
         $table = view('client_kyc_other_table', $result);
@@ -2647,7 +2662,7 @@ class ClientController extends AdminController
             // $data['special_condition_label'] = str_replace(',', '', $this->request->getPost("special_condition_label")) ?? [];
             // $data['special_condition_input'] = str_replace(',', '', $this->request->getPost("special_condition_input")) ?? [];
             // $data['multiple_sum_insured'] = str_replace(',', '', $this->request->getPost("multiple_sum_insured")) ?? [];
-            
+
             $fields = [
                 'waiverofpreexistingdiseases' => false,
                 'waiverof1,2,3&4thyearexclusions' => false,
@@ -2694,17 +2709,17 @@ class ClientController extends AdminController
                 'special_condition_input' => true,
                 'multiple_sum_insured' => true,
             ];
-                       
+
             foreach ($fields as $field => $needsCleanup) {
                 $value = $this->request->getPost($field);
-            
+
                 if ($value !== null && $value !== '') {
                     $data[$field] = $needsCleanup ? str_replace(',', '', $value) : $value;
-                }else{
-                     $data[$field] = $value;
+                } else {
+                    $data[$field] = $value;
                 }
             }
-            
+
             $data['enrollment_display_key'] = $this->enrollmentGMCDisplayValueTransform();
             $this->myLogger->logme('error', "contructed post data : " . json_encode($data ?? []));
             // print_r($data);die;
@@ -2747,11 +2762,11 @@ class ClientController extends AdminController
     //     if ($this->request->getPost("waiverofpreexistingdiseases_display")) {
     //         $data['Waiver of Pre-existing Diseases'] = $this->request->getPost("waiverofpreexistingdiseases");
     //     }
-        
+
     //     if ($this->request->getPost("waiverof1234thyearexclusions_display")) {
     //         $data['Waiver of 1, 2, 3 & 4th year Exclusions'] = $this->request->getPost("waiverof1,2,3&4thyearexclusions");
     //     }
-        
+
     //     if ($this->request->getPost("waiverof30dayswaitingperiod_display")) {
     //         $data['Waiver of 30 days waiting period'] = $this->request->getPost("waiverof30dayswaitingperiod");
     //     }
@@ -2759,157 +2774,157 @@ class ClientController extends AdminController
     //     if ($this->request->getPost("suminsuredenhancement_display")) {
     //         $data['Sum Insured Enhancement'] = $this->request->getPost("suminsuredenhancement");
     //     }
-        
+
     //     if ($this->request->getPost("waiver_of_90_days_waiting_period_display")) {
     //         $data['Waiver of 90 Days Waiting Period'] = $this->request->getPost("waiver_of_90_days_waiting_period");
     //     }
-        
+
     //     if ($this->request->getPost("waiver_of_other_waiting_periods_display")) {
     //         $data['Waiver of Other Waiting Periods'] = $this->request->getPost("waiver_of_other_waiting_periods");
     //     }
-        
+
     //     if ($this->request->getPost("maternity_benefit_display")) {
     //         $data['Maternity Benefit'] = $this->request->getPost("maternity_benefit");
     //     }
-        
+
     //     if ($this->request->getPost("9monthwaitingperiodwaived_display")) {
     //         $data['9-month waiting Period - waived'] = $this->request->getPost("9monthwaitingperiodwaived");
     //     }
-        
+
     //     if ($this->request->getPost("maternitycoverage_display")) {
     //         $data['Maternity Coverage'] = $this->request->getPost("maternitycoverage");
     //     }
-        
+
     //     if ($this->request->getPost("twindelivery_display")) {
     //         $data['Twin Delivery'] = $this->request->getPost("twindelivery");
     //     }
-        
+
     //     if ($this->request->getPost("well_baby_well_mother_expenses_display")) {
     //         $data['Well baby / Well Mother Expenses'] = $this->request->getPost("well_baby_well_mother_expenses");
     //     }
-        
+
     //     if ($this->request->getPost("preandpostnatal_display")) {
     //         $data['Pre and Post natal'] = $this->request->getPost("preandpostnatal");
     //     }
-        
+
     //     if ($this->request->getPost("infertility_treatment_coverage_display")) {
     //         $data['Infertility Treatment Coverage'] = $this->request->getPost("infertility_treatment_coverage");
     //     }
-        
+
     //     if ($this->request->getPost("babyday1cover_display")) {
     //         $data['Baby Day 1 Cover'] = $this->request->getPost("babyday1cover");
     //     }
-        
+
     //     if ($this->request->getPost("coverfromthedateofjoining_display")) {
     //         $data['Cover from the date of Joining'] = $this->request->getPost("coverfromthedateofjoining");
     //     }
-        
+
     //     if ($this->request->getPost("mid_term_addition_of_new_born_newly_wedded_spouse_display")) {
     //         $data['Mid Term Addition of New Born / Newly Wedded Spouse'] = $this->request->getPost("mid_term_addition_of_new_born_newly_wedded_spouse");
     //     }
-        
+
     //     if ($this->request->getPost("prehospitalizationcover_display")) {
     //         $data['Pre Hospitalization Cover'] = $this->request->getPost("prehospitalizationcover");
     //     }
-        
+
     //     if ($this->request->getPost("posthospitalizationcover_display")) {
     //         $data['Post Hospitalization Cover'] = $this->request->getPost("posthospitalizationcover");
     //     }
-        
+
     //     if ($this->request->getPost("congenitaldiseasesinternal_display")) {
     //         $data['Congenital Diseases - Internal'] = $this->request->getPost("congenitaldiseasesinternal");
     //     }
-        
+
     //     if ($this->request->getPost("congenitaldiseasesexternal_display")) {
     //         $data['Congenital Diseases - External'] = $this->request->getPost("congenitaldiseasesexternal");
     //     }
-        
+
     //     if ($this->request->getPost("copayzonewisecopay_display")) {
     //         $data['Co-Pay/Zone wise Co Pay'] = $this->request->getPost("copayzonewisecopay");
     //     }
-        
+
     //     if ($this->request->getPost("roomrentlimit_display")) {
     //         $data['Room Rent Limit'] = $this->request->getPost("roomrentlimit");
     //     }
-        
+
     //     if ($this->request->getPost("icu_limit_display")) {
     //         $data['ICU Limit'] = $this->request->getPost("icu_limit");
     //     }
-        
+
     //     if ($this->request->getPost("proportionatedeductionclause_display")) {
     //         $data['Proportionate Deduction Clause'] = $this->request->getPost("proportionatedeductionclause");
     //     }
-        
+
     //     if ($this->request->getPost("ailmentcapping_display")) {
     //         $data['Ailment capping'] = $this->request->getPost("ailmentcapping");
     //     }
-        
+
     //     if ($this->request->getPost("ailment_capping_details_display")) {
     //         $data['Ailment capping Details'] = $this->request->getPost("ailment_capping_details");
     //     }
-        
+
     //     if ($this->request->getPost("corporatebuffer_display")) {
     //         $data['Corporate Buffer'] = $this->request->getPost("corporatebuffer");
     //     }
-        
+
     //     if ($this->request->getPost("non_admissible_contingency_corporate_buffer_display")) {
     //         $data['Non-Admissible / Contingency Corporate Buffer'] = $this->request->getPost("non_admissible_contingency_corporate_buffer");
     //     }
-        
+
     //     if ($this->request->getPost("ambulancecharges_display")) {
     //         $data['Ambulance Charges'] = $this->request->getPost("ambulancecharges");
     //     }
-        
+
     //     if ($this->request->getPost("airambulance_display")) {
     //         $data['Air Ambulance'] = $this->request->getPost("airambulance");
     //     }
-        
+
     //     if ($this->request->getPost("reasonableandcustomarycharges_display")) {
     //         $data['Reasonable and Customary Charges'] = $this->request->getPost("reasonableandcustomarycharges");
     //     }
-        
+
     //     if ($this->request->getPost("daycaretreatment_display")) {
     //         $data['Day Care Treatment'] = $this->request->getPost("daycaretreatment");
     //     }
-        
+
     //     if ($this->request->getPost("lasiksurgery_display")) {
     //         $data['Lasik Surgery'] = $this->request->getPost("lasiksurgery");
     //     }
-        
+
     //     if ($this->request->getPost("ayushtreatmentcover_display")) {
     //         $data['AYUSH treatment cover'] = $this->request->getPost("ayudhtreatmentcover");
     //     }
-        
+
     //     if ($this->request->getPost("moderntreatmentsasperirdai_display")) {
     //         $data['Modern treatments as per IRDAI'] = $this->request->getPost("moderntreatmentsasperirdai");
     //     }
-        
+
     //     if ($this->request->getPost("opd_treatment_display")) {
     //         $data['OPD Treatment'] = $this->request->getPost("opd_treatment");
     //     }
-        
+
     //     if ($this->request->getPost("days_of_discharge_display")) {
     //         $data['Claim Intimation Clause'] = $this->request->getPost("days_of_discharge");
     //     }
-        
+
     //     if ($this->request->getPost("days_from_dod_display")) {
     //         $data['Claim Submission'] = $this->request->getPost("days_from_dod");
     //     }
-        
+
     //     if ($this->request->getPost("terrorism_display")) {
     //         $data['Terrorism'] = $this->request->getPost("terrorism");
     //     }
-        
+
     //     if ($this->request->getPost("widower_cover_display")) {
     //         $data['Widower Cover'] = $this->request->getPost("widower_cover");
     //     }
-        
+
     //     if ($this->request->getPost("breavement_cover_display")) {
     //         $data['Breavement Cover'] = $this->request->getPost("breavement_cover");
     //     }
 
     //     if ($this->request->getPost("special_condition_display_value")) {
-            
+
     //         $specialConditionKeyValue = $this->request->getPost("special_condition_display_value") ?? [];
     //         $specialConditionKeyValue = json_decode($specialConditionKeyValue, true);
 
@@ -2918,14 +2933,14 @@ class ClientController extends AdminController
     //             $data = array_merge($data, $mergedArray);
     //         }
     //     }
-        
+
     //     if(isset($data) && !empty($data)){
     //         return $data;
     //     }else{
     //         $data = [];
     //         return $data;
     //     }
-    
+
     // }
 
     public function enrollmentGMCDisplayValueTransform()
@@ -3092,7 +3107,7 @@ class ClientController extends AdminController
                 'gpa_special_condition_input',
                 'multiple_sum_insured',
             ];
-            
+
             $fieldsWithoutCommaRemoval = [
                 'permanentPartialDisablement',
                 'temporaryTotalDisablementBenefit',
@@ -3109,27 +3124,27 @@ class ClientController extends AdminController
                 'animalSnakeInsectBite',
                 'air_ambulance'
             ];
-            
+
             // Remove commas and assign if present
             foreach ($fieldsWithCommaRemoval as $field) {
                 $value = $this->request->getPost($field);
                 if ($value !== null) {
                     $data[$field] = str_replace(',', '', $value);
-                }else{
-                     $data[$field] = $value;
+                } else {
+                    $data[$field] = $value;
                 }
             }
-            
+
             // Direct assign if present
             foreach ($fieldsWithoutCommaRemoval as $field) {
                 $value = $this->request->getPost($field);
                 if ($value !== null) {
                     $data[$field] = $value;
-                }else{
-                     $data[$field] = $value;
+                } else {
+                    $data[$field] = $value;
                 }
             }
-            
+
             $data['enrollment_display_key'] = $this->enrollmentGPADisplayValueTransform();
 
             // print_r($data); die;
@@ -3819,10 +3834,10 @@ class ClientController extends AdminController
 
         $cd_data = array_merge($cd_data, $client_cd_data);
 
-        if($return_type == "internal"){
-            if(!empty($cd_data)){
+        if ($return_type == "internal") {
+            if (!empty($cd_data)) {
                 return $cd_data;
-            }else{
+            } else {
                 return [];
             }
         }
@@ -3850,7 +3865,7 @@ class ClientController extends AdminController
 
         $client_policy_id = $this->request->getPost("client_policy_id");
         $policy_terms = $this->request->getPost("policy_terms");
-        $policy_terms = json_decode($policy_terms, true); 
+        $policy_terms = json_decode($policy_terms, true);
 
         $data = [];
 
@@ -3858,12 +3873,11 @@ class ClientController extends AdminController
 
             if (str_ends_with($key, '_display')) {
 
-                $original_key = substr($key, 0, -8); 
+                $original_key = substr($key, 0, -8);
 
                 $newKey = implode(' ', array_map('ucfirst', explode('_', $original_key)));
 
                 $data['enrollment_display_key'][$newKey] = $policy_terms[$original_key] ?? " ";
-
             } else {
 
                 $data[$key] = $value;
@@ -3871,10 +3885,10 @@ class ClientController extends AdminController
         }
 
         if (!empty($data)) {
-            $policy_terms['is_payable_employee']['self'] = 0; 
-            $policy_terms = json_encode($data); 
+            $policy_terms['is_payable_employee']['self'] = 0;
+            $policy_terms = json_encode($data);
         }
-        
+
 
         $record = $this->clientPolicyModel->where('id', $client_policy_id)->first();
 
@@ -4296,9 +4310,9 @@ class ClientController extends AdminController
         // -----------for vehicle ---------------------------------------------------------------------------
 
         $vehicles = $this->vehicleModel
-        ->select('vehicle.*, clients.client_type')
-        ->join('clients', 'clients.id=vehicle.owner')
-        ->where('vehicle.is_active', 1)->findAll();
+            ->select('vehicle.*, clients.client_type')
+            ->join('clients', 'clients.id=vehicle.owner')
+            ->where('vehicle.is_active', 1)->findAll();
 
         // -----------for Insurer ---------------------------------------------------------------------------
 
@@ -4421,12 +4435,12 @@ class ClientController extends AdminController
         $cd_data = array_merge($cd_data, $client_cd_data);
 
         if (!empty($cd_data)) {
-            return $this->respond([ 'status' => true,'code' => 200, 'data' => $cd_data], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $cd_data], 200);
         } else {
-            return $this->respond(['status' => false,'code' => 404,'client_id' => $client_id,'insurer_id' => $insurer_id,'insurer_branch_id' => $insurer_branch_id ], 200);
+            return $this->respond(['status' => false, 'code' => 404, 'client_id' => $client_id, 'insurer_id' => $insurer_id, 'insurer_branch_id' => $insurer_branch_id], 200);
         }
     }
-    
+
     // public function getCDAccNoByClientAndInsurer($client, $insurer, $insurer_branch_id)
     // {
     //     $cdmData = $this->CDMasterModel
@@ -4461,7 +4475,7 @@ class ClientController extends AdminController
         // Add additional fields if client type is 2
         if ($client_type == 2) {
             $client_data = array_merge($client_data, [
-                'dob' => change_date_format($postData['dob'],'d/m/Y','Y-m-d'),
+                'dob' => change_date_format($postData['dob'], 'd/m/Y', 'Y-m-d'),
                 'aadhar' => $postData['aadhar'],
                 'phone' => $postData['phone'],
                 'entity_type_id' => 7
@@ -4519,7 +4533,7 @@ class ClientController extends AdminController
         $client_type = $postData['client_type'] ?? null;
 
         $client_insert = null;
-        if($client_type == 2){
+        if ($client_type == 2) {
 
             $client_data = [
                 'client_type' => $postData['client_type'],
@@ -4530,8 +4544,7 @@ class ClientController extends AdminController
             ];
 
             $client_insert = $this->clientModel->insert($client_data);
-
-        }else if($client_type == 1){
+        } else if ($client_type == 1) {
 
             $client_data = [
                 'client_type' => $postData['client_type'],
@@ -4539,10 +4552,10 @@ class ClientController extends AdminController
                 'short_name' => $postData['short_name'] ?? $postData['client_name'],
                 'client_code' => generate_client_code(),
                 'entity_type_id' => 2
-            ]; 
-        
-             $client_insert = $this->clientModel->insert($client_data);
-        }        
+            ];
+
+            $client_insert = $this->clientModel->insert($client_data);
+        }
 
         if (!$client_insert) {
             return $this->respond(['status' => false, 'message' => 'Failed to create client'], 200);
@@ -4582,7 +4595,7 @@ class ClientController extends AdminController
             ->where('client_id', $client_insert)
             ->where('is_active', 1)
             ->findAll();
-            
+
         return $this->respond([
             'status' => true,
             'data' => $postData,
@@ -4613,12 +4626,12 @@ class ClientController extends AdminController
             $vehicle_insert = $this->vehicleModel->insert($data);
 
             if ($vehicle_insert) {
-                
+
                 // $vehicles = $this->vehicleModel->where('is_active', 1)->findAll();
                 $vehicles = $this->vehicleModel->select('vehicle.*, clients.client_type')
-                            ->join('clients', 'clients.id=vehicle.owner')
-                            ->where('vehicle.is_active', 1)
-                            ->findAll();
+                    ->join('clients', 'clients.id=vehicle.owner')
+                    ->where('vehicle.is_active', 1)
+                    ->findAll();
 
                 return $this->respond([
                     'status' => true,
@@ -4656,7 +4669,6 @@ class ClientController extends AdminController
                 ];
 
                 $client_insert = $this->clientModel->insert($client_data);
-
             } else if ($client_type == 1) {
 
                 $client_data = [
@@ -4717,7 +4729,7 @@ class ClientController extends AdminController
                     ->where('is_active', 1)
                     ->findAll();
 
-                    // Fetch branches in a single query
+                // Fetch branches in a single query
                 $branches = $this->clientBranchModel
                     ->where('client_id', $client_insert)
                     ->where('is_active', 1)
@@ -4734,11 +4746,9 @@ class ClientController extends AdminController
                     'vehicles' => $vehicles,
                     'message' => 'Vehicle created successfully'
                 ], 200);
-
             } else {
                 return $this->respond(['status' => false, 'message' => 'Failed to created vehicle'], 200);
             }
-
         } else if (isset($data['owner']) && !empty($data['owner'])) {
 
             $vehicle_data = [
@@ -4750,7 +4760,7 @@ class ClientController extends AdminController
             ];
 
             $vehicle_insert = $this->vehicleModel->insert($vehicle_data);
-            
+
             $vehicles = $this->vehicleModel->select('vehicle.*, clients.client_type')
                 ->join('clients', 'clients.id = vehicle.owner')
                 ->where('vehicle.is_active', 1)
@@ -4761,7 +4771,7 @@ class ClientController extends AdminController
                 ->where('is_active', 1)
                 ->findAll();
 
-                // Fetch branches in a single query
+            // Fetch branches in a single query
             $branches = $this->clientBranchModel
                 ->where('client_id', $data['owner'])
                 ->where('is_active', 1)
@@ -4780,7 +4790,6 @@ class ClientController extends AdminController
                     'vehicles' => $vehicles,
                     'message' => 'Vehicle created successfully'
                 ], 200);
-                
             } else {
                 return $this->respond(['status' => false, 'message' => 'Failed to created vehicle'], 200);
             }
@@ -4928,7 +4937,7 @@ class ClientController extends AdminController
     //                 return $this->respond(['status' => true, 'code' => 409, "message" => $message, 'received_data' => $received_data, 'db_data' => $data], 200);
     //             }
     //         }
-            
+
     //     } else {
     //         return $this->respond(['status' => false, 'message' => 'No Data Found', 'code' => 404, 'received_data' => $received_data], 200);
     //     }
@@ -4944,10 +4953,10 @@ class ClientController extends AdminController
         $client_type = $this->request->getGet('client_type');
 
         $data = $this->policyTransactionModel
-                        ->where('is_active', 1)
-                        ->where('action_type', 'inception')
-                        ->where('policy_no', $policy_no)
-                        ->countAllResults();
+            ->where('is_active', 1)
+            ->where('action_type', 'inception')
+            ->where('policy_no', $policy_no)
+            ->countAllResults();
 
         if ($data > 0) {
             return $this->respond(['status' => true, 'message' => 'This policy number is already linked to another client', 'data' => $data, 'code' => 409, 'received_data' => $received_data], 200);
@@ -4957,7 +4966,7 @@ class ClientController extends AdminController
     }
 
     public function get_client_policy_data_using_policy_no_and_endo_no()
-    {   
+    {
         $policy_no = $this->request->getGet('policy_no');
         $endorsement_no = $this->request->getGet('endorsement_no');
 
@@ -4980,10 +4989,10 @@ class ClientController extends AdminController
     {
         if ($id) {
             $branch_data = $this->clientBranchModel
-                    ->select('client_branch.*, clients.pan')
-                    ->join('clients', 'client_branch.client_id = clients.id')
-                    ->where(['client_branch.id' => $id, 'client_branch.is_active' => 1])
-                    ->first();
+                ->select('client_branch.*, clients.pan')
+                ->join('clients', 'client_branch.client_id = clients.id')
+                ->where(['client_branch.id' => $id, 'client_branch.is_active' => 1])
+                ->first();
             $branch_contact_data = $this->levelContactModel->where(['ref_id' => $id, 'contact_type' => 'client', 'is_active' => 1])->findAll();
             // print_rr($branch_contact_data);die();
             return $this->respond(['status' => true, 'code' => 200, 'data' => $branch_data, 'contact' => $branch_contact_data], 200);
@@ -4993,7 +5002,7 @@ class ClientController extends AdminController
     }
 
     public function getClientData()
-    {   
+    {
         $client_id = $this->request->getGet('client_id') ?? null;
         $result = $this->clientModel->getClientData($client_id);
         dd($result);
@@ -5010,17 +5019,17 @@ class ClientController extends AdminController
             ->where("policy_terms IS NOT NULL AND policy_terms <> ''")
             ->where('is_active', 1);
 
-        
+
         if (!empty($client_id)) {
             $query->where('client_id', $client_id);
         }
-        
+
         if (!empty($policy_type_id)) {
             $query->where('policy_type_id', $policy_type_id);
         }
-        
+
         $data = $query->findAll();
-        
+
         for ($i = 0; $i < count($data); $i++) {
 
             // dd($data[$i]);
@@ -5036,30 +5045,28 @@ class ClientController extends AdminController
             $is_addon = $data[$i]['is_addon'];
 
             $payable_arr = [];
-            if (in_array($data[$i]['policy_type_id'], [2,3]) && $is_addon == 1) {
-
-                $payable_arr = [ "self" => 0, "spouse" => 0, "childern" => 0, "elders" => 0, ];
+            if (in_array($data[$i]['policy_type_id'], [2, 3]) && $is_addon == 1) {
 
+                $payable_arr = ["self" => 0, "spouse" => 0, "childern" => 0, "elders" => 0,];
             } else if ($data[$i]['policy_type_id'] == 3 && $is_addon == 3) {
 
-                $payable_arr = ["self" => 1,"spouse" => 1,"childern" => 1,"elders" => 1,];
-
+                $payable_arr = ["self" => 1, "spouse" => 1, "childern" => 1, "elders" => 1,];
             } else if (in_array($data[$i]['policy_type_id'], [4, 5])) {
 
-                $payable_arr = ["self" => 1,"spouse" => 1,"childern" => 1,"elders" => 1,];
+                $payable_arr = ["self" => 1, "spouse" => 1, "childern" => 1, "elders" => 1,];
             }
 
             // Initialize an empty array for the ordered policy terms
             $orderedPolicyTerms = [];
 
-            if(in_array($data[$i]['policy_type_id'], [2,3,4,5])){
+            if (in_array($data[$i]['policy_type_id'], [2, 3, 4, 5])) {
 
                 // Set default value of copayzonewisecopay to "empty"
                 // $ans = isset($policyTerms['copayzonewisecopay']) ? $policyTerms['copayzonewisecopay'] : 'empty';
 
                 // add is_payable_employee for the GMC Policy
                 if (isset($policyTerms['age_ratio'])) {
-                    if(!isset($policyTerms['is_payable_employee'])){
+                    if (!isset($policyTerms['is_payable_employee'])) {
                         $aliment_index = array_search('age_ratio', array_keys($policyTerms));
                         $orderedPolicyTerms[] = [
                             "key" => "is_payable_employee",
@@ -5097,7 +5104,7 @@ class ClientController extends AdminController
 
                 // Add ailmentcapping and ailmentcappingdata if they exist
                 if (isset($policyTerms['ailmentcapping'])) {
-                    if(!isset($policyTerms['ailment_capping_details'])){
+                    if (!isset($policyTerms['ailment_capping_details'])) {
                         $aliment_index = array_search('ailmentcapping', array_keys($policyTerms));
                         $orderedPolicyTerms[] = [
                             "key" => "ailment_capping_details",
@@ -5106,12 +5113,11 @@ class ClientController extends AdminController
                         ];
                     }
                 }
-
-            }else {
+            } else {
 
                 // add is_payable_employee for the GMC Policy
                 if (isset($policyTerms['age_ratio'])) {
-                    if(!isset($policyTerms['is_payable_employee'])){
+                    if (!isset($policyTerms['is_payable_employee'])) {
                         $aliment_index = array_search('age_ratio', array_keys($policyTerms));
                         $orderedPolicyTerms[] = [
                             "key" => "is_payable_employee",
@@ -5121,9 +5127,9 @@ class ClientController extends AdminController
                             "position" => $aliment_index + 1,
                         ];
                     }
-                }else{
+                } else {
 
-                    if(!isset($policyTerms['is_payable_employee'])){
+                    if (!isset($policyTerms['is_payable_employee'])) {
                         $orderedPolicyTerms[] = [
                             "key" => "is_payable_employee",
                             "value" => [
@@ -5133,7 +5139,6 @@ class ClientController extends AdminController
                         ];
                     }
                 }
-
             }
 
             foreach ($orderedPolicyTerms as $term) {
@@ -5155,12 +5160,12 @@ class ClientController extends AdminController
                 }
             }
 
-            if(in_array($data[$i]['policy_type_id'], [2,3,4,5])){
+            if (in_array($data[$i]['policy_type_id'], [2, 3, 4, 5])) {
 
                 if (!isset($policyTerms['waiver_of_90_days_waiting_period'])) {
                     $policyTerms['waiver_of_90_days_waiting_period'] = "";
                 }
-                
+
                 if (!isset($policyTerms['waiver_of_other_waiting_periods'])) {
                     $policyTerms['waiver_of_other_waiting_periods'] = "";
                 }
@@ -5168,7 +5173,7 @@ class ClientController extends AdminController
                 if (!isset($policyTerms['maternity_benefit'])) {
                     $policyTerms['maternity_benefit'] = "";
                 }
-                
+
                 if (!isset($policyTerms['well_baby_well_mother_expenses'])) {
                     $policyTerms['well_baby_well_mother_expenses'] = "";
                 }
@@ -5196,61 +5201,59 @@ class ClientController extends AdminController
                 if (!isset($policyTerms['widower_cover'])) {
                     $policyTerms['widower_cover'] = "";
                 }
-                
+
                 if (!isset($policyTerms['breavement_cover'])) {
                     $policyTerms['breavement_cover'] = "";
                 }
-                
+
                 if (!isset($policyTerms['enrollment_display_key'])) {
                     $policyTerms['enrollment_display_key'] = $this->existingGMCDisplayValueTransform($policyTerms);
                 }
-
-            } else if($data[$i]['policy_type_id'] == 1){
+            } else if ($data[$i]['policy_type_id'] == 1) {
 
                 if (!isset($policyTerms['medical_expenses_medical_extension'])) {
                     $policyTerms['medical_expenses_medical_extension'] = "";
                 }
-                
+
                 if (!isset($policyTerms['opd_treatment_cover'])) {
                     $policyTerms['opd_treatment_cover'] = "";
                 }
-                
+
                 if (!isset($policyTerms['repatriation_of_mortal_remains'])) {
                     $policyTerms['repatriation_of_mortal_remains'] = "";
                 }
-                
+
                 if (!isset($policyTerms['family_transportation_benefits'])) {
                     $policyTerms['family_transportation_benefits'] = "";
                 }
-                
+
                 if (!isset($policyTerms['fractures_dislocation_burns'])) {
                     $policyTerms['fractures_dislocation_burns'] = "";
                 }
-                
+
                 if (!isset($policyTerms['coma'])) {
                     $policyTerms['coma'] = "";
                 }
-                
+
                 if (!isset($policyTerms['travel_expenses_for_medical_treatment'])) {
                     $policyTerms['travel_expenses_for_medical_treatment'] = "";
                 }
-                
+
                 if (!isset($policyTerms['daily_cash_allowance'])) {
                     $policyTerms['daily_cash_allowance'] = "";
                 }
-                
+
                 if (!isset($policyTerms['artifical_limb_and_prosthesis'])) {
                     $policyTerms['artifical_limb_and_prosthesis'] = "";
                 }
-                
+
                 if (!isset($policyTerms['air_ambulance'])) {
                     $policyTerms['air_ambulance'] = "";
                 }
-                                
+
                 if (!isset($policyTerms['enrollment_display_key'])) {
                     $policyTerms['enrollment_display_key'] = $this->existingGPADisplayValueTransform($policyTerms);
                 }
-                
             }
 
             // dd($policyTerms);
@@ -5431,7 +5434,7 @@ class ClientController extends AdminController
     }
 
     public function existingGPADisplayValueTransform($data)
-    {   
+    {
         $transformedData = [];
 
         if (isset($data["accidentalDeathBenefit"])) {
@@ -5474,7 +5477,7 @@ class ClientController extends AdminController
             $transformedData['Fractures / Dislocation / Burns'] = $data["fractures_dislocation_burns"];
         }
         if (isset($data["coma"])) {
-            $transformedData['Coma'] = $data["coma"]; 
+            $transformedData['Coma'] = $data["coma"];
         }
         if (isset($data["carriageofDeadBody"])) {
             $transformedData['Carriage of Dead Body'] = $data["carriageofDeadBody"];
@@ -5509,24 +5512,24 @@ class ClientController extends AdminController
             ->where('is_active', 1)
             ->get()
             ->getResultArray();
-    
+
         $days = [];
         foreach ($data as $value) {
 
             $reminderDate = strtotime($value['reminder_date']);
             if ($reminderDate) {
                 $date_of_date = date('d', $reminderDate);
-                $days[] = $date_of_date; 
+                $days[] = $date_of_date;
                 $days[] = $value['reminder_date'];
                 db_connect()->table('client_policy')->where('id', $value['id'])->set('reminder_date', $date_of_date)->update();
-            } 
+            }
         }
-    
+
         dd($days);
     }
 
     public function sendextraparam()
-    {   
+    {
         //     $data = db_connect()->table('jobs')->where('id', 1677)->get()->getRowArray();
         //     // dd($data);
         //    $return = $this->updatePolicyTransactionDataWhileClinetPolicyUpdate(json_decode($data['payload'], true));
@@ -5557,7 +5560,7 @@ class ClientController extends AdminController
         // $res = $empServiceController->employeesSIEnhanceProcess(['file_id' => '978']);
         // $res = $empServiceController->employeeDisembark(['file_id' => '1681']); 
         // $res = $empServiceController->employeesCorrectionProcess(['file_id' => '2033']); 
-        dd( $res); 
+        dd($res);
 
         $EmployeeMultiEventServiceController = new EmployeeMultiEventServiceController();
         // $res = $EmployeeMultiEventServiceController->constructMultiEventData(['file_id' => '1069']); 
@@ -5588,7 +5591,7 @@ class ClientController extends AdminController
             'event_type' => "correction",
             'actions' => "export",
             'file_name' => "deletion_enhancement_test_file.xlsx",
-        ]; 
+        ];
 
         // $batch_data = [
         //     'client_id' => 20,
@@ -5610,7 +5613,7 @@ class ClientController extends AdminController
 
         // $emp_data = $this->employeePolicyModel->getEmployeePolicyForEcard(12);
         // $ids = array_column($emp_data, 'id');
-        
+
         $EmpDataServiceController = new EmpDataServiceController();
         // $res = $EmpDataServiceController->generateExcelForDeletion($batch_data); dd($return); die;
         // $res = $EmpDataServiceController->generateExcelForSIEnhancement($batch_data); die;
@@ -5636,7 +5639,7 @@ class ClientController extends AdminController
         // ];
         // $res = $EmpDataServiceController->makeEntryForBDSPolicyTransaction($params);
         // dd($res);
-        
+
         // $array = [
         //         "employeeIds" => ["12800", "12798", "12797", "12799"],
         //         "client_id" => "159",
@@ -5649,7 +5652,7 @@ class ClientController extends AdminController
         //         "policy_name" => "GMC",
         //         "user_id" => "1"
         // ];
-        
+
         // $EmpDataServiceController->cashDepositCalculationForDeletion($array);
 
         // $result = $this->employeePolicyModel->getInceptionEmployeeDataForExportExcel($batch_data);
@@ -5679,11 +5682,11 @@ class ClientController extends AdminController
         // dd($res);
 
         // -----------BDS REPORT CONTROLLER---------------------------------------------------------------------------------
-        
+
         // $BDSReportController = new BDSReportController();
 
         // $data['data'] = $BDSReportController->getBAPInsurerData();
-        
+
         // return $this->loadLayout('irda_bap_insurer_report_list', $data);
 
         // $data['data'] = $BDSReportController->getBAPClientData();
@@ -5700,7 +5703,7 @@ class ClientController extends AdminController
         // $email_id = 'venkateshraman786@gmail.com';
         // $common = ['mail_type'=>'test_mail_cli'];
         // $bcc = "vitvelz@gmail.com";
-        
+
         // $data = db_connect()
         // ->table('jobs')
         // ->where('id', 2264)
@@ -5708,7 +5711,7 @@ class ClientController extends AdminController
         // ->getResultArray();
 
         // $data = json_decode($data[0]['payload'], true);
-        
+
         // // dd($data);
         // // Send email and get response
         // $result = MailHelper::send_email($data[0]);
@@ -5722,7 +5725,7 @@ class ClientController extends AdminController
         // print_rr($reportData);
         // $this->loadLayout('tat_report_band_wise_list', $reportData);
         // $data = $ticketModel->getTATReport(1);
-        
+
         // $empmodel = new EmployeeModel();
         // $data = $empmodel->getEmployeePolicy(348);
         // dd($data);
@@ -5786,7 +5789,7 @@ class ClientController extends AdminController
         // $return_value = check_cd_entry_exist($baseWhere);
         // dd($return_value);
 
-        
+
 
 
         // $param = 9715454901;
@@ -5807,7 +5810,7 @@ class ClientController extends AdminController
     }
 
     // -------------------------------------------------------------------------------------------------------
-    
+
 
     public function createOtherTabContent()
     {
@@ -5830,20 +5833,16 @@ class ClientController extends AdminController
     // -------------------------------------------------------------------------------------------------------
 
     public function enrollmentAddonSIAmountDropdown($client_policy_id)
-    {   
-        if(!empty($client_policy_id)){
+    {
+        if (!empty($client_policy_id)) {
             $client_policy_details = $this->clientPolicyModel->where('id', $client_policy_id)->where('policy_status', 1)->where('is_active', 1)->first();
 
-            if(!empty($client_policy_details) && $client_policy_details['policy_type_id'] == 3 && $client_policy_details['is_addon'] == 3){
+            if (!empty($client_policy_details) && $client_policy_details['policy_type_id'] == 3 && $client_policy_details['is_addon'] == 3) {
 
                 $base_policy_id = $client_policy_details['base_policy'] ?? 0;
 
-                if(!empty($base_policy_id)){
-
-                    
-                    
+                if (!empty($base_policy_id)) {
                 }
-
             }
         }
     }
@@ -5853,12 +5852,12 @@ class ClientController extends AdminController
         $cd_ac_pk = $this->request->getGet('cd_ac_pk');
 
         $cd_amount = $this->clientDepositModel
-                ->where('is_active', 1)
-                ->where('cd_ac_pk', $cd_ac_pk)
-                ->orderBy('id', 'desc')
-                ->first();
+            ->where('is_active', 1)
+            ->where('cd_ac_pk', $cd_ac_pk)
+            ->orderBy('id', 'desc')
+            ->first();
 
-        if($cd_amount){
+        if ($cd_amount) {
             return $this->respond(['status' => true, 'code' => 200, 'data' => $cd_amount], 200);
         } else {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200);
@@ -5907,9 +5906,9 @@ class ClientController extends AdminController
             ->getResultArray();
 
         // print_r(db_connect()->getLastQuery()); die;
-       
+
         $dataForClientAndInsurer = $this->clientPolicyModel
-                ->select("
+            ->select("
                         clients.id AS client_id,
                         clients.client_name,
                         insurers.id AS insurer_id,
@@ -5917,12 +5916,12 @@ class ClientController extends AdminController
                         tpa.id AS tpa_id,
                         tpa.name AS tpa_name,
                     ")
-                ->join('clients', 'client_policy.client_id = clients.id', 'left')
-                ->join('insurers', 'client_policy.insurer_id = insurers.id', 'left')
-                ->join('tpa', 'client_policy.tpa_id = tpa.id', 'left')
-                ->where('client_policy.id', $param)
-                ->first();
-                
+            ->join('clients', 'client_policy.client_id = clients.id', 'left')
+            ->join('insurers', 'client_policy.insurer_id = insurers.id', 'left')
+            ->join('tpa', 'client_policy.tpa_id = tpa.id', 'left')
+            ->where('client_policy.id', $param)
+            ->first();
+
         $memberData = [];
 
         // Respond based on the query result
@@ -6097,9 +6096,9 @@ class ClientController extends AdminController
     {
         $db = db_connect();
         $renewalData = $db->table('old_renewal_data_copy')
-        ->where('client_id IS NOT NULL')
-        ->where('is_inserted != 1')
-        ->get()
+            ->where('client_id IS NOT NULL')
+            ->where('is_inserted != 1')
+            ->get()
             ->getResultArray();
         // dd($renewalData);
 
@@ -6123,8 +6122,8 @@ class ClientController extends AdminController
 
             // Update is_inserted field in DB
             $db->table('old_renewal_data_copy')
-            ->where('id', $value['id'])
-            ->set(['is_inserted' => 1])
+                ->where('id', $value['id'])
+                ->set(['is_inserted' => 1])
                 ->update();
 
             $successData[] = ['id' => $value['id'], 'client' => $value['insured']];
@@ -6137,8 +6136,8 @@ class ClientController extends AdminController
     {
         $db = db_connect();
         $renewalData = $db->table('old_renewal_data_copy')
-        ->where('insurer_id IS NULL')
-        ->get()
+            ->where('insurer_id IS NULL')
+            ->get()
             ->getResultArray();
         // dd($renewalData);
 
@@ -6165,11 +6164,11 @@ class ClientController extends AdminController
 
             // Update is_inserted field in DB
             $db->table('old_renewal_data_copy')
-            ->where('id', $value['id'])
-            ->set([
-                'insurer_id' => $value['insurer_id'],
-                'insurer_branch_id' => $value['insurer_branch_id'],
-            ])
+                ->where('id', $value['id'])
+                ->set([
+                    'insurer_id' => $value['insurer_id'],
+                    'insurer_branch_id' => $value['insurer_branch_id'],
+                ])
                 ->update();
 
             $successData[] = ['id' => $value['id'], 'insurer' => $value['insurer_name'], 'insurer_id' => $value['insurer_id'], 'insurer_branch_id' => $value['insurer_branch_id'],];
@@ -6184,9 +6183,9 @@ class ClientController extends AdminController
         $group = $this->request->getGet('group') ?? 2;
         $db = db_connect();
         $renewalData = $db->table('old_renewal_data_copy')
-        ->where('client_id IS NULL')
-        ->where('is_inserted = 0')
-        ->where('client_type_id', $group)
+            ->where('client_id IS NULL')
+            ->where('is_inserted = 0')
+            ->where('client_type_id', $group)
             // ->limit($limit)
             ->get()
             ->getResultArray();
@@ -6221,8 +6220,8 @@ class ClientController extends AdminController
 
             // Update is_inserted field in DB
             $db->table('old_renewal_data_copy')
-            ->where('id', $value['id'])
-            ->set(['is_inserted' => 1])
+                ->where('id', $value['id'])
+                ->set(['is_inserted' => 1])
                 ->update();
 
             $successData[] = ['id' => $value['id'], 'client' => $value['insured'], 'vehicle_id' => $value['vehicle_id']];
@@ -6313,8 +6312,8 @@ class ClientController extends AdminController
         }
 
         $vehicleData = $VehicleModel->where('owner', $renewalData['client_id'])
-        ->where('is_active', 1)
-        ->findAll();
+            ->where('is_active', 1)
+            ->findAll();
 
         if (!empty($vehicleData)) {
             $increment = count($vehicleData);
@@ -6554,17 +6553,17 @@ class ClientController extends AdminController
         return $id;
     }
 
-    private function reorderProposalsByInsurerTotal(array $data): array 
+    private function reorderProposalsByInsurerTotal(array $data): array
     {
 
         Kint::dump($data);
         if (!isset($data['premium_data']['data'])) return $data;
-    
+
         $original = $data['premium_data']['data'];
         $proposals = [];
         $others = [];
         $emptyKeyData = [];
-    
+
         foreach ($original as $key => $value) {
             // Match only keys that look like 'Proposal X'
             if (preg_match('/^Proposal\s+\d+$/', $key)) {
@@ -6573,7 +6572,7 @@ class ClientController extends AdminController
                     if ($subKey !== 'Quote Asked' && isset($subVal['Total'])) {
                         $proposals[$key] = $value;
                         break;
-                    }else{
+                    } else {
                         $proposals[$key] = $value;
                     }
                 }
@@ -6582,51 +6581,50 @@ class ClientController extends AdminController
                 if ($key === '' && isset($value['']) && is_array($value[''])) {
                     // Capture empty key to push it later
                     $emptyKeyData[$key] = $value;
-                }else{
+                } else {
                     $others[$key] = $value;
-
                 }
             }
         }
-    
+
         // dd($proposals, $others, $emptyKeyData);
         // Sort proposals by their insurer's total
-        uasort($proposals, function($a, $b) {
+        uasort($proposals, function ($a, $b) {
             $totalA = 0;
             $totalB = 0;
-    
+
             foreach ($a as $key => $val) {
                 if ($key !== 'Quote Asked' && isset($val['Total'])) {
                     $totalA = floatval($val['Total']);
                     break;
                 }
             }
-    
+
             foreach ($b as $key => $val) {
                 if ($key !== 'Quote Asked' && isset($val['Total'])) {
                     $totalB = floatval($val['Total']);
                     break;
                 }
             }
-    
+
             return $totalA <=> $totalB;
         });
-    
+
         // Merge back the sorted proposals into the full structure
         $data['premium_data']['data'] = array_merge($others, $proposals, $emptyKeyData);
         $data = $this->reorderProposalDataByPremiumOrder($data);
         return $data;
     }
 
-    private function reorderProposalDataByPremiumOrder(array $data): array 
+    private function reorderProposalDataByPremiumOrder(array $data): array
     {
         if (!isset($data['premium_data']['data'], $data['proposal_data']['over_all_column_data'])) {
             return $data;
         }
-    
+
         $premiumProposals = array_keys($data['premium_data']['data']);
         $filteredProposals = [];
-    
+
         // Collect proposal keys that match the pattern "Proposal X"
         foreach ($premiumProposals as $key) {
             if (preg_match('/^Proposal\s+\d+$/', $key) && isset($data['proposal_data']['over_all_column_data'][$key])) {
@@ -6635,13 +6633,13 @@ class ClientController extends AdminController
         }
 
         // dd($premiumProposals, $filteredProposals);
-    
+
         $data['proposal_data']['over_all_column_data'] = $filteredProposals;
         $data = $this->reorderProposalInHeaderAndData($data);
         return $data;
     }
-    
-    private function reorderProposalInHeaderAndData(array $data): array 
+
+    private function reorderProposalInHeaderAndData(array $data): array
     {
 
         // Kint::dump($data);
@@ -6649,7 +6647,7 @@ class ClientController extends AdminController
         $sortedProposalOrder = $data['proposal_data']['over_all_column_data'];
         $headers = $tableData['headers'] ?? [];
         $dataRows = $tableData['data'] ?? [];
-    
+
         // Step 1: Separate static and proposal headers
         $staticHeaders = [];
         $proposalHeaders = [];
@@ -6658,16 +6656,16 @@ class ClientController extends AdminController
             if (in_array($header['parentHeader'], array_keys($sortedProposalOrder))) {
                 $proposalHeaders[$header['parentHeader']] = $header;
             } else {
-                if($header['parentHeader'] == "Action"){
+                if ($header['parentHeader'] == "Action") {
                     $actionHeader[] = $header;
-                }else{
+                } else {
                     $staticHeaders[] = $header;
                 }
             }
         }
-    
+
         // dd($staticHeaders, $proposalHeaders, $sortedProposalOrder);
-        
+
         // Step 2: Reorder headers
         $reorderedHeaders = [];
         foreach ($sortedProposalOrder as $proposalKey => $proposalValue) {
@@ -6681,29 +6679,29 @@ class ClientController extends AdminController
             $value['parentHeader'] = 'Proposal ' . ($key + 1);
         }
         unset($value);
-        
+
 
         $reorderedHeaders = array_merge($staticHeaders, $reorderedHeaders, $actionHeader);
 
-    
+
         // Step 3: Reorder each row's `data` by matching parentth
         foreach ($dataRows as $dataRowIndex => &$row) {
             $staticData = [];
             $proposalData = [];
             $actionData = [];
-    
+
             foreach ($row['data'] as $entry) {
                 if (in_array($entry['parentth'], array_keys($sortedProposalOrder))) {
                     $proposalData[$entry['parentth']][] = $entry;
                 } else {
-                    if($entry['parentth'] == "Action"){
+                    if ($entry['parentth'] == "Action") {
                         $actionData[] = $entry;
-                    }else{
+                    } else {
                         $staticData[] = $entry;
                     }
                 }
             }
-    
+
             $reorderedProposalData = [];
             foreach ($sortedProposalOrder as $proposalKey => $proposalValue) {
                 if (isset($proposalData[$proposalKey])) {
@@ -6717,19 +6715,19 @@ class ClientController extends AdminController
             $increament = 0;
             foreach ($reorderedProposalData as $key => &$value) {
 
-                if($dubParTh == $value['parentth']){
+                if ($dubParTh == $value['parentth']) {
                     $value['parentth'] = 'Proposal ' . ($increament);
-                }else{
+                } else {
                     $dubParTh = $value['parentth'];
                     $increament = $increament + 1;
                     $value['parentth'] = 'Proposal ' . ($increament);
                 }
             }
             unset($value);
-    
+
             $row['data'] = array_merge($staticData, $reorderedProposalData, $actionData);
         }
-    
+
         $data['table_data']['headers'] = $reorderedHeaders;
         $data['table_data']['data'] = $dataRows;
 
@@ -6738,15 +6736,15 @@ class ClientController extends AdminController
         $updatedDataSet = $this->renumberProposalKeys($data['premium_data']['data']);
         $data['proposal_data']['over_all_column_data'] =  !empty($renumberedArray) ? $renumberedArray : $data['proposal_data']['over_all_column_data'];
         $data['premium_data']['data'] = !empty($updatedDataSet) ? $updatedDataSet : $data['premium_data']['data'];
-        
+
         return $data;
     }
-     
-    private function renumberProposalKeys(array $input): array 
+
+    private function renumberProposalKeys(array $input): array
     {
         $result = [];
         $counter = 1;
-    
+
         foreach ($input as $key => $value) {
             if (strpos($key, 'Proposal') === 0) {
                 $newKey = 'Proposal ' . $counter++;
@@ -6755,7 +6753,7 @@ class ClientController extends AdminController
                 $result[$key] = $value;
             }
         }
-    
+
         return $result;
     }
 
@@ -6764,20 +6762,18 @@ class ClientController extends AdminController
 
         $receivedData = $this->request->getPost();
 
-        if (!empty($receivedData['id'])){
+        if (!empty($receivedData['id'])) {
             $status = $this->clientApi->save($receivedData);
-
-        }else{
+        } else {
             $status = $this->clientApi->insert($receivedData);
         }
 
 
-        if ($status){
-            return $this->respond(['status'=>"Sucesss",'message'=>"Submitted Successfully"],200);
-        }else{
-            return $this->respond(['status'=>"Failed",'message'=>"Submission Faild"],500);
+        if ($status) {
+            return $this->respond(['status' => "Sucesss", 'message' => "Submitted Successfully"], 200);
+        } else {
+            return $this->respond(['status' => "Failed", 'message' => "Submission Faild"], 500);
         }
-
     }
 
     public function sendToken()
@@ -6787,17 +6783,17 @@ class ClientController extends AdminController
 
         $token = ClientTokenHelper::generateKey($client_id);
 
-        if ($token){
-            return $this->respond(['status' => 'success', 'token' => $token,'message' => "Token Generated Successfully"],200);
-        }else{
-            return $this->respond(['status' => "Failed","message"=>"Token Generation Failed, Try Again After some time"],500);
+        if ($token) {
+            return $this->respond(['status' => 'success', 'token' => $token, 'message' => "Token Generated Successfully"], 200);
+        } else {
+            return $this->respond(['status' => "Failed", "message" => "Token Generation Failed, Try Again After some time"], 500);
         }
     }
-    
+
     // ---------------- HR ACCESS CONTROL -----------------------------------------------------------------------------------
 
     public function viewHrAccessData()
-    {   
+    {
         $client_id = $this->request->getGet('client_id');
         $data = $this->getHrAccessData($client_id);
         // $data = [];
@@ -6817,7 +6813,8 @@ class ClientController extends AdminController
         $post_client_data = $this->clientModel->where('id', $client_id)->where('is_active', 1)->first();
 
         $hrAccessData['post_hr_data'] = $this->clientBranchModel
-            ->select('lc.id as post_hr_id, lc.name as hr_name, lc.mobile as hr_mobile, lc.email as hr_mail')
+            ->select('lc.id as post_hr_id, lc.name as hr_name, lc.mobile as hr_mobile, lc.email as hr_mail , 
+            client_branch.id as post_branch_id , client_branch.branch_name as post_branch_name')
             ->join('level_contacts lc', 'client_branch.id = lc.ref_id')
             ->where('client_branch.is_active', 1)
             ->where('lc.is_active', 1)
@@ -6826,7 +6823,7 @@ class ClientController extends AdminController
             ->findAll();
 
         $hrAccessData['post_policy_data'] = $this->clientPolicyModel
-            ->select('client_policy.id as client_policy_id, client_policy.policy_no as policy_no, policy_type.policy_type, client_policy.policy_status')
+            ->select('client_policy.id as client_policy_id, client_policy.policy_no as policy_no, policy_type.policy_type, client_policy.policy_status , client_policy.client_branch_id as branch_id')
             ->join('policy_type', 'client_policy.policy_type_id = policy_type.id')
             ->where('client_policy.is_active', 1)
             ->where('client_policy.client_id', $client_id)
@@ -6855,22 +6852,23 @@ class ClientController extends AdminController
 
             $hrAccessData['pre_hr_data'] = [];
             $hrAccessData['pre_policy_data'] = [];
-            $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id);
+            $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id , $pre_client_data['id']??'');
             return $combinedHrAccessData;
         }
 
         $pre_client_data = $db2->table('clients')->where('is_active', 1)->where('short_name', $post_client_data['short_name'])->get()->getRowArray();
 
-        if(empty($pre_client_data)){
+        if (empty($pre_client_data)) {
 
             $hrAccessData['pre_hr_data'] = [];
             $hrAccessData['pre_policy_data'] = [];
-            $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id);
+            $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id , $pre_client_data['id']??'');
             return $combinedHrAccessData;
         }
 
         $hrAccessData['pre_hr_data'] = $db2->table('client_branch')
-            ->select('lc.id as pre_hr_id, lc.name as hr_name, lc.mobile as hr_mobile, lc.email as hr_mail')
+            ->select('lc.id as pre_hr_id, lc.name as hr_name, lc.mobile as hr_mobile, lc.email as hr_mail 
+            , client_branch.id as pre_branch_id , client_branch.branch_name as pre_branch_name ' )
             ->join('level_contacts lc', 'client_branch.id = lc.ref_id')
             ->where('client_branch.is_active', 1)
             ->where('lc.is_active', 1)
@@ -6878,9 +6876,9 @@ class ClientController extends AdminController
             ->where('client_branch.client_id', $pre_client_data['id'])
             ->get()
             ->getResultArray();
-
+        
         $hrAccessData['pre_policy_data'] = $db2->table('client_policy')
-            ->select('client_policy.id as client_policy_id, client_policy.policy_no as policy_no, policy_type.policy_type, client_policy.policy_status')
+            ->select('client_policy.id as client_policy_id, client_policy.policy_no as policy_no, policy_type.policy_type, client_policy.policy_status , client_policy.client_branch_id as branch_id')
             ->join('policy_type', 'client_policy.policy_type_id = policy_type.id')
             ->where('client_policy.is_active', 1)
             ->where('client_policy.client_id',  $pre_client_data['id'])
@@ -6888,16 +6886,16 @@ class ClientController extends AdminController
             ->orderBy('client_policy.policy_status', 'desc')
             ->get()
             ->getResultArray();
-
         // dd($hrAccessData);
 
-        $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id);
+        $combinedHrAccessData = $this->constructHrAccessData($hrAccessData, $client_id ,$pre_client_data['id']);
         return $combinedHrAccessData;
     }
 
-    public function constructHrAccessData($data, $client_id)
-    {   
-        // dd($data);
+    public function constructHrAccessData($data, $client_id , $pre_client_id)
+    {
+        // print_rr($data);die;
+
         $preHrs = $data['pre_hr_data'];
         $postHrs = $data['post_hr_data'];
         $hrAccessTableData = $data['hr_access_table_data'];
@@ -6913,7 +6911,10 @@ class ClientController extends AdminController
                         'post_hr_id' => $post['post_hr_id'],
                         'hr_name' => $post['hr_name'],
                         'hr_mobile' => $post['hr_mobile'],
-                        'hr_mail' => $post['hr_mail']
+                        'hr_mail' => $post['hr_mail'],
+                        'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                        'post_branch_id'   => $post['post_branch_id'] ?? null,
+                        'post_branch_name' => $post['post_branch_name'] ?? null 
                     ];
                     unset($preHrs[$index]); // remove matched pre_hr
                     $found = true;
@@ -6927,7 +6928,10 @@ class ClientController extends AdminController
                     'post_hr_id' => $post['post_hr_id'],
                     'hr_name' => $post['hr_name'],
                     'hr_mobile' => $post['hr_mobile'],
-                    'hr_mail' => $post['hr_mail']
+                    'hr_mail' => $post['hr_mail'],
+                    'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                    'post_branch_id' => $post['post_branch_id'] ?? null ,
+                    'post_branch_name' => $post['post_branch_name'] ?? null
                 ];
             }
         }
@@ -6939,7 +6943,10 @@ class ClientController extends AdminController
                 'post_hr_id' => null,
                 'hr_name' => $pre['hr_name'],
                 'hr_mobile' => $pre['hr_mobile'],
-                'hr_mail' => $pre['hr_mail']
+                'hr_mail' => $pre['hr_mail'],
+                'pre_branch_id' => $pre['pre_branch_id'] ?? null,
+                'post_branch_id' => $post['post_branch_id'] ?? null ,
+                'post_branch_name' => $post['post_branch_name'] ?? null
             ];
         }
 
@@ -6964,81 +6971,90 @@ class ClientController extends AdminController
                     'hr_name' => $hr['hr_name'] ?? null,
                     'hr_mobile' => $hr['hr_mobile'] ?? null,
                     'hr_mail' => $hr['hr_mail'] ?? null,
+                    'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                    'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                    'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                    'pre_client_id'    => $pre_client_id ?? null
                 ];
             }
-
         } else {
-                    // First create a map of HR data by post_hr_id for quick lookup
-                    $hrMap = [];
-                    foreach ($merged as $hr) {
-                        $hrMap[$hr['post_hr_id']] = $hr;
-                    }
-                    
-                    // Process access data first
-                    foreach ($hrAccessTableData as $access) {
-                        $post_hr_id = $access['post_hr_id'];
-                        
-                        // Check if this HR exists in our merged data
-                        if (isset($hrMap[$post_hr_id])) {
-                            $hr = $hrMap[$post_hr_id];
-                            $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
-                            
-                            // Parse allowed modules
-                            $allowed_modules = json_decode($access['allowed_modules'], true) ?? null;
-                            $allowed_pre_modules = $allowed_modules['pre'] ?? [];
-                            $allowed_post_modules = $allowed_modules['post'] ?? [];
-                            
-                            $result[$temp_arr_key] = [
-                                'hr_access_table_pk' => $access['id'] ?? null,
-                                'post_client_id' => $access['post_client_id'] ?? null,
-                                'pre_hr_id' => $hr['pre_hr_id'] ?? null,
-                                'post_hr_id' => $hr['post_hr_id'] ?? null,
-                                'allowed_pre_modules' => $allowed_pre_modules,
-                                'allowed_post_modules' => $allowed_post_modules,
-                                'allowed_pre_policies' => json_decode($access['allowed_pre_policies'], true) ?? [],
-                                'allowed_active_policies' => json_decode($access['allowed_active_policies'], true) ?? [],
-                                'allowed_cd' => json_decode($access['allowed_cd'], true) ?? [],
-                                'hr_name' => $hr['hr_name'],
-                                'hr_mobile' => $hr['hr_mobile'],
-                                'hr_mail' => $hr['hr_mail']
-                            ];
-                            
-                            // Remove from map so we know it's been processed
-                            unset($hrMap[$post_hr_id]);
-                        }
-                    }
-                    
-                    // Now process any remaining HRs that didn't have access records
-                    foreach ($hrMap as $hr) {
-                        $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
-                        
-                        $result[$temp_arr_key] = [
-                            'hr_access_table_pk' => null,
-                            'post_client_id' => $client_id ?? null,
-                            'pre_hr_id' => $hr['pre_hr_id'] ?? null,
-                            'post_hr_id' => $hr['post_hr_id'] ?? null,
-                            'allowed_pre_modules' => [],
-                            'allowed_post_modules' => [],
-                            'allowed_pre_policies' => [],
-                            'allowed_active_policies' => [],
-                            'allowed_cd' => [],
-                            'hr_name' => $hr['hr_name'] ?? null,
-                            'hr_mobile' => $hr['hr_mobile'] ?? null,
-                            'hr_mail' => $hr['hr_mail'] ?? null,
-                        ];
-                    }
-        }
-        
+            // First create a map of HR data by post_hr_id for quick lookup
+            $hrMap = [];
+            foreach ($merged as $hr) {
+                $hrMap[$hr['post_hr_id']] = $hr;
+            }
 
-        $resultData['hr_access_data'] = array_values($result);
-        $resultData['pre_policy_data'] = $data['pre_policy_data'];
+            // Process access data first
+            foreach ($hrAccessTableData as $access) {
+                $post_hr_id = $access['post_hr_id'];
+
+                // Check if this HR exists in our merged data
+                if (isset($hrMap[$post_hr_id])) {
+                    $hr = $hrMap[$post_hr_id];
+                    $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
+
+                    // Parse allowed modules
+                    $allowed_modules = json_decode($access['allowed_modules'], true) ?? null;
+                    $allowed_pre_modules = $allowed_modules['pre'] ?? [];
+                    $allowed_post_modules = $allowed_modules['post'] ?? [];
+
+                    $result[$temp_arr_key] = [
+                        'hr_access_table_pk' => $access['id'] ?? null,
+                        'post_client_id' => $access['post_client_id'] ?? null,
+                        'pre_hr_id' => $hr['pre_hr_id'] ?? null,
+                        'post_hr_id' => $hr['post_hr_id'] ?? null,
+                        'allowed_pre_modules' => $allowed_pre_modules,
+                        'allowed_post_modules' => $allowed_post_modules,
+                        'allowed_pre_policies' => json_decode($access['allowed_pre_policies'], true) ?? [],
+                        'allowed_active_policies' => json_decode($access['allowed_active_policies'], true) ?? [],
+                        'allowed_cd' => json_decode($access['allowed_cd'], true) ?? [],
+                        'hr_name' => $hr['hr_name'],
+                        'hr_mobile' => $hr['hr_mobile'],
+                        'hr_mail' => $hr['hr_mail'],
+                        'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                        'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                        'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                        'pre_client_id'    => $pre_client_id ?? null
+                    ];
+
+                    // Remove from map so we know it's been processed
+                    unset($hrMap[$post_hr_id]);
+                }
+            }
+
+            // Now process any remaining HRs that didn't have access records
+            foreach ($hrMap as $hr) {
+                $temp_arr_key = $hr['hr_mobile'] . $hr['hr_mail'];
+
+                $result[$temp_arr_key] = [
+                    'hr_access_table_pk' => null,
+                    'post_client_id' => $client_id ?? null,
+                    'pre_hr_id' => $hr['pre_hr_id'] ?? null,
+                    'post_hr_id' => $hr['post_hr_id'] ?? null,
+                    'allowed_pre_modules' => [],
+                    'allowed_post_modules' => [],
+                    'allowed_pre_policies' => [],
+                    'allowed_active_policies' => [],
+                    'allowed_cd' => [],
+                    'hr_name' => $hr['hr_name'] ?? null,
+                    'hr_mobile' => $hr['hr_mobile'] ?? null,
+                    'hr_mail' => $hr['hr_mail'] ?? null,
+                    'pre_branch_id' => $hr['pre_branch_id'] ?? null,
+                    'post_branch_id' => $hr['post_branch_id'] ?? null ,
+                    'post_branch_name' => $hr['post_branch_name'] ?? null ,
+                    'pre_client_id'    => $pre_client_id ?? null
+                ];
+            }
+        }
+
+
+        $resultData['hr_access_data']   = array_values($result);
+        $resultData['pre_policy_data']  = $data['pre_policy_data'];
         $resultData['post_policy_data'] = $data['post_policy_data'];
-        $resultData['post_cd_data'] = $data['post_cd_data'];
-        // echo '**********************************************';
-        // print_rr($resultData);die();
+        $resultData['post_cd_data']     = $data['post_cd_data'];
 
         return $resultData;
-    }
+    }       
 
     public function saveHrAccessData()
     {
@@ -7078,6 +7094,10 @@ class ClientController extends AdminController
 
                     // INSERT or UPDATE
                     if (empty($value['pk']) || (int)$value['pk'] === 0) {
+                        print_rr("inside insert block");
+                        print_rr($value);die;
+
+
                         unset($value['pk']); // Prevent insert error
                         $insertedId = $this->HRAccessControlModel->insert($value);
                         if ($insertedId === false) {
@@ -7086,6 +7106,9 @@ class ClientController extends AdminController
                         $success[] = "Inserted row at index {$index} with ID {$insertedId}.";
                     } else {
                         $update = $this->HRAccessControlModel->update($value['pk'], $value);
+                        print_rr("inside update block");
+                        print_rr($value);die;
+
                         if ($update === false) {
                             throw new \Exception('Update failed for ID ' . $value['pk'] . ': ' . json_encode($this->HRAccessControlModel->errors()));
                         }
@@ -7119,7 +7142,6 @@ class ClientController extends AdminController
                     'details' => $success,
                     'data' => $html,
                 ], 200);
-
             } else {
                 return $this->respond([
                     'status' => false,
@@ -7457,6 +7479,84 @@ class ClientController extends AdminController
 
         return $this->respond(['status' => true, 'message' => 'Demo client data wiped successfully'], 200);
     }
+
+    private function getClientlistFromPre (){
+        $db2 = \Config\Database::connect('preDB');
+
+        $auto_fetch_client_list = $db2->table('clients')
+        ->select('id,client_name')
+        ->where('is_active',1)
+        ->get()->getResultArray()??[];
+
+        return $auto_fetch_client_list;
+
+    }
+
+    public function auto_fetch_branch(){
+
+        $data = $this->request->getPost();
+
+        $db2 = \Config\Database::connect('preDB');
+
+        $auto_fetch_branch_list = $db2->table('client_branch')
+        ->select('id,branch_name')
+        ->where('client_id',$data['client_id'])
+        ->where('is_active',1)
+        ->get()->getResultArray()??[];
+
+        return 
+
+        empty($auto_fetch_branch_list)
+
+        ? $this->response->setJSON([
+                'status' => false,
+                'message' => 'branch list is empty',
+                'data' => []
+            ])->setStatusCode(400)
+        
+        :   $this->response->setJSON([
+                'status' => true,
+                'message' => 'branch list is found' ,
+                 'data' => $auto_fetch_branch_list
+            ])->setStatusCode(200);
+    }
+
+    public function auto_fetch_branch_details(){
+
+        $data = $this->request->getPost();
+
+        $db2 = \Config\Database::connect('preDB');
+
+        $auto_fetch_branch_details = $db2->table('client_branch')
+                                        ->where('client_id',$data['client_id'])
+                                        ->where('id',$data['branch_id'])
+                                        ->where('is_active',1)
+                                        ->get()->getResultArray()??[];
+
+        return empty($auto_fetch_branch_details)
+
+                    ? $this->response->setJSON([
+                            'status' => false,
+                            'message' => 'branch details is empty',
+                            'data' => []
+                        ])->setStatusCode(400)
+                    
+                    :   $this->response->setJSON([
+                            'status' => true,
+                            'message' => 'branch details found' ,
+                            'data' => $auto_fetch_branch_details
+                        ])->setStatusCode(200);
+
+    }
+
+
+
+
+
+
+
+
+
+
+
 }
-
-
diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index b9ed11a4..73c2e31a 100755
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -259,7 +259,7 @@ class DashboardController extends AdminController
 
         // dd(get_role_id(),user_team());
         // dd($data);
-        
+        $data['tab_name'] = 'Dashboard';
         $data['page_name'] = 'Dashboard';
 
         echo view('layout/header',  $data);
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 3751da86..a4666518 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -135,6 +135,9 @@ class EmployeeController extends AdminController
 
         // dd($this->request->getGet());
         $this->myLogger->logme('error', 'list called');
+
+        $data['page_name'] = "Members";
+
         $this->loadLayout('employee_list', $data);
     }
 
@@ -307,6 +310,7 @@ class EmployeeController extends AdminController
             return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => 'file upload success'], 200);
         }
 
+        $data['tab_name'] = 'View Inception';
         $data['page_name'] = 'View Inception';
 
         //for TPA/insurer upload
@@ -786,6 +790,9 @@ class EmployeeController extends AdminController
         }
 
         $this->myLogger->logme('error', 'list called');
+        
+        $data['page_name'] = "Endorsement";
+
         $this->loadLayout('endorsement_list', $data);
     }
 
@@ -830,6 +837,9 @@ class EmployeeController extends AdminController
         // dd($data);
 
         $this->myLogger->logme('error', 'list called');
+
+        $data['page_name'] = "Enrollment";
+
         return $this->loadLayout('enrollment_list', $data);
     
      }
@@ -3039,6 +3049,8 @@ class EmployeeController extends AdminController
             // print_r($data); die;
         // }
 
+        $data['page_name'] = "Retail Endorsement";
+
         $this->loadLayout('retail_endorsement_list', $data);
     }
 
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index d5f8ea12..09db4318 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -142,6 +142,7 @@ class LeadsController extends BaseController
 
     public function viewLeadsList()
     {
+        $data['tab_name'] = 'Leads';
         $data['page_name'] = 'Leads';
 
         // Set basic data
@@ -746,6 +747,7 @@ class LeadsController extends BaseController
         }
 
         $data['question_json'] = $lead_data['question_json'];
+        $data['tab_name'] = $type == 2 ? 'QCR' : 'RFQ';
         $data['page_name'] = $type == 2 ? 'QCR' : 'RFQ';
         $data['insurer'] = $this->insurerBranchModel->getInsurerBranchesWithInsurerNames();
         $data['userList'] = $this->userModel->getUserListForRFQ();
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index c26d6fb8..013a9324 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -107,7 +107,8 @@ class MasterController extends AdminController
     public function insurerList()
     {   
         $this->myLogger->logme('error','Insurer list function called');
-        $headerData['page_name'] = 'Insurer List';
+        $headerData['tab_name'] = 'Insurer List';
+        $headerData['page_name'] = 'Insurers';
         $data['insurerList'] = $this->insurerModel->where('is_active',1)->findAll();
         $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
         // echo '<pre>';
@@ -154,7 +155,8 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Edit Insurer Onboarding function called');
-        $headerData['page_name'] = 'Edit Insurer Master';
+        $headerData['tab_name'] = 'Edit Insurer Master';
+        $headerData['page_name'] = 'Insurers';
 
         $types = array(
             (object) array('id' => 'pvt', 'name' => 'PVT'),
@@ -245,7 +247,8 @@ class MasterController extends AdminController
     {
         
         $this->myLogger->logme('error','Insurer Onboarding function called');
-        $headerData['page_name'] = 'Insurer Master';
+        $headerData['tab_name'] = 'Insurer Master';
+        $headerData['page_name'] = 'Insurers';
 
         $types = array(
             (object) array('id' => 'pvt', 'name' => 'PVT'),
@@ -504,7 +507,8 @@ class MasterController extends AdminController
     public function tpaList()
     {   
         $this->myLogger->logme('error','TPA list function called');
-        $headerData['page_name'] = 'TPA List';
+        $headerData['tab_name'] = 'TPA List';
+        $headerData['page_name'] = 'TPA';
         $data['tpaList'] = $this->tpaModel->where('is_active',1)->findAll();
         // $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
         // echo '<pre>';
@@ -550,7 +554,8 @@ class MasterController extends AdminController
     {
         
         $this->myLogger->logme('error','TPA Onboarding function called');
-        $headerData['page_name'] = 'TPA Master';
+        $headerData['tab_name'] = 'TPA Master';
+        $headerData['page_name'] = 'TPA';
 
 
         // print_r($data['types']);die();
@@ -664,7 +669,8 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Edit TPA Onboarding function called');
-        $headerData['page_name'] = 'Edit TPA Master';
+        $headerData['tab_name'] = 'Edit TPA Master';
+        $headerData['page_name'] = 'TPA';
 
         $tpa_data = $this->tpaModel->where(['id' => $id, 'is_active' => 1])->first();
 
@@ -833,7 +839,8 @@ class MasterController extends AdminController
     public function kycList()
     {   
         $this->myLogger->logme('error','KYC list function called');
-        $headerData['page_name'] = 'KYC List';
+        $headerData['tab_name'] = 'KYC List';
+        $headerData['page_name'] = 'KYC';
         $data['kycList'] = $this->kycEntityTypeModel->where('is_active',1)->findAll();
         // $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
         // echo '<pre>';
@@ -879,7 +886,8 @@ class MasterController extends AdminController
     {
         
         $this->myLogger->logme('error','KYC Onboarding function called');
-        $headerData['page_name'] = 'KYC Master';
+        $headerData['tab_name'] = 'KYC Master';
+        $headerData['page_name'] = 'KYC';
 
 
         // print_r($data['types']);die();
@@ -944,7 +952,8 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Edit KYC Onboarding function called');
-        $headerData['page_name'] = 'Edit KYC Master';
+        $headerData['tab_name'] = 'Edit KYC Master';
+        $headerData['page_name'] = 'KYC';
 
         $editData['kyc']           = $this->kycEntityTypeModel->where(['id' => $id, 'is_active' => 1])->first();
         $editData['kyc_docs']    = $this->kycDocsModel->where(['kyc_type_id' => $id, 'is_active' => 1])->findAll();
@@ -1022,7 +1031,8 @@ class MasterController extends AdminController
     public function policyTypeList()
     {   
         $this->myLogger->logme('error','Policy Type list function called');
-        $headerData['page_name'] = 'Policy Type List';
+        $headerData['tab_name'] = 'Policy Type List';
+        $headerData['page_name'] = 'Policy Type';
         $data['policyList'] = $this->policyTypeModel->where('is_active',1)->findAll();
         // $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
         // echo '<pre>';
@@ -1068,7 +1078,8 @@ class MasterController extends AdminController
     {
         
         $this->myLogger->logme('error','Policy Type Onboarding function called');
-        $headerData['page_name'] = 'Policy Type Master';
+        $headerData['tab_name'] = 'Policy Type Master';
+        $headerData['page_name'] = 'Policy Type';
 
 
         // print_r($data['types']);die();
@@ -1130,7 +1141,8 @@ class MasterController extends AdminController
     {
 
         $this->myLogger->logme('error','Edit KYC Onboarding function called');
-        $headerData['page_name'] = 'Edit Policy Type';
+        $headerData['tab_name'] = 'Edit Policy Type';
+        $headerData['page_name'] = 'Policy Type';
 
         $editData['policytype']   = $this->policyTypeModel->where(['id' => $id, 'is_active' => 1])->first();
         $editData['policies']     = $this->policesModel->select('policies.*, insurers.name as insurer_name')
@@ -1222,7 +1234,8 @@ class MasterController extends AdminController
     //start CD Master list
     public function CDMasterList()
     {   
-        $data['page_name'] = 'CD Master List';
+        $data['tab_name'] = 'CD Master List';
+        $data['page_name'] = 'CD Master';
         $data['CD_Master_Data'] = $this->CDMasterModel->getCDMasterList();
         $data['insurers'] = $this->insurerModel->where('is_active', 1)->findAll();
         $data['insurer_branch'] = $this->insurerBranchModel->where('is_active', 1)->findAll();
@@ -1605,8 +1618,8 @@ class MasterController extends AdminController
     //Vehicle Master data Function
 
     public function VehicleMasterList()
-    {   
-        $data['page_name'] = 'Vehicle Master List';
+    {   $data['tab_name'] = 'Vehicle Master';
+        $data['page_name'] = 'Vehicles';
         $data['vehicle_type'] = [
             'two_wheeler' => 'Two Wheeler',
             'four_wheeler' => 'Four Wheeler',
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 8b2a80bb..19e2addd 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -114,6 +114,7 @@ class PolicyTransactionController extends BaseController
     // Policy Transaction Inception
     public function viewInception()
     {
+        $data['tab_name'] = 'Policy';
         $data['page_name'] = 'Policy';
 
         // Static arrays for dropdowns
@@ -1075,6 +1076,7 @@ class PolicyTransactionController extends BaseController
         // echo '<pre>';
         // !dd($this->getEndorsementDataForEdit(17));
 
+        $data['tab_name'] = 'Endorsement';
         $data['page_name'] = 'Endorsement';
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
         $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();
@@ -1770,7 +1772,7 @@ class PolicyTransactionController extends BaseController
     //get BDS Reports data old function
     public function reportBDSOld()
     {
-
+        $data['tab_name'] = 'BDS Report';
         $data['page_name'] = 'BDS Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -1832,6 +1834,7 @@ class PolicyTransactionController extends BaseController
     public function reportBDS()
     {
 
+        $data['tab_name'] = 'BDS Report';
         $data['page_name'] = 'BDS Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -1925,6 +1928,7 @@ class PolicyTransactionController extends BaseController
 
     public function reportVarience()
     {
+        $data['tab_name'] = 'Variance Report';
         $data['page_name'] = 'Variance Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -1974,6 +1978,7 @@ class PolicyTransactionController extends BaseController
 
     public function reportBusinessList()
     {
+        $data['tab_name'] = 'Business Report';
         $data['page_name'] = 'Business Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -2014,6 +2019,7 @@ class PolicyTransactionController extends BaseController
 
     public function reportFinanceList()
     {
+        $data['tab_name'] = 'Finance Report';
         $data['page_name'] = 'Finance Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -2054,6 +2060,7 @@ class PolicyTransactionController extends BaseController
 
     public function reportOutstanding()
     {
+        $data['tab_name'] = 'Outstanding Report';
         $data['page_name'] = 'Outstanding Report';
 
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -2132,6 +2139,7 @@ class PolicyTransactionController extends BaseController
             ->findAll();
 
         // dd( $this->insurerStatements->getLastQuery());
+        $data['tab_name'] = 'Statement Upload';
         $data['page_name'] = 'Statement Upload';
 
         $this->loadLayout('insurer_statement_list',  $data);
@@ -2709,8 +2717,8 @@ class PolicyTransactionController extends BaseController
             $data['files'] = array_merge($pt_files, $kyc_files, $batch_files, $files);
             //  dd($data['files']);
         }
-
-        $data['page_name'] = 'Documents Search';
+        $data['tab_name'] = 'Documents Search';
+        $data['page_name'] = 'Documents';
 
         $data['customers'] = $this->clientModel->select('id,client_name,short_name as display_value')->where('is_active', 1)->get()->getResultarray();
         $data['policies'] = $this->clientPolicyModel->select("client_policy.id,client_policy.policy_no,policy_type.policy_type,concat(policy_type.policy_type,' - ',client_policy.policy_no) as display_value")
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index c1896be4..b0c893da 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -1,654 +1,654 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Controllers\BaseController;
-use App\Helpers\MailHelper;
-use CodeIgniter\HTTP\ResponseInterface;
-
-use App\Models\ThzMasterModel;
-use App\Models\ThzMasterNotesModel;
-use App\Models\ThzTypeModel;
-use App\Models\ThzHistoryModel;
-use App\ControllerCleaners\ThzControllerCleaner;
-use App\Models\UserModel;
-use App\Models\ClientPolicyModel;
-use App\Models\ClientModel;
-use App\Models\TicketMailTemplateModel;
-use App\Models\ClientRMModel;
-
-
-class ThzController extends BaseController
-{
-
-    protected $thzMasterModel;
-    protected $thzMasterNotesModel;
-    protected $thzTypeModel;
-    protected $thzHistoryModel;
-    protected $thzControllerCleaner;
-
-    protected $userModel;
-    protected $clientPolicyModel;
-    protected $clientModel;
-
-    protected $ticketMailTemplateModel;
-
-    protected $cientRmModel;
-    protected $myLogger;
-
-    public function __construct()
-    {
-        set_session_context('THZ-CONTROLLER');
-        $this->thzMasterModel           = new ThzMasterModel();
-        $this->thzMasterNotesModel      = new ThzMasterNotesModel();
-        $this->thzTypeModel             = new thzTypeModel();
-        $this->thzHistoryModel          = new ThzHistoryModel();
-        $this->thzControllerCleaner     = new ThzControllerCleaner();
-        $this->userModel                = new UserModel();
-        $this->clientPolicyModel        = new ClientPolicyModel();
-        $this->clientModel              = new ClientModel();
-        $this->cientRmModel             = new ClientRMModel();
-        $this->ticketMailTemplateModel  = new TicketMailTemplateModel();
-        $this->myLogger                 = \Config\Services::mylogger();
-    }
-
-    public function index()
-    {
-        //
-    }
-
-    public function ticketSave()
-    {
-        try {
-            $data = $this->request->getPost();
-            $references   = "";
-            if (!empty($data['thz_id'])) {
-
-                $text   = "update";
-                // here insert history Status. 
-                $old = $this->thzMasterModel->where('thz_id', $data['thz_id'])->get()->getRowArray();
-                $result = $this->updateTicket($data);
-
-                $references = ($old && isset($data['status'])) ? $this->handleTicketHistory($old, $data) : "No Details" ;
-
-                $updateID = $data['thz_id'];
-            } else {
-
-                $text   = "create";
-                $insertID = $this->insertTicket($data);
-                $result = true;
-                $references   = "";
-            }
-
-            $id = isset($insertID) && !empty($insertID) ? $insertID : $updateID;
-
-            $emailNotificationResult = $this->ticketSaveNotification($data, $insertOrUpdate = $text, $id);
-
-            $this->myLogger->logme('error', 'emailNotificationResult: ' . json_encode($emailNotificationResult));
-
-            return $this->response->setJSON([
-                'status' => $result ? 'success' : 'error',
-                'message' => $result ? "Ticket {$text}d successfully " : "Unable to {$text} ticket. Please try again.",
-                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed..!!',
-                'ref' => $references
-            ])->setStatusCode($result ? 200 : 400);
-
-
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketList()
-    {
-
-        $data['tab_name'] = "Tickets";
-        $data['page_name'] = "Tickets";
-        try {
-            $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
-
-
-            $data = $this->request->getGet();
-
-            if ($returnType === 'web' && in_array(get_role_id(), [3, 4])) {
-                $data['assign_to'] = $data['assign_to'] ?? get_session_userid();
-            }
-
-
-            $tickets = $this->fetchTicketsBasedOnrole($data);
-
-
-            if ($returnType === 'api') {
-                if (empty($tickets)) {
-                    $this->myLogger->logme('error', 'empty tickets in ticket list: ' . json_encode($tickets));
-                    return $this->response->setJSON([ 'status'  => 'error','message' => 'No tickets found'])->setStatusCode(404);
-                }
-            } else {
-                $data['ticket_data'] = $tickets;
-                $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['3', '4'])->findAll();
-                // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu  , 2-"manager l2 " - ivangalum  assign pannalam
-                // 3,4 remain person varannum. 
-                $data['client_list'] = $this->clientModel->getCreatedByUserName();
-                $data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll();
-
-                return $this->loadLayout('thz_list', $data);
-            }
-
-
-            return $this->response->setJSON([
-                'status' => 'success',
-                'data'   => $tickets,
-            ])->setStatusCode(200);
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketConversationSave()
-    {
-
-        try {
-            $data = $this->request->getPost();
-
-            $data['notes_type'] = $data['notes_type'] ?? 'External';
-
-            $result = $this->thzMasterNotesModel->insert($data);
-
-            if (empty($result)) {
-                $this->myLogger->logme('error', 'Ticket conversation insert failed..!!: ' . json_encode($result));
-                throw new \RuntimeException('No tickets found', 404);
-            }
-
-            $emailNotificationResult = ($data['notes_type'] === "External") 
-                ? $this->ticketConversationSaveNotification($data) 
-                : false;
-
-            return $this->response->setJSON([
-                'status' => $result ? 'success' : 'error',
-                'message' => $result ? "Ticket Notes created successfully" : "Unable to create ticket notes. Please try again.",
-                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed Or No Need..!!'
-            ])->setStatusCode($result ? 200 : 400);
-
-
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketAutoFetchDetails()
-    {
-        try {
-            $data = $this->request->getPost();
-
-            $client_id = $data['client_id'] ?? null;
-            $mobile    = $data['mobile'] ?? null;
-
-            if ($client_id && $mobile) {
-                $details = $this->thzMasterModel->ticketAutoFetchDetails($client_id, $mobile);
-
-                if (empty($details)) {
-                    $this->myLogger->logme('error', 'empty AutoFetchDetails for client_id : ' . json_encode($client_id));
-                    throw new \RuntimeException('No Data found', 400);
-                }
-
-                $policyIds    = array_filter(array_column($details, 'policy_id'));
-                $clientPolicy = !empty($policyIds)
-                    ? $this->clientPolicyModel->whereIn('id', $policyIds)->where('is_active', 1)->get()->getResultArray()
-                    : [];
-
-                $result['client_details'] = $details;
-                $result['policy_details'] = $clientPolicy ?? [];
-            } else {
-                throw new \RuntimeException('Client and Mobile Not found', 400);
-            }
-
-            return $this->response->setJSON(['status' => 'success', 'data' => $result])->setStatusCode(200);
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketConversationList()
-    {
-        $data       = $this->request->getGet();
-
-        $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
-
-        $thz_id     = $data['thz_id'] ?? null;
-
-        $ticketType = $data['notes_type'] ?? 'External';
-
-        if ($thz_id) {
-            $result['master'] = $this->thzMasterModel
-                ->select('thz_master.*, user_profiles.first_name  as assignee_name')
-                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                ->where('thz_master.thz_id', $thz_id)
-                ->findAll();
-
-            if (!empty($result['master'])) {
-                $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType);
-                $result['notes'] = !empty($notes) ? $notes : [];
-            } else {
-                $this->myLogger->logme('error', 'No tickets found for ticket id ' . json_encode($thz_id));
-                throw new \RuntimeException('No tickets found', 400);
-            }
-        } else {
-            // return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
-            throw new \RuntimeException('No tickets found', 404);
-        }
-
-        if ($returnType === 'api') {
-            try {
-                return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
-            } catch (\Throwable $e) {
-                return handle_exception($e, $this->myLogger, $this->response);
-            }
-        } else {
-
-            $assign_to = $result['master'][0]['assign_to'];
-            $mobile    = $result['master'][0]['mobile'];
-
-            $toGetPolicyId =  (!empty($result['master'][0]['policy_id']) && strtolower($result['master'][0]['policy_id']) !== 'null')
-                ? $result['master'][0]['policy_id']
-                : '';
-
-            $result['related_tickets'] = $this->thzMasterModel
-                ->select('thz_master.*, user_profiles.first_name  as assignee_name')
-                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                ->where('thz_master.assign_to', $assign_to)
-                ->where('thz_master.mobile', $mobile)
-                ->where('thz_master.thz_id !=', $thz_id)
-                ->where('thz_master.status !=', 'Closed')
-                ->where('thz_master.status !=', 'Resolved')
-                ->findAll();
-
-            $result['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3', '4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
-            // 2,3,4 remain person varannum. 
-            $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';
-
-            $result['ticket_type']  = $this->thzTypeModel->where('is_active', 1)->findAll();
-
-            return $this->loadLayout('thz_notes', $result);
-        }
-    }
-
-    public function ticketType()
-    {
-        $method = $this->request->getMethod(); // get, post
-        try {
-            if ($method === 'get') {
-                $types = $this->thzTypeModel->select('id,name,is_active')->where('is_active', 1)->findAll();
-                if (empty($types)) {
-                    $this->myLogger->logme('error', 'No ticket types found ');
-                    return $this->response->setJSON(['status'  => 'error', 'message' => 'No ticket types found'])->setStatusCode(404);
-                }
-                return $this->response->setJSON(['status' => 'success', 'data'   => $types])->setStatusCode(200);
-            }
-
-            if ($method === 'post') {
-
-                $data = $this->request->getPost();
-                if (!empty($data['id'])) {
-                    $text   = "update";
-                    $result = $this->thzTypeModel->update($data['id'], $data);
-                    $updateID = $data['id'];
-                } else {
-                    $text   = "create";
-                    $insertID  = $this->thzTypeModel->insert($data);
-                    $result = true;
-                }
-
-                $id = isset($insertID) && !empty($insertID) ? $insertID : ($updateID ?? null);
-
-                return $this->response->setJSON([
-                    'status'  => $id ? 'success' : 'error',
-                    'message' => $id ? "Ticket Type {$text}d successfully" : "Unable to {$text} ticket type. Please try again.",
-                    'id'      => $id
-                ])->setStatusCode($id ? 200 : 400);
-            }
-            return $this->response->setJSON(['status'  => 'error', 'message' => 'Invalid request method'])->setStatusCode(405);
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-    public function ticketHistoryList()
-    {
-        try {
-            $data = $this->request->getGet();
-            $thz_id = $data['thz_id'];
-            // $details = $this->thzHistoryModal->whereIn('thz_id', $thz_id)->where('is_active', 1)->get()->getResultArray();
-            $details = $this->thzHistoryModel->select('thz_history.*, user_profiles.first_name  as created_name')
-                ->join('user_profiles', 'user_profiles.id = thz_history.created_by', 'left')
-                ->where('thz_history.thz_id', $thz_id)->where('thz_history.is_active', 1)
-                ->orderBy('thz_history.created_at', 'desc')
-                ->get()->getResultArray();
-
-
-
-            if (empty($details)) {
-                $this->myLogger->logme('error', 'No history details found for ticket id  ' . json_encode($thz_id));
-                throw new \RuntimeException('No History found', 404);
-            }
-
-
-            return $this->response->setJSON(['status' => 'success', 'data'   => $details])->setStatusCode(200);
-        } catch (\Throwable $e) {
-            return handle_exception($e, $this->myLogger, $this->response);
-        }
-    }
-
-
-    /**************************************************   PRIVATE FUNCTIONS  ********************************************************/
-
-
-    private function fetchTicketsBasedOnrole(array $data): array
-    {
-        // $id        = $data['thz_id']    ?? null;
-        $assign_to = $data['assign_to'] ?? null;
-        $mobile    = $data['mobile']    ?? null;
-
-        if (!empty($assign_to)) {
-            // Tickets assigned to a staff
-            return $this->thzMasterModel
-                ->select('thz_master.*, user_profiles.first_name as assignee_name')
-                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                ->where('thz_master.assign_to', $assign_to)
-                ->orderBy('thz_master.created_at', 'desc')
-                ->findAll();
-        }
-
-        // if (!empty($id) && !empty($mobile)) {
-        if (!empty($mobile)) {
-            // Specific ticket by ID and mobile
-            return $this->thzMasterModel
-                ->select('thz_master.*, user_profiles.first_name as assignee_name')
-                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                // ->where('thz_id', $id)
-                ->where('thz_master.mobile', $mobile)
-                ->orderBy('thz_master.created_at', 'desc')
-                ->findAll();
-        }
-
-        // All tickets (e.g., for managers)
-        return $this->thzMasterModel
-            ->select('thz_master.*, user_profiles.first_name as assignee_name')
-            ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-            ->orderBy('thz_master.created_at', 'desc')
-            ->findAll();
-    }
-
-
-
-    private function ticketSaveNotification($data, $insertOrUpdate, $id)
-    {
-
-        $user_email  = $data['email'] ?? null;
-
-        $assignee_id = $data['assign_to'] ?? null;
-
-        $assignee_email = $this->findAssigneeEmail($assignee_id);
-
-        $client_id     = $data['client_id'] ?? null;
-
-        $emailToNotified = [
-            'user_email' => $user_email,
-            'assignee_email' => $assignee_email
-        ];
-
-        $ticketId = $id;
-
-        $result = $this->ticketSaveEmailNotificationBasedOnRole($emailToNotified, $insertOrUpdate, $ticketId, $data, $client_id);
-
-        return $result;
-    }
-
-    private function ticketConversationSaveNotification($data)
-    {
-
-        $thz_id = $data['thz_id']; // thz is alias of ticket
-
-        $data['subject'] = $this->findSubject($data['thz_id']);
-
-        $assignee_id    = $this->findAssigneeId($data['thz_id']);
-
-        $user_email     =  $this->findUserEmail($data['thz_id']);
-
-        $assignee_email = $this->findAssigneeEmail($assignee_id) ?? '';
-
-        $sender_mail     =  $data['notes_by'] == "User" ? $user_email        : $assignee_email;
-        $receiver_mail   =  $data['notes_by'] == "User" ? $assignee_email    : $user_email;
-
-        $templateName   = "ticket_conversation_save_notification";
-
-        $to_email       = $receiver_mail;
-
-        $ticketId       = $thz_id;
-
-        //        $message        = $data['notes'] ?? '';
-
-        $this->sendEmail($templateName, $data, $to_email, $ticketId);
-
-        return true;
-    }
-
-
-    private function findAssigneeEmail($assignee_id)
-    {
-
-        $row = $this->userModel->where('id', $assignee_id)->get()->getRow();
-        $assigneeEmail = $row ? $row->email : null;
-        return $assigneeEmail ? $assigneeEmail : "";
-    }
-
-    private function findAssigneeId($ticketId)
-    {
-        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
-        $assigneeId = $row ? $row->assign_to : null;
-        return $assigneeId ? $assigneeId : 0;
-    }
-
-    private function findUserEmail($ticket_id)
-    {
-        $row = $this->thzMasterModel->where('thz_id', $ticket_id)->get()->getRow();
-        $email = $row ? $row->email : null;
-        return $email ? $email : " ";
-    }
-
-    private function findSubject($ticketId)
-    {
-        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
-        $subject = $row ? $row->subject : null;
-        return $subject ? $subject : " ";
-    }
-
-    private function ticketSaveEmailNotificationBasedOnRole($emailToNotified,  $insertOrUpdate, $ticketId, $data, $client_id)
-    {
-
-        $user_email     = $emailToNotified['user_email'] ?? null;
-        $assignee_email = $emailToNotified['assignee_email'] ?? null;
-
-
-        if (!empty($assignee_email)) {
-
-            switch ($insertOrUpdate) {
-
-                case 'update':
-
-                    $this->sendEmail('ticket_save_update_assignee', $data, $assignee_email, $ticketId);
-
-                    break;
-
-                case 'create':
-
-                    $this->sendEmail('ticket_save_create_assignee', $data, $assignee_email, $ticketId);
-
-                    break;
-
-                default:
-                    # code...
-                    break;
-            }
-        }
-
-        if (!empty($user_email)) {
-
-            switch ($insertOrUpdate) {
-
-                case 'update':
-
-                    $data['assigneeAndStatus'] = empty($assignee_email)
-                        ? "Not Yet Assigned"
-                        : "Assigned With {$assignee_email}";
-
-                    $this->sendEmail('ticket_save_update_user', $data, $user_email, $ticketId);
-
-
-                    break;
-
-                case 'create':
-
-                    $account_manager_email = $this->cientRmModel->findAccountManagerEmail($client_id);
-
-                    $cc = getenv('G_ticketing_system_cc');
-
-                    $this->myLogger->logme('error',  "env for cc G_ticketing_system_cc " . $cc);
-
-                    $template = empty($assignee_email)
-                        ? 'ticket_save_create_user_unassigned'
-                        : 'ticket_save_create_user_assigned';
-
-                    if (!empty($assignee_email)) {
-                        $data['assignee_email'] = $assignee_email;
-                    }
-
-                    $this->sendEmail($template, $data, $user_email, $ticketId);
-
-                    // send to account manager and if it is more than one email also no problem we send to all account managers
-                    if (!empty($account_manager_email)) {
-                        $this->myLogger->logme('error',  "mail sent for account manager " . json_encode($account_manager_email));
-                        $this->sendEmail($template, $data, $account_manager_email, $ticketId, $cc);
-                    } else {
-                        $this->myLogger->logme('error',  "mail not  sent for account manager ");
-                    }
-
-                    break;
-
-                default:
-                    # code...
-                    break;
-            }
-        }
-
-        return true;
-    }
-
-    private function updateTicket($data)
-    {
-
-        $data['updated_by'] = get_session_userid();
-        $ticket_id = $data['thz_id'];
-        $result = $this->thzMasterModel->where('thz_id', $ticket_id)->set($data)->update();
-
-        return $result;
-    }
-
-    private function insertTicket($data)
-    {
-        $data['created_by'] = get_session_userid();
-        $this->thzMasterModel->insert($data);
-
-        return $this->thzMasterModel->insertID(); // returns the inserted row's ID
-    }
-
-
-    private function sendEmail($templateName, $data, $to_email, $ticketId, $cc = "", $bcc = "")
-    {
-
-        $mailTemplate    =  $this->ticketMailTemplateModel->where('template_name', $templateName)->findAll()[0] ?? [];
-
-        if (empty($mailTemplate)) {
-            $this->myLogger->logme('error', 'No Mail Template Found To send email in ticketing system');
-            return;
-        }
-
-        if (empty($cc)) {
-            $this->myLogger->logme('error', 'empty cc attached for  template name : ' . json_encode($templateName));
-        } else {
-            $this->myLogger->logme('error',  "cc attached for  template name : " . json_encode($templateName));
-        }
-
-        $mailTemplate['subject'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['subject']);
-
-        $mailTemplate['mail_content'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['mail_content']);
-
-        $mailTemplate['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mailTemplate['mail_content']);
-
-        $mailTemplate['mail_content'] = str_replace('%message%', $data['notes'] ?? '', $mailTemplate['mail_content']);
-
-        $mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']);
-
-        $mailTemplate['mail_content'] = str_replace('%assigneeAndStatus%', $data['assigneeAndStatus'] ?? '', $mailTemplate['mail_content']);
-
-        $from_mail      =  "";
-        $to_mail        =  $to_email;
-        $cc_string      =  $cc;
-        $subject        =  $mailTemplate['subject'];
-        $message        =  $mailTemplate['mail_content'];
-        $attachments    =  "";
-        $reply_to       =  "";
-        $bcc_string     =  $bcc;
-
-        $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail, 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
-
-        $this->myLogger->logme('error', 'Mail Response : ' . json_encode($res));
-    }
-
-
-    public function getPolicyTerms($client_policy_id)
-    {
-        $policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $client_policy_id)->first();
-
-        $policy_terms = [];
-        if (isset($policy_data['policy_terms']) && !empty($policy_data['policy_terms'])) {
-
-            $raw_terms = json_decode($policy_data['policy_terms'] ?? [], true) ?? [];
-
-            $ticketController = new TicketController();
-            $policy_terms = $ticketController->convertTermsToDisplay($raw_terms);
-        }
-
-        $data['policy_terms'] = $policy_terms;
-        return view('view_policy_terms', $data);
-    }
-
-
-    private function handleTicketHistory(array $old, array $data): string
-    {
-        if ($old['status'] != $data['status']) {
-            $history = [
-                'thz_id'       => $data['thz_id'],
-                'field_name'   => 'status',
-                'display_name' => 'Status',
-                'old_value'    => $old['status'],
-                'new_value'    => $data['status'],
-                'is_active'    => 1
-            ];
-
-            if (!empty(get_session_userid())) {
-                $history['created_by'] = get_session_userid();
-            }
-
-            $hist_id = $this->thzHistoryModel->insert($history);
-
-            return $old['status'] . " - " . $data['status'] . " - " . $hist_id;
-        }
-
-        return $old['status'] . " - " . $data['status'];
-    }
-
-
-
-
-
-}
+<?php
+
+namespace App\Controllers;
+
+use App\Controllers\BaseController;
+use App\Helpers\MailHelper;
+use CodeIgniter\HTTP\ResponseInterface;
+
+use App\Models\ThzMasterModel;
+use App\Models\ThzMasterNotesModel;
+use App\Models\ThzTypeModel;
+use App\Models\ThzHistoryModel;
+use App\ControllerCleaners\ThzControllerCleaner;
+use App\Models\UserModel;
+use App\Models\ClientPolicyModel;
+use App\Models\ClientModel;
+use App\Models\TicketMailTemplateModel;
+use App\Models\ClientRMModel;
+
+
+class ThzController extends BaseController
+{
+
+    protected $thzMasterModel;
+    protected $thzMasterNotesModel;
+    protected $thzTypeModel;
+    protected $thzHistoryModel;
+    protected $thzControllerCleaner;
+
+    protected $userModel;
+    protected $clientPolicyModel;
+    protected $clientModel;
+
+    protected $ticketMailTemplateModel;
+
+    protected $cientRmModel;
+    protected $myLogger;
+
+    public function __construct()
+    {
+        set_session_context('THZ-CONTROLLER');
+        $this->thzMasterModel           = new ThzMasterModel();
+        $this->thzMasterNotesModel      = new ThzMasterNotesModel();
+        $this->thzTypeModel             = new thzTypeModel();
+        $this->thzHistoryModel          = new ThzHistoryModel();
+        $this->thzControllerCleaner     = new ThzControllerCleaner();
+        $this->userModel                = new UserModel();
+        $this->clientPolicyModel        = new ClientPolicyModel();
+        $this->clientModel              = new ClientModel();
+        $this->cientRmModel             = new ClientRMModel();
+        $this->ticketMailTemplateModel  = new TicketMailTemplateModel();
+        $this->myLogger                 = \Config\Services::mylogger();
+    }
+
+    public function index()
+    {
+        //
+    }
+
+    public function ticketSave()
+    {
+        try {
+            $data = $this->request->getPost();
+            $references   = "";
+            if (!empty($data['thz_id'])) {
+
+                $text   = "update";
+                // here insert history Status. 
+                $old = $this->thzMasterModel->where('thz_id', $data['thz_id'])->get()->getRowArray();
+                $result = $this->updateTicket($data);
+
+                $references = ($old && isset($data['status'])) ? $this->handleTicketHistory($old, $data) : "No Details" ;
+
+                $updateID = $data['thz_id'];
+            } else {
+
+                $text   = "create";
+                $insertID = $this->insertTicket($data);
+                $result = true;
+                $references   = "";
+            }
+
+            $id = isset($insertID) && !empty($insertID) ? $insertID : $updateID;
+
+            $emailNotificationResult = $this->ticketSaveNotification($data, $insertOrUpdate = $text, $id);
+
+            $this->myLogger->logme('error', 'emailNotificationResult: ' . json_encode($emailNotificationResult));
+
+            return $this->response->setJSON([
+                'status' => $result ? 'success' : 'error',
+                'message' => $result ? "Ticket {$text}d successfully " : "Unable to {$text} ticket. Please try again.",
+                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed..!!',
+                'ref' => $references
+            ])->setStatusCode($result ? 200 : 400);
+
+
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketList()
+    {
+
+        $data['tab_name'] = "Tickets";
+        $data['page_name'] = "Tickets";
+        try {
+            $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
+
+
+            $data = $this->request->getGet();
+
+            if ($returnType === 'web' && in_array(get_role_id(), [3, 4])) {
+                $data['assign_to'] = $data['assign_to'] ?? get_session_userid();
+            }
+
+
+            $tickets = $this->fetchTicketsBasedOnrole($data);
+
+
+            if ($returnType === 'api') {
+                if (empty($tickets)) {
+                    $this->myLogger->logme('error', 'empty tickets in ticket list: ' . json_encode($tickets));
+                    return $this->response->setJSON([ 'status'  => 'error','message' => 'No tickets found'])->setStatusCode(404);
+                }
+            } else {
+                $data['ticket_data'] = $tickets;
+                $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['3', '4'])->findAll();
+                // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu  , 2-"manager l2 " - ivangalum  assign pannalam
+                // 3,4 remain person varannum. 
+                $data['client_list'] = $this->clientModel->getCreatedByUserName();
+                $data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll();
+
+                return $this->loadLayout('thz_list', $data);
+            }
+
+
+            return $this->response->setJSON([
+                'status' => 'success',
+                'data'   => $tickets,
+            ])->setStatusCode(200);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketConversationSave()
+    {
+
+        try {
+            $data = $this->request->getPost();
+
+            $data['notes_type'] = $data['notes_type'] ?? 'External';
+
+            $result = $this->thzMasterNotesModel->insert($data);
+
+            if (empty($result)) {
+                $this->myLogger->logme('error', 'Ticket conversation insert failed..!!: ' . json_encode($result));
+                throw new \RuntimeException('No tickets found', 404);
+            }
+
+            $emailNotificationResult = ($data['notes_type'] === "External") 
+                ? $this->ticketConversationSaveNotification($data) 
+                : false;
+
+            return $this->response->setJSON([
+                'status' => $result ? 'success' : 'error',
+                'message' => $result ? "Ticket Notes created successfully" : "Unable to create ticket notes. Please try again.",
+                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed Or No Need..!!'
+            ])->setStatusCode($result ? 200 : 400);
+
+
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketAutoFetchDetails()
+    {
+        try {
+            $data = $this->request->getPost();
+
+            $client_id = $data['client_id'] ?? null;
+            $mobile    = $data['mobile'] ?? null;
+
+            if ($client_id && $mobile) {
+                $details = $this->thzMasterModel->ticketAutoFetchDetails($client_id, $mobile);
+
+                if (empty($details)) {
+                    $this->myLogger->logme('error', 'empty AutoFetchDetails for client_id : ' . json_encode($client_id));
+                    throw new \RuntimeException('No Data found', 400);
+                }
+
+                $policyIds    = array_filter(array_column($details, 'policy_id'));
+                $clientPolicy = !empty($policyIds)
+                    ? $this->clientPolicyModel->whereIn('id', $policyIds)->where('is_active', 1)->get()->getResultArray()
+                    : [];
+
+                $result['client_details'] = $details;
+                $result['policy_details'] = $clientPolicy ?? [];
+            } else {
+                throw new \RuntimeException('Client and Mobile Not found', 400);
+            }
+
+            return $this->response->setJSON(['status' => 'success', 'data' => $result])->setStatusCode(200);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketConversationList()
+    {
+        $data       = $this->request->getGet();
+
+        $returnType = strtolower($this->request->getGet('return_type') ?? 'api');
+
+        $thz_id     = $data['thz_id'] ?? null;
+
+        $ticketType = $data['notes_type'] ?? 'External';
+
+        if ($thz_id) {
+            $result['master'] = $this->thzMasterModel
+                ->select('thz_master.*, user_profiles.first_name  as assignee_name')
+                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                ->where('thz_master.thz_id', $thz_id)
+                ->findAll();
+
+            if (!empty($result['master'])) {
+                $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType);
+                $result['notes'] = !empty($notes) ? $notes : [];
+            } else {
+                $this->myLogger->logme('error', 'No tickets found for ticket id ' . json_encode($thz_id));
+                throw new \RuntimeException('No tickets found', 400);
+            }
+        } else {
+            // return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
+            throw new \RuntimeException('No tickets found', 404);
+        }
+
+        if ($returnType === 'api') {
+            try {
+                return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
+            } catch (\Throwable $e) {
+                return handle_exception($e, $this->myLogger, $this->response);
+            }
+        } else {
+
+            $assign_to = $result['master'][0]['assign_to'];
+            $mobile    = $result['master'][0]['mobile'];
+
+            $toGetPolicyId =  (!empty($result['master'][0]['policy_id']) && strtolower($result['master'][0]['policy_id']) !== 'null')
+                ? $result['master'][0]['policy_id']
+                : '';
+
+            $result['related_tickets'] = $this->thzMasterModel
+                ->select('thz_master.*, user_profiles.first_name  as assignee_name')
+                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                ->where('thz_master.assign_to', $assign_to)
+                ->where('thz_master.mobile', $mobile)
+                ->where('thz_master.thz_id !=', $thz_id)
+                ->where('thz_master.status !=', 'Closed')
+                ->where('thz_master.status !=', 'Resolved')
+                ->findAll();
+
+            $result['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3', '4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
+            // 2,3,4 remain person varannum. 
+            $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';
+
+            $result['ticket_type']  = $this->thzTypeModel->where('is_active', 1)->findAll();
+
+            return $this->loadLayout('thz_notes', $result);
+        }
+    }
+
+    public function ticketType()
+    {
+        $method = $this->request->getMethod(); // get, post
+        try {
+            if ($method === 'get') {
+                $types = $this->thzTypeModel->select('id,name,is_active')->where('is_active', 1)->findAll();
+                if (empty($types)) {
+                    $this->myLogger->logme('error', 'No ticket types found ');
+                    return $this->response->setJSON(['status'  => 'error', 'message' => 'No ticket types found'])->setStatusCode(404);
+                }
+                return $this->response->setJSON(['status' => 'success', 'data'   => $types])->setStatusCode(200);
+            }
+
+            if ($method === 'post') {
+
+                $data = $this->request->getPost();
+                if (!empty($data['id'])) {
+                    $text   = "update";
+                    $result = $this->thzTypeModel->update($data['id'], $data);
+                    $updateID = $data['id'];
+                } else {
+                    $text   = "create";
+                    $insertID  = $this->thzTypeModel->insert($data);
+                    $result = true;
+                }
+
+                $id = isset($insertID) && !empty($insertID) ? $insertID : ($updateID ?? null);
+
+                return $this->response->setJSON([
+                    'status'  => $id ? 'success' : 'error',
+                    'message' => $id ? "Ticket Type {$text}d successfully" : "Unable to {$text} ticket type. Please try again.",
+                    'id'      => $id
+                ])->setStatusCode($id ? 200 : 400);
+            }
+            return $this->response->setJSON(['status'  => 'error', 'message' => 'Invalid request method'])->setStatusCode(405);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+    public function ticketHistoryList()
+    {
+        try {
+            $data = $this->request->getGet();
+            $thz_id = $data['thz_id'];
+            // $details = $this->thzHistoryModal->whereIn('thz_id', $thz_id)->where('is_active', 1)->get()->getResultArray();
+            $details = $this->thzHistoryModel->select('thz_history.*, user_profiles.first_name  as created_name')
+                ->join('user_profiles', 'user_profiles.id = thz_history.created_by', 'left')
+                ->where('thz_history.thz_id', $thz_id)->where('thz_history.is_active', 1)
+                ->orderBy('thz_history.created_at', 'desc')
+                ->get()->getResultArray();
+
+
+
+            if (empty($details)) {
+                $this->myLogger->logme('error', 'No history details found for ticket id  ' . json_encode($thz_id));
+                throw new \RuntimeException('No History found', 404);
+            }
+
+
+            return $this->response->setJSON(['status' => 'success', 'data'   => $details])->setStatusCode(200);
+        } catch (\Throwable $e) {
+            return handle_exception($e, $this->myLogger, $this->response);
+        }
+    }
+
+
+    /**************************************************   PRIVATE FUNCTIONS  ********************************************************/
+
+
+    private function fetchTicketsBasedOnrole(array $data): array
+    {
+        // $id        = $data['thz_id']    ?? null;
+        $assign_to = $data['assign_to'] ?? null;
+        $mobile    = $data['mobile']    ?? null;
+
+        if (!empty($assign_to)) {
+            // Tickets assigned to a staff
+            return $this->thzMasterModel
+                ->select('thz_master.*, user_profiles.first_name as assignee_name')
+                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                ->where('thz_master.assign_to', $assign_to)
+                ->orderBy('thz_master.created_at', 'desc')
+                ->findAll();
+        }
+
+        // if (!empty($id) && !empty($mobile)) {
+        if (!empty($mobile)) {
+            // Specific ticket by ID and mobile
+            return $this->thzMasterModel
+                ->select('thz_master.*, user_profiles.first_name as assignee_name')
+                ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                // ->where('thz_id', $id)
+                ->where('thz_master.mobile', $mobile)
+                ->orderBy('thz_master.created_at', 'desc')
+                ->findAll();
+        }
+
+        // All tickets (e.g., for managers)
+        return $this->thzMasterModel
+            ->select('thz_master.*, user_profiles.first_name as assignee_name')
+            ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+            ->orderBy('thz_master.created_at', 'desc')
+            ->findAll();
+    }
+
+
+
+    private function ticketSaveNotification($data, $insertOrUpdate, $id)
+    {
+
+        $user_email  = $data['email'] ?? null;
+
+        $assignee_id = $data['assign_to'] ?? null;
+
+        $assignee_email = $this->findAssigneeEmail($assignee_id);
+
+        $client_id     = $data['client_id'] ?? null;
+
+        $emailToNotified = [
+            'user_email' => $user_email,
+            'assignee_email' => $assignee_email
+        ];
+
+        $ticketId = $id;
+
+        $result = $this->ticketSaveEmailNotificationBasedOnRole($emailToNotified, $insertOrUpdate, $ticketId, $data, $client_id);
+
+        return $result;
+    }
+
+    private function ticketConversationSaveNotification($data)
+    {
+
+        $thz_id = $data['thz_id']; // thz is alias of ticket
+
+        $data['subject'] = $this->findSubject($data['thz_id']);
+
+        $assignee_id    = $this->findAssigneeId($data['thz_id']);
+
+        $user_email     =  $this->findUserEmail($data['thz_id']);
+
+        $assignee_email = $this->findAssigneeEmail($assignee_id) ?? '';
+
+        $sender_mail     =  $data['notes_by'] == "User" ? $user_email        : $assignee_email;
+        $receiver_mail   =  $data['notes_by'] == "User" ? $assignee_email    : $user_email;
+
+        $templateName   = "ticket_conversation_save_notification";
+
+        $to_email       = $receiver_mail;
+
+        $ticketId       = $thz_id;
+
+        //        $message        = $data['notes'] ?? '';
+
+        $this->sendEmail($templateName, $data, $to_email, $ticketId);
+
+        return true;
+    }
+
+
+    private function findAssigneeEmail($assignee_id)
+    {
+
+        $row = $this->userModel->where('id', $assignee_id)->get()->getRow();
+        $assigneeEmail = $row ? $row->email : null;
+        return $assigneeEmail ? $assigneeEmail : "";
+    }
+
+    private function findAssigneeId($ticketId)
+    {
+        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
+        $assigneeId = $row ? $row->assign_to : null;
+        return $assigneeId ? $assigneeId : 0;
+    }
+
+    private function findUserEmail($ticket_id)
+    {
+        $row = $this->thzMasterModel->where('thz_id', $ticket_id)->get()->getRow();
+        $email = $row ? $row->email : null;
+        return $email ? $email : " ";
+    }
+
+    private function findSubject($ticketId)
+    {
+        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
+        $subject = $row ? $row->subject : null;
+        return $subject ? $subject : " ";
+    }
+
+    private function ticketSaveEmailNotificationBasedOnRole($emailToNotified,  $insertOrUpdate, $ticketId, $data, $client_id)
+    {
+
+        $user_email     = $emailToNotified['user_email'] ?? null;
+        $assignee_email = $emailToNotified['assignee_email'] ?? null;
+
+
+        if (!empty($assignee_email)) {
+
+            switch ($insertOrUpdate) {
+
+                case 'update':
+
+                    $this->sendEmail('ticket_save_update_assignee', $data, $assignee_email, $ticketId);
+
+                    break;
+
+                case 'create':
+
+                    $this->sendEmail('ticket_save_create_assignee', $data, $assignee_email, $ticketId);
+
+                    break;
+
+                default:
+                    # code...
+                    break;
+            }
+        }
+
+        if (!empty($user_email)) {
+
+            switch ($insertOrUpdate) {
+
+                case 'update':
+
+                    $data['assigneeAndStatus'] = empty($assignee_email)
+                        ? "Not Yet Assigned"
+                        : "Assigned With {$assignee_email}";
+
+                    $this->sendEmail('ticket_save_update_user', $data, $user_email, $ticketId);
+
+
+                    break;
+
+                case 'create':
+
+                    $account_manager_email = $this->cientRmModel->findAccountManagerEmail($client_id);
+
+                    $cc = getenv('G_ticketing_system_cc');
+
+                    $this->myLogger->logme('error',  "env for cc G_ticketing_system_cc " . $cc);
+
+                    $template = empty($assignee_email)
+                        ? 'ticket_save_create_user_unassigned'
+                        : 'ticket_save_create_user_assigned';
+
+                    if (!empty($assignee_email)) {
+                        $data['assignee_email'] = $assignee_email;
+                    }
+
+                    $this->sendEmail($template, $data, $user_email, $ticketId);
+
+                    // send to account manager and if it is more than one email also no problem we send to all account managers
+                    if (!empty($account_manager_email)) {
+                        $this->myLogger->logme('error',  "mail sent for account manager " . json_encode($account_manager_email));
+                        $this->sendEmail($template, $data, $account_manager_email, $ticketId, $cc);
+                    } else {
+                        $this->myLogger->logme('error',  "mail not  sent for account manager ");
+                    }
+
+                    break;
+
+                default:
+                    # code...
+                    break;
+            }
+        }
+
+        return true;
+    }
+
+    private function updateTicket($data)
+    {
+
+        $data['updated_by'] = get_session_userid();
+        $ticket_id = $data['thz_id'];
+        $result = $this->thzMasterModel->where('thz_id', $ticket_id)->set($data)->update();
+
+        return $result;
+    }
+
+    private function insertTicket($data)
+    {
+        $data['created_by'] = get_session_userid();
+        $this->thzMasterModel->insert($data);
+
+        return $this->thzMasterModel->insertID(); // returns the inserted row's ID
+    }
+
+
+    private function sendEmail($templateName, $data, $to_email, $ticketId, $cc = "", $bcc = "")
+    {
+
+        $mailTemplate    =  $this->ticketMailTemplateModel->where('template_name', $templateName)->findAll()[0] ?? [];
+
+        if (empty($mailTemplate)) {
+            $this->myLogger->logme('error', 'No Mail Template Found To send email in ticketing system');
+            return;
+        }
+
+        if (empty($cc)) {
+            $this->myLogger->logme('error', 'empty cc attached for  template name : ' . json_encode($templateName));
+        } else {
+            $this->myLogger->logme('error',  "cc attached for  template name : " . json_encode($templateName));
+        }
+
+        $mailTemplate['subject'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['subject']);
+
+        $mailTemplate['mail_content'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%message%', $data['notes'] ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%assigneeAndStatus%', $data['assigneeAndStatus'] ?? '', $mailTemplate['mail_content']);
+
+        $from_mail      =  "";
+        $to_mail        =  $to_email;
+        $cc_string      =  $cc;
+        $subject        =  $mailTemplate['subject'];
+        $message        =  $mailTemplate['mail_content'];
+        $attachments    =  "";
+        $reply_to       =  "";
+        $bcc_string     =  $bcc;
+
+        $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail, 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
+
+        $this->myLogger->logme('error', 'Mail Response : ' . json_encode($res));
+    }
+
+
+    public function getPolicyTerms($client_policy_id)
+    {
+        $policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $client_policy_id)->first();
+
+        $policy_terms = [];
+        if (isset($policy_data['policy_terms']) && !empty($policy_data['policy_terms'])) {
+
+            $raw_terms = json_decode($policy_data['policy_terms'] ?? [], true) ?? [];
+
+            $ticketController = new TicketController();
+            $policy_terms = $ticketController->convertTermsToDisplay($raw_terms);
+        }
+
+        $data['policy_terms'] = $policy_terms;
+        return view('view_policy_terms', $data);
+    }
+
+
+    private function handleTicketHistory(array $old, array $data): string
+    {
+        if ($old['status'] != $data['status']) {
+            $history = [
+                'thz_id'       => $data['thz_id'],
+                'field_name'   => 'status',
+                'display_name' => 'Status',
+                'old_value'    => $old['status'],
+                'new_value'    => $data['status'],
+                'is_active'    => 1
+            ];
+
+            if (!empty(get_session_userid())) {
+                $history['created_by'] = get_session_userid();
+            }
+
+            $hist_id = $this->thzHistoryModel->insert($history);
+
+            return $old['status'] . " - " . $data['status'] . " - " . $hist_id;
+        }
+
+        return $old['status'] . " - " . $data['status'];
+    }
+
+
+
+
+
+}
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 5d930c71..eb7e894b 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -362,6 +362,7 @@ class TicketController extends BaseController
         $data['modeOFIntimate'] = $this->modeOFIntimate;
         $data['priorityType'] = $this->priorityType;
         $data['claimType'] = $this->claimType;
+        $data['tab_name'] = "Claims";
         if ($this->request->is('get')) {
             $data['page_name'] = "Claims";
             $data['claim_status'] = $this->claimStatus->select('id,ticket_type,claim_status')->where('is_active', 1)->findAll();
@@ -1123,6 +1124,9 @@ class TicketController extends BaseController
         // dd($data['ticket_data']);
         $data['ticket_type']  = $this->ticketType;
         $data['trigger_type'] = $this->triggerType;
+
+        $data['page_name'] = "Claims";
+
         return $this->loadLayout('ticket_mail_template', $data);
     }
 
@@ -1744,6 +1748,8 @@ class TicketController extends BaseController
                 'tat_band_wise'          => 'TAT Wise Status Report'
             ];
             //
+            $data['tab_name'] = "Claim Reports";
+            $data['page_name'] = "Claims";
             $this->loadLayout('ticket_reports', $data);
         } else {
             $received_data = $this->request->getPost();
@@ -2187,6 +2193,8 @@ class TicketController extends BaseController
 
 
             $data['viewer'] = !empty($empView) ? $empView : 0; 
+
+           
             // dd($data);
             return view('ticket_feedback_form', $data);    
         }else{
@@ -2217,7 +2225,7 @@ class TicketController extends BaseController
     public function feedbackList(){
 
         $data['feedback_data'] = $this->ticketMasterModel->select("ticket_master.*,clients.client_name")->join("clients","clients.id = ticket_master.client_id")->where("ticket_master.is_active",1)->where("ticket_master.feedback_json IS NOT NULL", null, false)->where("ticket_master.feedback_json !=", "")->findAll();
-
+        $data['page_name'] = "Claims";
         // dd($data);
         $this->loadLayout("ticket_feedback_list",$data);
     }
@@ -2610,7 +2618,8 @@ class TicketController extends BaseController
 
     public function claimDumpUpload()
     {   
-        $data['page_name'] = "Claim Dupm Upload";
+        $data['tab_name'] = "Claim Dupm Upload";
+        $data['page_name'] = "Claims";
 
         if($this->request->is('get')){
 
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index 255b6507..d393b71c 100755
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -55,7 +55,8 @@ class UserController extends AdminController
 
     public function list()
     {   
-        $data['page_name'] = 'User';
+        $data['tab_name'] = 'Users';
+        $data['page_name'] = 'Users';
         $this->myLogger->logme('error','User list function called');
         $data['UserList'] = $this->userModel->getUserList();
         // echo '<pre>';
@@ -588,6 +589,7 @@ class UserController extends AdminController
                 $data = $this->request->getPost();
                 if (!empty($data['id'])) {
                     $text   = "update";            
+                    $data['updated_by'] =  get_session_userid();
                     $result = $this->partnerStaffModel->update($data['id'], $data);
                     $updateID = $data['id'];
                 } else {
@@ -595,6 +597,11 @@ class UserController extends AdminController
                     $data['role_id'] = 1;
                     $data['created_by'] =  get_session_userid();
                     $insertID  = $this->partnerStaffModel->insert($data);
+                    if($insertID){
+                        $details['manager_id'] = $insertID;
+                        $details['updated_by'] =  get_session_userid();
+                        $this->partnerStaffModel->update($insertID, $details);
+                    }
                     $result = true;
                 }
 
diff --git a/app/Models/ClientBranchModel.php b/app/Models/ClientBranchModel.php
index 100f503d..a813221a 100755
--- a/app/Models/ClientBranchModel.php
+++ b/app/Models/ClientBranchModel.php
@@ -25,6 +25,7 @@ class ClientBranchModel extends Model
         "gst",
         "sez",
         "units",
+        "pre_branch_id"
     ];
 
     public function getBranchAndContactByBranchId($branch_id){
diff --git a/app/Models/HRAccessControlModel.php b/app/Models/HRAccessControlModel.php
index a9a4e2c7..a754536d 100644
--- a/app/Models/HRAccessControlModel.php
+++ b/app/Models/HRAccessControlModel.php
@@ -13,6 +13,9 @@ class HRAccessControlModel extends Model
         'pre_hr_id',
         'post_hr_id',
         'post_client_id',
+        'pre_client_id',
+        'pre_branch_id',
+        'post_branch_id',
         'allowed_modules',
         'allowed_pre_policies',
         'allowed_active_policies',
diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php
index 6acad55b..ba72d495 100755
--- a/app/Views/DashBoard.php
+++ b/app/Views/DashBoard.php
@@ -182,21 +182,20 @@
 
 </style>
 
-<p style="color:black;font-size:x-large;margin-left:20px !important;margin-bottom:20px;"><b>Dashboard</b></p>  
 
 <?php if(in_array(get_role_id(), [1,2,3,4,5]) || (in_array(ENROLLMENT_TEAM_ID, user_team()) || in_array(CLAIMS_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
-<div class="row" id="client_add" style="margin-top: -32px;">
+<div class="row" id="client_add" >
     <div class="col-12">
         <!-- <div class="card"> -->
             <div class="card-body">
-                <ul class="nav nav-pills navtab-bg">
+                <ul class="nav nav-pills navtab-bg nav-dash" >
                     
                     <?php if(in_array(get_role_id(), [1,2,3,5])) { ?>
 
                          <li class="nav-item d-flex justify-content-center align-items-center"> 
                             <a  href="#pending-actions-dash-tab" data-toggle="tab" aria-expanded="false"
-                                class="nav-link px-3 py-1 dash-anchor" id="pending_actions_tab">
+                                class="nav-link px-3 py-1 dash-anchor nav-dash" id="pending_actions_tab">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/inactive_pending_actions.png" alt="Logo" height="14" class="inactive_pending" >
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_pending_actions.png" alt="Logo" height="14" 
                                 class="active_pending" style="display:none;">
@@ -210,7 +209,7 @@
                     <?php if(in_array(get_role_id(), [1,2,3,5]) || (get_role_id() == 4 && in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
                          <li class="nav-item d-flex justify-content-center align-items-center">
-                            <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor" id="bds_tab">
+                            <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor nav-dash" id="bds_tab">
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_bds.png" alt="Logo" height="14" class="inactive_bds">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_bds.png" alt="Logo" height="14" 
                                 class="active_bds " style="display:none;">
@@ -226,7 +225,7 @@
                             $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team()) ? 'active show' : '';
                         ?>
                     <li class="nav-item d-flex justify-content-center align-items-center">
-                        <a  href="#claims-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor"  id="claims_tab">
+                        <a  href="#claims-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor nav-dash"  id="claims_tab">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/inactive_claims.png" alt="Logo" height="14" class="inactive_claims">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_claims.png" alt="Logo" height="14" 
                                  class="active_claims " style="display:none;">
@@ -241,7 +240,7 @@
                             $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID,user_team()) ? 'active show' : '';
                         ?>
                     <li class="nav-item d-flex justify-content-center align-items-center ">
-                        <a  href="#leads-dash-tab " data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor"  id="leads_tab" >
+                        <a  href="#leads-dash-tab " data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor nav-dash"  id="leads_tab" >
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_leads_and_bds_renewal.png" alt="Logo" height="14" class="inactive_leads">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_leads_and_bds_renewal.png" alt="Logo" height="14" 
                                 class="active_leads " style="display:none;">
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 001fa6a7..dcf988fa 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -348,12 +348,13 @@ table.dataTable tbody td {
         <div class="col-12">
             <div class="card">
                 <div class="card-body maincard">
-                    <div class="row" style="margin-bottom:1rem;">
+                    <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Users</h4>
                         </div>
-                    </div>
+                    </div> -->
                     <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="1" id="user-table">
+                        
                         <thead class="bg-light">
                         <tr>
                             <th class="font-weight-medium">Name</th>
@@ -391,15 +392,15 @@ table.dataTable tbody td {
                     
                     </table>
                     <!-- <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
-                    <thead class="app-table-head">
+                    <thead class="bg-light">
                         <tr>
                             <th>Ticket ID</th>
-                            <th class="app-text-left">Name</th>
+                            <th class="text-left">Name</th>
                             <th>Policy Number</th>
                             <th>Ticket Type</th>
                             <th>Subject</th>
                             <th>Status</th>
-                            <th class="app-text-left">Assign To</th>
+                            <th class="text-left">Assign To</th>
                             <th>Created At</th>
                             <th>Updated At</th>
                         </tr>
@@ -409,18 +410,18 @@ table.dataTable tbody td {
                             <?php foreach($ticket_data as $index => $row){ ?>
 
                                     <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
-                                    <td class="app-text-right"><?php echo $row['thz_id']; ?></td>
-                                    <td class="app-text-left">
+                                    <td class="text-right"><?php echo $row['thz_id']; ?></td>
+                                    <td class="text-left">
                                         <?php echo $row['name']; ?> 
                                         <span class="text-custom-grey"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
                                         <span class="text-custom-grey"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
                                     </td>
-                                    <td class="app-text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
+                                    <td class="text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
                                               ? $row['policy_no'] 
                                               : 'N/A'; ?>
                                     </td>
-                                    <td class="app-text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : '-'; ?></td>
-                                    <td class="app-text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
+                                    <td class="text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : '-'; ?></td>
+                                    <td class="text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
                                       <?php 
                                           $subject = $row['subject'] ? $row['subject'] : 'N/A';
                                           echo (strlen($subject) > 50) 
@@ -428,9 +429,9 @@ table.dataTable tbody td {
                                               : htmlspecialchars($subject);
                                       ?>
                                     </td>
-                                    <td class="app-text-center"><?php echo $row['status'] ? $row['status'] : '-' ; ?></td>
-                                    <td class="app-text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : '-'; ?></td>        
-                                    <td class="app-text-left">
+                                    <td class="text-center"><?php echo $row['status'] ? $row['status'] : '-' ; ?></td>
+                                    <td class="text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : '-'; ?></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']));
@@ -438,7 +439,7 @@ table.dataTable tbody td {
                                         endif;
                                     ?>
                                     </td>
-                                    <td class="app-text-left">
+                                    <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']));
@@ -885,10 +886,14 @@ table.dataTable tbody td {
                 }
             ],
             paging: true,
-            pageLength: 25,  
+            pageLength: 10,  
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                    <div class="datatable-search-wrapper">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon"></i>
+                    </div>`,
+                    searchPlaceholder: "Search"
             },
             initComplete: function () {
                 $(".dt-buttons").prepend(`
@@ -1439,7 +1444,7 @@ table.dataTable tbody td {
                             hour12: false
                         };
                         let uploaded = date.toLocaleString('en-GB', options).replace(',', '');
-                        let color = file.incentive_file_name ? "app-text-success" : "app-text-black";
+                        let color = file.incentive_file_name ? "app-text-success" : "font-color-black";
                         let download_url = "<?= base_url('user/download-incentive-file/') ?>" + encodeURIComponent(file.id);
                         let im = file.incentive_month;
                         
@@ -1450,10 +1455,10 @@ table.dataTable tbody td {
                                         <div class="d-flex align-items-center justify-content-between border rounded p-2 bg-white">
                                             <div class="d-flex align-items-center">
                                                 <div class="file-icon-box d-flex align-items-center justify-content-center">
-                                                    <i class="mdi mdi-file-document-outline app-text-black" style="font-size: 24px;"></i>
+                                                    <i class="mdi mdi-file-document-outline font-color-black" style="font-size: 24px;"></i>
                                                 </div>
                                                 <div class="ml-2">
-                                                    <div class="font-weight-bold app-text-black small text-truncate" 
+                                                    <div class="font-weight-bold font-color-black small text-truncate" 
                                                                 title="${file.incentive_file_name}" 
                                                                 style="max-width: 265px;">
                                                                 ${file.incentive_file_name}
diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php
index 05aad57a..3ab9080e 100755
--- a/app/Views/add_image_list.php
+++ b/app/Views/add_image_list.php
@@ -24,7 +24,7 @@ table.dataTable thead th {
             <div class="card-body">
                     <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
-                            <h4 style="position: relative;">Advertisement Image List</h4>
+                            <h4 style="position: relative;">Advertisement Images</h4>
                         </div>
                         <div class="col-6" style="text-align: right; position: relative;top: 5px;">
                             <a data-toggle="modal" data-target="#bike_make_login-modal" href="#" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
@@ -75,20 +75,25 @@ table.dataTable thead th {
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-body">
-                <div class="text-center mt-2 mb-4">
+                <div class="mt-2 mb-4">
                     <h4 id="advertise_add_edit">Add Advertise Image </h4>
                 </div>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                 <form id="model_form_data" class="px-4">
 
                     <input type="text" name="add_image_id" id="add_image_id" value="0" hidden>
 
                     <div class="row">
-                        <div class="col-md-8">
+                        <div class="col-md-12">
                             <div class="form-group">
-                                <label for="branchname">Image</label>
-                                <input class="form-control" name="advertise_image" id="advertise_image" type="file" accept="image/*" onchange="PreviewImage();" required="">
+                                <label for="branchname">Upload Image</label>
+                                <div class="input-icon">
+                                    <input type="file" class="form-control" name="advertise_image" id="advertise_image"
+                                        accept="image/*" onchange="PreviewImage();" required="">
+                                    <i class="mdi mdi-upload additional-icon"></i>
+                                </div>
                             </div>
-                            <div class="form-group col-md-6 float-left" style="position: relative;top: 0px;">
+                             <div class="form-group col-md-6 float-left" style="position: relative;top: 0px;">
                                 <img src=" " width="100" height="100" id="uploadPreview" class="avatar img-circle img-thumbnail" alt="avatar"/>
                             </div>
                         </div>
diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php
index d5897722..cbbc1731 100755
--- a/app/Views/batch_list.php
+++ b/app/Views/batch_list.php
@@ -28,20 +28,20 @@
                 <table data-custom-table-css="table" id="datatable-buttons" class="table table-hover m-0 table-centered dt-responsive w-100">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">SNO</th>
-                            <th class="font-weight-medium">Batch Code</th>
-                            <th class="font-weight-medium">File Name</th>
-                            <th class="font-weight-medium">Client</th>
-                            <th class="font-weight-medium">Client Branch</th>
-                            <th class="font-weight-medium">Client Policy</th>
-                            <th class="font-weight-medium">Event Type</th>
-                            <th class="font-weight-medium">Insurer/ TPA</th>
-                            <th class="font-weight-medium">Action</th>
-                            <th class="font-weight-medium">Count</th>
-                            <th class="font-weight-medium">(₹)Amount</th>
-                            <th class="font-weight-medium">User/Time</th>
-                            <th class="font-weight-medium">Status</th>
-                            <th class="font-weight-medium">Action</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
+                            <th class="font-weight-medium">Batch Code&nbsp;</th>
+                            <th class="font-weight-medium">File Name&nbsp;</th>
+                            <th class="font-weight-medium">Client&nbsp;</th>
+                            <th class="font-weight-medium">Client Branch&nbsp;</th>
+                            <th class="font-weight-medium">Client Policy&nbsp;</th>
+                            <th class="font-weight-medium">Event Type&nbsp;</th>
+                            <th class="font-weight-medium">Insurer/ TPA&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
+                            <th class="font-weight-medium">Count&nbsp;</th>
+                            <th class="font-weight-medium">(₹)Amount&nbsp;</th>
+                            <th class="font-weight-medium">User/Time&nbsp;</th>
+                            <th class="font-weight-medium">Status&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
                         </tr>
                     </thead>
 
@@ -52,7 +52,7 @@
                         ?>
 
                         <tr>
-                            <td><b><?php echo ($key + 1) ?></b></td>
+                            <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
                             <td><?php echo $file['batch_code'] ?></td>
                             <td style="overflow: hidden;" class="reload truncate" data-toggle="tooltip" data-placement="top" title="<?php echo $file['file_name'] ?>">
                                 <?php echo $file['file_name']?>
@@ -215,24 +215,42 @@
     $(document).ready(function() {
 
         $('#datatable-buttons').DataTable({
-            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-7'p>>",
+            // buttons: [{
+            //     extend: 'csv',
+            //     text: 'CSV',
+            //     title: 'Batch List',
+            //     className: 'my_class',
+            // }],
+            // initComplete: function(settings, json) {
+            //     $('.my_class').css({
+            //         position: "relative",
+            //         left: "50px"
+            //     });
+            // },
             buttons: [{
-                extend: 'csv',
-                text: 'CSV',
-                title: 'Batch List',
-                className: 'my_class',
-            }],
-            initComplete: function(settings, json) {
-                $('.my_class').css({
-                    position: "relative",
-                    left: "50px"
-                });
-            },
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Batch List',
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
+                    }
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true
         });
diff --git a/app/Views/bds_dash.php b/app/Views/bds_dash.php
index c91b2b6e..725c61b2 100644
--- a/app/Views/bds_dash.php
+++ b/app/Views/bds_dash.php
@@ -162,7 +162,7 @@
 
     <div class="row d-flex  align-items-center">
         <div class="StatusTileHide" style="padding-left: 25px;">
-            <a href="#" onclick="hide_status_show_pending_tile()" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
+            <a href="#" onclick="hide_status_show_pending_tile()" ><b><i class="mdi mdi-chevron-left mdi-36px chevron-left-dash"></i></b> </a>
         </div>
         <div class="StatusTileHide" style="display: none;padding-left: 15px;">
             <a href="#" id="mainMenuTiles">Current Tile : </a>
diff --git a/app/Views/bds_multi_report.php b/app/Views/bds_multi_report.php
index ce37847e..fac8a2e0 100644
--- a/app/Views/bds_multi_report.php
+++ b/app/Views/bds_multi_report.php
@@ -22,7 +22,6 @@
 </style>
 
 
-<div class="row">
     <div class="col-12" id="second_page">
         <div class="card">
             <div class="card-body">
@@ -82,7 +81,6 @@
             </div> <!-- end card-body -->
         </div> <!-- end card -->
     </div> <!-- end col-12 -->
-</div> <!-- end row -->
 
 <script>
     $(document).ready(function() {
@@ -94,22 +92,32 @@
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+                buttons: [
+                {
+                extend: 'collection',
+                text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                className: 'btn app-btn-secondary ',
                 buttons: [
                     {
                         extend: 'csv',
-                        text: 'CSV',
+                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
                         title: 'BDS TAT BAND WISE DATA',
                     },
                     {
                         extend: 'excel',
-                        text: 'Excel',
+                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
                         title: 'BDS TAT BAND WISE DATA',
                     },
-                    
+                    ]
+                 }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true,
                 pageLength: 10,
diff --git a/app/Views/bds_renewal_report_list.php b/app/Views/bds_renewal_report_list.php
index 8079164a..e9cbb1c6 100644
--- a/app/Views/bds_renewal_report_list.php
+++ b/app/Views/bds_renewal_report_list.php
@@ -9,8 +9,7 @@ table.dataTable tbody td {
 }
 </style>
 
-<div class="row" id="inception_list">
-    <div class="col-12">
+<div class="col-12" id="inception_list">    
         <div class="card">
             <div class="card-body">
                 <div class="row" style="margin-bottom:1rem;">
@@ -24,7 +23,7 @@ table.dataTable tbody td {
                             <thead class="bg-light">
                                 <tr>
                                     <th>
-                                        <div class="column-header">S.No.</div>
+                                        <div class="column-header">S.No&nbsp;</div>
                                     </th>
                                     <th>
                                         <div class="column-header">Renewal Month</div>
@@ -100,7 +99,6 @@ table.dataTable tbody td {
                 </div>
             </div>
         </div>
-    </div><!-- end col -->
 </div>
 
 <script>
@@ -115,24 +113,34 @@ $(document).ready(function() {
             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-7'p>>", // Pagination at the bottom, without page length selector
+            buttons: [
+            {
+            extend: 'collection',
+            text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+            className: 'btn app-btn-secondary ',
             buttons: [{
                     extend: 'csv',
-                    text: 'CSV',
+                    text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
                     title: 'Renewal-List',
                 },
                 {
                     extend: 'excel',
-                    text: 'Excel',
+                    text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
                     title: 'Renewal-List',
                     exportOptions: {
                         orthogonal: 'sort'
                     },
                 }
-
+            ]
+            }
             ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
             pageLength: 20, // Set default number of rows per page (optional)
@@ -142,4 +150,39 @@ $(document).ready(function() {
         console.error("Table atet found.");
     }
 });
+
+// Global DataTables defaults
+$.extend(true, $.fn.dataTable.defaults, {
+    language: {
+        search: "", // remove "Search:" label
+        searchPlaceholder: "Search"
+    },
+    paging: true,
+    pageLength: 10,
+    ordering: false
+});
+
+// Global init hook
+$(document).on('init.dt', function (e, settings) {
+    let $filter = $(settings.nTableWrapper).find('.dataTables_filter');
+    let $input = $filter.find('input');
+
+    if (!$filter.hasClass('custom-search')) {
+        // Wrap in Bootstrap input-group
+        $input
+            .addClass('form-control')
+            .wrap('<div class="input-group"></div>');
+
+        // Append icon
+        $input.after(`
+            <span class="input-group-text bg-white border-0">
+                <i class="mdi mdi-magnify"></i>
+            </span>
+        `);
+
+        // Align to right
+        $filter.addClass('text-right custom-search');
+    }
+});
+
 </script>
\ No newline at end of file
diff --git a/app/Views/bds_report_Insurer_wise_Data.php b/app/Views/bds_report_Insurer_wise_Data.php
index 79159730..cbc717a2 100644
--- a/app/Views/bds_report_Insurer_wise_Data.php
+++ b/app/Views/bds_report_Insurer_wise_Data.php
@@ -75,22 +75,35 @@ table.dataTable tbody td {
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 buttons: [
                     {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'Insurer-Wise-Report-List',
-                    },
-                    {
-                        extend: 'excel',
-                        text: 'Excel',
-                        title: 'Insurer-Wise-Report-List',
-                        exportOptions: {
-                            orthogonal: 'sort'
-                        },
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Insurer-Wise-Report-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        title: 'Insurer-Wise-Report-List',
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
                     }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/bds_report_bap_wise_data.php b/app/Views/bds_report_bap_wise_data.php
index c0a69a8b..12c6e8a2 100644
--- a/app/Views/bds_report_bap_wise_data.php
+++ b/app/Views/bds_report_bap_wise_data.php
@@ -75,22 +75,35 @@ table.dataTable tbody td {
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
                 buttons: [
                     {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'Bap-Wise-Report-List',
-                    },
-                    {
-                        extend: 'excel',
-                        text: 'Excel',
-                        title: 'Bap-Wise-Report-List',
-                        exportOptions: {
-                            orthogonal: 'sort'
-                        },
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Bap-Wise-Report-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        className: 'app-btn-primary ',
+                                        title: 'Bap-Wise-Report-List',
+                                    }
+                        ]
                     }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/bds_tat_wise_report.php b/app/Views/bds_tat_wise_report.php
index 721cd07c..8173ee3c 100644
--- a/app/Views/bds_tat_wise_report.php
+++ b/app/Views/bds_tat_wise_report.php
@@ -94,22 +94,54 @@
                 dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+                // buttons: [
+                //     {
+                //         extend: 'csv',
+                //         text: 'CSV',
+                //         title: 'BDS TAT BAND WISE DATA',
+                //     },
+                //     {
+                //         extend: 'excel',
+                //         text: 'Excel',
+                //         title: 'BDS TAT BAND WISE DATA',
+                //     },
+                    
+                // ],
                 buttons: [
                     {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'BDS TAT BAND WISE DATA',
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function(e, dt, node, config) { 
+                            openTicket();
+                        }
                     },
                     {
-                        extend: 'excel',
-                        text: 'Excel',
-                        title: 'BDS TAT BAND WISE DATA',
-                    },
-                    
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'BDS TAT BAND WISE DATA',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        title: 'BDS TAT BAND WISE DATA',
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
+                    }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true,
                 pageLength: 10,
diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php
index c6baa89e..481268cb 100644
--- a/app/Views/business_team_list.php
+++ b/app/Views/business_team_list.php
@@ -1,59 +1,62 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.col-12 {
+    .col-12 {
 
-    max-width: 98% !important;
-}
+        max-width: 98% !important;
+    }
 
-.dataTables_filter {
-    position: absolute;
-}
-.custom-dropdown-menu {
-    display: none;
-    position: absolute;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    border-radius: 0.25rem;
-    padding: 0.5rem 0;
-    min-width: 10rem;
-    z-index: 9999;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.custom-dropdown-menu .dropdown-item {
-    display: block !important;
-    width: 100% !important;
-    padding: 0.5rem 1rem !important;
-    color: #212529 !important;
-    text-decoration: none !important;
-    background-color: transparent !important;
-}
+    .custom-dropdown-menu {
+        display: none;
+        position: absolute;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 0, 0, 0.15);
+        border-radius: 0.25rem;
+        padding: 0.5rem 0;
+        min-width: 10rem;
+        z-index: 9999;
+        box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    }
 
-.custom-dropdown-menu .dropdown-item:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}   
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        color: #212529 !important;
+        text-decoration: none !important;
+        background-color: transparent !important;
+    }
+
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 </style>
 
-<div class="row">
-    <div class="col-12" style="margin-top: -12px;">
+
+<div class="col-12">
+    <div class="card-body">
         <div id="accordion" class="mb-3">
             <div class="card mb-1">
-                <h5 class="m-1">
+                <h4 class="m-1">
+                    <span>Filter</span>
                     <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
                         aria-expanded="true">
                         <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
                     </a>
-                </h5>
+                </h4>
                 <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                     <div class="card-body">
                         <div class="form-group">
@@ -64,11 +67,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="client_id" name="client_id">
                                         <option value="0">Select Client</option>
                                         <?php
-                                            if (isset($clients) && count($clients)) {
-                                                foreach ($clients as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
-                                                }
+                                        if (isset($clients) && count($clients)) {
+                                            foreach ($clients as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -79,9 +82,9 @@ table.dataTable tbody td {
                                     <select class="form-control" id="insurer_id" name="insurer_id">
                                         <option value="0" selected>Select Insurer</option>
                                         <?php if (isset($insurer) && count($insurer)) { ?>
-                                        <?php foreach ($insurer as $value) { ?>
-                                        <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
+                                            <?php foreach ($insurer as $value) { ?>
+                                                <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                            <?php } ?>
                                         <?php } ?>
                                     </select>
                                 </div>
@@ -91,11 +94,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="policy_type_id" name="policy_type_id">
                                         <option value="0">Select Policy Type</option>
                                         <?php
-                                            if (isset($policy_types) && count($policy_types)) {
-                                                foreach ($policy_types as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
-                                                }
+                                        if (isset($policy_types) && count($policy_types)) {
+                                            foreach ($policy_types as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -105,11 +108,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="issuer" name="issuer" required>
                                         <option value="0">Select Issure</option>
                                         <?php
-                                            if (isset($issuer) && count($issuer)) {
-                                                foreach ($issuer as $key => $value) {
-                                                    echo "<option value=" . $key . ">" . $value . "</option>";
-                                                }
+                                        if (isset($issuer) && count($issuer)) {
+                                            foreach ($issuer as $key => $value) {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -124,36 +127,36 @@ table.dataTable tbody td {
                                         onchange="hideDateField()">
                                         <option value="0">Select Date Type</option>
                                         <?php
-                                            if (isset($date_type) && count($date_type)) {
-                                                foreach ($date_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
-                                                }
+                                        if (isset($date_type) && count($date_type)) {
+                                            foreach ($date_type as $key => $value) {
+                                                echo "<option value='" . $key . "'>" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
 
                                 <div class="form-group col-md-3" style="display: none;" id="date_div">
                                     <label>Date<span class="text-danger"></span></label>
-                                    <div id="reportrange" class="form-control"
-                                        style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                        <span></span> <i class="mdi mdi-menu-down"></i>
+                                    <div class="input-icon">
+                                        <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
                                 </div>
-
-                                <div class="form-group col-md-3 text-right m-b-0" style="margin-top: 29px;">
-                                    <a href="<?= base_url("/policy_tranction/report/report-business-list"); ?>"
-                                        class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a href="<?= base_url("/policy_tranction/report/report-business-list"); ?>"
-                                        class="btn btn-primary" id="get-emp-list"
-                                        onclick="fetchEmpolyeeList(event);">Submit</a>
-                                </div>
-
                             </div>
 
+                            <div class="form-group text-right m-b-0">
+                                <a href="<?= base_url("/policy_tranction/report/report-business-list"); ?>"
+                                    class="btn btn-secondary" id="clear-filters">Clear</a>
+                                <a href="<?= base_url("/policy_tranction/report/report-business-list"); ?>"
+                                    class="btn btn-primary" id="get-emp-list"
+                                    onclick="fetchEmpolyeeList(event);">Submit</a>
+                            </div>
+
+
+
                             <!-- <div class="form-group text-right m-b-0">
                                 <button type="button" class="btn btn-secondary" id="clear-filters">Clear</button>
                                 <a href="<?= base_url("/policy_tranction/report/list"); ?>"
@@ -167,8 +170,10 @@ table.dataTable tbody td {
 
         </div>
     </div>
+
 </div>
 
+
 <div class="col-12" id="second_page">
     <div class="card">
         <div class="card-body">
@@ -182,13 +187,13 @@ table.dataTable tbody td {
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Client Name</th>
-                            <th>Insurer</th>
-                            <th>Policy</th>
-                            <th>Policy No</th>
-                            <th>Endorsement No</th>
-                            <th>Event Type</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Client Name&nbsp;</th>
+                            <th>Insurer&nbsp;</th>
+                            <th>Policy&nbsp;</th>
+                            <th>Policy No&nbsp;</th>
+                            <th>Endorsement No&nbsp;</th>
+                            <th>Event Type&nbsp;</th>
                             <th>Action</th>
                         </tr>
                     </thead>
@@ -196,7 +201,7 @@ table.dataTable tbody td {
                         <?php if (isset($business_list)) { ?>
                         <?php foreach($business_list as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1 ?></td>
+                            <td class="text-center"><?= $index + 1 ?></td>
                             <td><?php echo $row['client_name']; ?></td>
                             <td><?php echo $row['insurer_name']; ?></td>
                             <td><?php echo $row['policy_type']; ?></td>
@@ -217,13 +222,13 @@ table.dataTable tbody td {
                                                         echo base_url("/policy_tranction/endorsement/list") . '?pt_id=' . $row['policy_trns_id']; 
                                                     }
                                                 ?>" id="get-policy-list" class="dropdown-item btnEdit">
-                                            <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
-                                        </a>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                        <?php } ?>
+                                                    <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            <?php } ?>
                         <?php } ?>
                     </tbody>
                 </table>
@@ -236,159 +241,167 @@ table.dataTable tbody td {
 </div>
 
 <script>
-document.addEventListener("DOMContentLoaded", function () {
-    const table = document.getElementById("scroll-horizontal-datatable");
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("scroll-horizontal-datatable");
 
-    // Create custom dropdown
-    function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
-    }
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            // Get the original dropdown items
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
 
-    let activeDropdown = null;
+            // Create new dropdown with proper background and spacing
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        // Append the custom dropdown to the body
-        document.body.appendChild(customDropdown);
+            // Copy inner content while maintaining icon alignment
+            customDropdown.innerHTML = originalDropdown.innerHTML;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+            return customDropdown;
+        }
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+        let activeDropdown = null;
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
-            
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-            // Set as active dropdown
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
 
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
+            // Append the custom dropdown to the body
+            document.body.appendChild(customDropdown);
+
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the action column
+                if (event.target.closest('td:last-child')) {
+                    return;
                 }
 
-                // Close the dropdown after handling the click
+                // Hide any active dropdown
                 if (activeDropdown) {
                     activeDropdown.style.display = 'none';
-                    activeDropdown = null;
                 }
-                
-                e.stopPropagation();
+
+                // Get click position
+                const rect = event.target.getBoundingClientRect();
+
+                // Position the dropdown with some offset
+                customDropdown.style.display = 'block';
+                customDropdown.style.position = 'fixed';
+                customDropdown.style.left = `${rect.left}px`;
+                customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+                // Set as active dropdown
+                activeDropdown = customDropdown;
+
+                event.stopPropagation();
+            });
+
+            // Preserve click handlers and add auto-close
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    const onclickAttr = this.getAttribute('onclick');
+                    if (onclickAttr) {
+                        eval(onclickAttr);
+                    }
+
+                    const href = this.getAttribute('href');
+                    if (href && href !== '#') {
+                        window.location.href = href;
+                    }
+
+                    // Close the dropdown after handling the click
+                    if (activeDropdown) {
+                        activeDropdown.style.display = 'none';
+                        activeDropdown = null;
+                    }
+
+                    e.stopPropagation();
+                });
             });
         });
-    });
 
-    // Close dropdown when clicking outside
-    document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+        // Close dropdown when clicking outside
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
     });
-});
 </script>
 
 
 <script>
-// Datatable document ready
-$(document).ready(function() {
-
+    // Datatable document ready
+ $(document).ready(function() {
     var ticketsTable = $('#scroll-horizontal-datatable');
 
     if (ticketsTable.length) {
         ticketsTable.DataTable({
             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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-BDS-List',
-                },
+                 "<'row'<'col-sm-12'tr>>" +
+                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+            buttons: [
                 {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Policy-Tranction-BDS-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+                    extend: 'collection',
+                    text: '<span class="btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                    className: 'btn app-btn-secondary',
+                    buttons: [
+                        {
+                            extend: 'csv',
+                            text: '<i class="mdi mdi-file-delimited"></i><span class="btn-custom"> CSV </span>',
+                            title: 'Policy-Tranction-BDS-List'
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel"></i><span class="btn-custom"> EXCEL </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                            customize: function(xlsx) {
+                                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                                .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
+                                // Sum values in column AB (28th column)
+                                $('row c[r^="AB"]', sheet).each(function() {
+                                    var value = parseFloat($('v', this).text());
+                                    if (!isNaN(value)) {
+                                        total += value;
+                                    }
+                                });
+
+                                // Get last row index and append total row
+                                var lastRow = $('row:last', sheet);
+                                var rowIndex = parseInt(lastRow.attr('r')) + 2;
+
+                                var totalRow =
+                                    '<row r="' + rowIndex + '">' +
+                                        '<c t="inlineStr" r="AA' + rowIndex + '"><is><t>Total</t></is></c>' +
+                                        '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) + '</v></c>' +
+                                    '</row>';
+
+                                $(sheet).find('sheetData').append(totalRow);
                             }
-                        });
-
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                            2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
-
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    }
+                        }
+                    ]
                 }
-
             ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                    <div class="datatable-search-wrapper">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon"></i>
+                    </div>`,
+                searchPlaceholder: "Search"
             },
-            paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
-            ordering: false, 
+            paging: true,
+            pageLength: 10,
+            ordering: false
         });
     } else {
         console.error("Table not found.");
     }
 });
 
+
 $(document).ready(function() {
     getURLParams()
     $('#client_id').select2();
@@ -487,7 +500,7 @@ $(function() {
     // var end = moment();
 
     function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+        $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
         $('#startDate').val(start.format('DD-MM-YYYY'));
         $('#endDate').val(end.format('DD-MM-YYYY'));
     }
@@ -495,6 +508,7 @@ $(function() {
     $('#reportrange').daterangepicker({
         startDate: start,
         endDate: end,
+        locale: { format: 'DD-MM-YYYY' },
         ranges: {
             'Today': [moment(), moment()],
             'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
@@ -505,53 +519,174 @@ $(function() {
                 .endOf('month')
             ]
         }
-    }, cb);
-
-    cb(start, end);
-
-    $('#clear-filters').on('click', function() {
-        // Reset all select dropdowns to the first option
-        $('#client_id').val('0').change();
-        $('#insurer_id').val('0').change();
-        $('#policy_type_id').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer').val('0');
-        $('#date_div').hide()
-
-        // Reset the date range picker to default
-        $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
-        $('#reportrange').data('daterangepicker').setEndDate(moment());
-        cb(start, end); // Update the displayed date range
     });
 
-});
+    $(document).ready(function() {
+        getURLParams()
+        $('#client_id').select2();
+        $('#insurer_id').select2();
+        $('#policy_type_id').select2();
+    })
 
-function hideDateField(input = null) {
-    let val = $('#date_type').val();
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-    if (input) {
-        val = input;
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').val();
+
+        console.log(start_date + '-' + end_date);
+
+        var queryParams = {
+            start_date: start_date,
+            end_date: end_date,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            policy_type_id: policy_type_id,
+            date_type: date_type,
+            issuer: issuer,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-    if (val != 0) {
-        $('#date_div').show()
-    } else {
-        $('#date_div').hide()
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
     }
-}
 
-function sendPolicyTransactionID(event, pt_id) {
-    event.preventDefault(); // Prevent default action
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
 
-    console.log(pt_id);
+        const startDate = params.get('start_date') || 0; // Default to 0 if not found
+        const endDate = params.get('end_date') || 0; // Default to 0 if not found
+        const client_id = params.get('client_id') || 0; // Default to 0 if not found
+        const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+        const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
+        const date_type = params.get('date_type') || 0; // Default to 0 if not found
+        const issuer = params.get('issuer') || 0; // Default to 0 if not found
 
-    var queryParams = {
-        pt_id: pt_id,
-    };
+        hideDateField(date_type)
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
+        console.log('startDate', startDate)
+        console.log('endDate', endDate)
+        console.log('client_id', client_id)
+        console.log('insurer_id', insurer_id)
+        console.log('policy_type_id', policy_type_id)
+        console.log('date_type', date_type)
+        console.log('issuer', issuer)
+
+        // Log the values or use them as needed
+        console.log('Start Date:', startDate);
+        console.log('End Date:', endDate);
+
+        if (startDate != 0 && endDate != 0) {
+            setTimeout(function() {
+                $('#start_date').val(startDate)
+                $('#end_date').val(endDate)
+                $('#client_id').val(client_id).change()
+                $('#insurer_id').val(insurer_id).change()
+                $('#policy_type_id').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer').val(issuer)
+            }, 1000)
+
+        }
+
+    }
+
+    $(function() {
+
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        // Get start and end dates from URL parameters, or use default values
+        const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD-MM-YYYY');
+        const endDateParam = params.get('end_date') || moment().format('DD-MM-YYYY');
+
+        // Parse the dates to moment objects
+        var start = moment(startDateParam, 'DD-MM-YYYY');
+        var end = moment(endDateParam, 'DD-MM-YYYY');
+
+        // var start = moment().subtract(29, 'days');
+        // var end = moment();
+
+        function cb(start, end) {
+            $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#startDate').val(start.format('DD-MM-YYYY'));
+            $('#endDate').val(end.format('DD-MM-YYYY'));
+        }
+
+        $('#reportrange').daterangepicker({
+            startDate: start,
+            endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
+            ranges: {
+                'Today': [moment(), moment()],
+                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month')
+                    .endOf('month')
+                ]
+            }
+        }, cb);
+
+        cb(start, end);
+
+        $('#clear-filters').on('click', function() {
+            // Reset all select dropdowns to the first option
+            $('#client_id').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').val('0');
+            $('#date_div').hide()
+
+            // Reset the date range picker to default
+            $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
+            $('#reportrange').data('daterangepicker').setEndDate(moment());
+            cb(start, end); // Update the displayed date range
+        });
+
+    });
+
+    function hideDateField(input = null) {
+        let val = $('#date_type').val();
+
+        if (input) {
+            val = input;
+        }
+
+        if (val != 0) {
+            $('#date_div').show()
+        } else {
+            $('#date_div').hide()
+        }
+    }
+
+    function sendPolicyTransactionID(event, pt_id) {
+        event.preventDefault(); // Prevent default action
+
+        console.log(pt_id);
+
+        var queryParams = {
+            pt_id: pt_id,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index b556f4e3..f9ebba28 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -56,41 +56,42 @@ table.dataTable thead th {
     <div class="col-12">
         <div class="card">
             <div class="card-body maincard">
-                <div class="row" style="margin-bottom:1rem;">
+                <!-- <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">CD Master</h4>
                     </div>
                     <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                        <!-- <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light"
+                        <!- <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light"
                             data-toggle="modal" data-target="#con-close-modal" data-placement="top" title="Add"
-                            data-trigger="hover">ADD</button> -->
+                            data-trigger="hover">ADD</button> ->
                     </div>
-                </div>
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap" >
+                </div> -->
+                
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">S.No.</th>
-                            <th class="font-weight-medium">Client Name</th>
-                            <th class="font-weight-medium">Insurer Name</th>
-                            <th class="font-weight-medium">Insurer Branch Name</th>
-                            <th class="font-weight-medium">Opening Date</th>
-                            <th class="font-weight-medium">CD Account No</th>
-                            <th class="font-weight-medium">Opening Amount</th>
-                            <th class="font-weight-medium">Date/User</th>
-                            <th class="font-weight-medium">Action</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
+                            <th class="font-weight-medium">Client Name&nbsp;</th>
+                            <th class="font-weight-medium">Insurer Name&nbsp;</th>
+                            <th class="font-weight-medium">Insurer Branch Name&nbsp;</th>
+                            <th class="font-weight-medium">Opening Date&nbsp;</th>
+                            <th class="font-weight-medium">CD Account No&nbsp;</th>
+                            <th class="font-weight-medium">Opening Amount&nbsp;</th>
+                            <th class="font-weight-medium">Date/User&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
                         </tr>
                     </thead>
-                    <tbody>
+                    <tbody class="app-table-body">
                         <?php foreach($CD_Master_Data as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1; ?></td>
+                            <td class="text-center"><?= $index + 1; ?></td>
                             <td><?php echo $row['client_name']; ?>( <?= $row['short_name'] ?> )</td>
                             <td><?php echo $row['insurer_name']; ?></td>
                             <td><?php echo $row['insurer_branch_name']; ?></td>
                             <td><?php echo date('d-m-Y', strtotime($row['opening_date'])); ?></td>
                             <td><?php echo $row['cd_ac_no']; ?></td>
                             <td><?php echo $row['opening_bal']; ?></td>
-                            <td><?php echo date('d-M-Y h:i A', strtotime($row['created_at'])) ?> by <?php echo $row['user_name']; ?></td>
+                            <td><?php echo date('d-M-Y h:i A', strtotime($row['created_at'])) ?> <br>by <?php echo $row['user_name']; ?></td>
                             <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>
@@ -213,35 +214,82 @@ table.dataTable thead th {
     $(document).ready(function() {
 
         $('#scroll-horizontal-datatable').DataTable({
-            scrollX: true,
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-7'p>>",
-            buttons: [
-                {
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'CD-Master-List',
-                    className: 'my_class',
-                    exportOptions: {
-                        columns: ':not(:last-child)'
-                    },
-                }, 
-                {
-                    text: 'Add',
-                    className: 'buttons-html5 ',
-                    action: function (e, dt, node, config) {
+          scrollX: true,
+          dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
+            "<'row'<'col-sm-12'tr>>" + 
+            "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
+            buttons: [  
+              {
+                  text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                  className: 'btn app-btn-primary  mr-2',
+                  action: function (e, dt, node, config) {
                         showCdMasterAddModal();
-                    }
-                }
-            ],
-            language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
-            paging: true,
+                  }
+              },
+              {
+                  extend: 'collection',
+                  text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                  className: 'btn app-btn-secondary ',
+                  buttons: [
+                            {
+                                extend: 'csv',
+                                title: 'CD-Master-List',
+                                text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                className: 'app-btn-primary my_class',
+                                exportOptions: {
+                                    columns: ':not(:last-child)'
+                                },
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                className: 'app-btn-primary ',
+                            }
+                  ]
+              }
+          ],
+          language: {
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+          },
+          paging: true,
+          pageLength: 10,
+          order: [[0, 'desc']]
+        //     scrollX: true,
+        //     dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
+        //         "<'row'<'col-sm-12'tr>>" +
+        //         "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+        //     buttons: [
+        //         {
+        //             extend: 'csv',
+        //             text: 'CSV',
+        //             title: 'CD-Master-List',
+        //             className: 'my_class',
+        //             exportOptions: {
+        //                 columns: ':not(:last-child)'
+        //             },
+        //         }, 
+        //         {
+        //             text: 'Add',
+        //             className: 'buttons-html5 ',
+        //             action: function (e, dt, node, config) {
+        //                 showCdMasterAddModal();
+        //             }
+        //         }
+        //     ],
+        //     language: {
+        //         search: "_INPUT_",
+        //         searchPlaceholder: "Search..."
+        //     },
+        //     paging: true,
          });
-
     })
 
     $(document).ready(function(){
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index 0c1d6906..7a52530b 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -64,14 +64,14 @@
         <div class="card-body">
             <div class="row" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Files</h4>
+                    <h4 style="position: relative;">Claim Dump Upload</h4>
                 </div>
 
             </div>
             <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
                 <thead class="bg-light">
                     <tr>
-                        <th class="font-weight-medium">SNO</th>
+                        <th class="font-weight-medium">S.No&nbsp;</th>
                         <th class="font-weight-medium">File name</th>
                         <th class="font-weight-medium">User/Time</th>
                         <th class="font-weight-medium">Status</th>
@@ -86,21 +86,25 @@
                     ?>
 
                             <tr>
-                                <td><b><?php echo ($key + 1) ?></b></td>
+                                <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
                                 <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 if ($file['status'] == "failed") { ?>
-                                        <?= $file['status'] ?> <span class='col-xl-3 col-lg-4 col-sm-6'> 
+                                        <span style="color : #BD0707 ;"> <?= $file['status'] ?> </span> 
+                                        <span class='col-xl-3 col-lg-4 col-sm-6'> 
                                             <!-- <a href="<?= base_url('util/claim_dump_excel_error/') . $file['file_id'] ?>" target="_blank" class='fe-alert-circle' data-err="<?= $file['file_id'] ?>"></a> -->
                                             <a href="#" class='fe-alert-circle' onclick="fetchFileError(<?= $file['file_id'] ?>)"></a>
                                         </span>
                                     <?php } else if ($file['status'] == "inprogress") { ?>
-                                        <a data-id="<?= $file['status'] ?>" class="reload" href="#"><?= $file['status'] ?></a>
+                                        <a data-id="<?= $file['status'] ?>" class="reload" href="#"
+                                            style="color : #938e04ff ;">
+                                            <?= $file['status'] ?>
+                                        </a>
                                     <?php } else { ?>
-                                        <?= $file['status'] ?>
+                                       <span style="color : #34A853 ;"> <?= $file['status'] ?> </span> 
                                     <?php } ?>
                                 </td>
                                 <td>
@@ -156,7 +160,7 @@
                                 <!-- &nbsp;[ <a href="#" id="excel_download" data-toggle="tooltip" data-placement="top" title="Download Sample Excel">Sample Excel</a> ] -->
                                 <input type="file" name="claim_dump_list" id="claim_dump_list" accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet" required>
                             </div>
-                            <div class="form-group col-md-3" style="margin-top: 18px;">
+                            <div class="form-group col-md-3" style="margin-top: 40px;">
                                 <button id="claim_form_submit_button" type="submit" class="btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
                             </div>
                         </div>
@@ -293,8 +297,12 @@
                     }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 15, // Set default number of rows per page (optional)
diff --git a/app/Views/claim_files_upload.php b/app/Views/claim_files_upload.php
index 5652432c..0b5eab77 100644
--- a/app/Views/claim_files_upload.php
+++ b/app/Views/claim_files_upload.php
@@ -19,7 +19,15 @@
 
                                 <div class="form-group">
 
-                                    <div id="dynamic-form-container"></div>
+                                    <div id="dynamic-form-container">
+                                        <div  align="right">
+                                            <a class="btn btn-primary waves-effect waves-light mr-1"           
+                                                onclick="addHTMLInput(this)">
+                                                + Add
+                                            </a>
+                                        </div>
+                        
+                                    </div>
 
                                     <div class="form-group text-right m-b-0">
                                         <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
@@ -48,10 +56,10 @@
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Docs Name</th>
-                            <th>File Name</th>
-                            <th>Action</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Docs Name&nbsp;</th>
+                            <th>File Name&nbsp;</th>
+                            <th>Action&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody id="table_bd">
@@ -191,8 +199,9 @@ function addHTMLInput()
             >
         </div>
         <div class="form-group col-md-2" style="position: relative;top: 28px;">
-            <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)">x</a>
-            <a class="btn btn-primary waves-effect waves-light mr-1" onclick="addHTMLInput(this)">+</a>
+            <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)" style="background-color: #BD0707;">
+               <i class="mdi mdi-delete" ></i> 
+            </a>
         </div>
     `;
     container.appendChild(newRow);
@@ -265,7 +274,7 @@ function create_url_list(data) {
         data.forEach((item, index) => {
             html += `
                 <tr>
-                    <td>${index + 1}</td>
+                    <td class="text-center">${index + 1}</td>
                     <td>${item.doc_name}</td>
                     <td><a href="${item.url}" target="_blank">${item.url}</a></td>
                     <td>
diff --git a/app/Views/claims_dash.php b/app/Views/claims_dash.php
index f37a2ed7..804b2621 100644
--- a/app/Views/claims_dash.php
+++ b/app/Views/claims_dash.php
@@ -202,7 +202,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
 
     <div class="row d-flex  align-items-center">
         <div class="goBack" style="padding-left: 25px;">
-            <a href="#" onclick="hideAndShowTile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
+            <a href="#" onclick="hideAndShowTile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px chevron-left-dash"></i></b> </a>
         </div>
         <div class="goBack" style="display: none;padding-left: 15px;">
             <a href="#" id="current_tile">Current Tile : </a>
diff --git a/app/Views/claims_report_acc_manager_wise.php b/app/Views/claims_report_acc_manager_wise.php
index 659646b8..105f552a 100644
--- a/app/Views/claims_report_acc_manager_wise.php
+++ b/app/Views/claims_report_acc_manager_wise.php
@@ -7,10 +7,6 @@
         padding: 4px 4px !important;
     }
 
-    .col-12 {
-        max-width: 98% !important;
-    }
-
     .dataTables_filter {
         position: absolute;
     }
@@ -92,10 +88,24 @@
                      "<'row'<'col-sm-12'tr>>" +
                      "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
                 buttons: [
-                    { extend: 'csv', text: 'CSV', title: 'Insurer-Wise-Report-List' },
-                    { extend: 'excel', text: 'Excel', title: 'Insurer-Wise-Report-List', exportOptions: { orthogonal: 'sort' } }
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                { extend: 'csv', text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>', title: 'Insurer-Wise-Report-List',  className: 'app-btn-primary ' },
+                                { extend: 'excel', text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>', title: 'Insurer-Wise-Report-List',  className: 'app-btn-primary ', exportOptions: { orthogonal: 'sort' } }
+                        ],
+                    }
                 ],
-                language: { search: "_INPUT_", searchPlaceholder: "Search..." },
+                language: {
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
                 paging: true,
                 pageLength: 10,
                 ordering: false
diff --git a/app/Views/claims_report_tpa_wise.php b/app/Views/claims_report_tpa_wise.php
index 36b3412c..ec66572a 100644
--- a/app/Views/claims_report_tpa_wise.php
+++ b/app/Views/claims_report_tpa_wise.php
@@ -7,9 +7,6 @@
         padding: 4px 4px !important;
     }
 
-    .col-12 {
-        max-width: 98% !important;
-    }
 
     .dataTables_filter {
         position: absolute;
@@ -33,7 +30,8 @@
                     <thead class="bg-light">
                         <tr>
                             <th style="text-align: center;" colspan="8">OPEN</th>
-                            <th style="text-align: center;" colspan="5" >CLEARED</th>
+                            &nbsp;
+                            <th style="text-align: center;" colspan="7" >CLEARED</th>
                         </tr>
                         <tr>
                             <?php foreach ($column_order as $col_name): ?>
@@ -88,10 +86,24 @@
                      "<'row'<'col-sm-12'tr>>" +
                      "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
                 buttons: [
-                    { extend: 'csv', text: 'CSV', title: 'Insurer-Wise-Report-List' },
-                    { extend: 'excel', text: 'Excel', title: 'Insurer-Wise-Report-List', exportOptions: { orthogonal: 'sort' } }
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                            { extend: 'csv', text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>', title: 'Insurer-Wise-Report-List',className: 'app-btn-primary ' },
+                            { extend: 'excel', text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>', title: 'Insurer-Wise-Report-List',className: 'app-btn-primary ', exportOptions: { orthogonal: 'sort' } }
+                        ]
+                    }
                 ],
-                language: { search: "_INPUT_", searchPlaceholder: "Search..." },
+                language: {
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
                 paging: true,
                 pageLength: 10,
                 ordering: false
diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index 33314cc9..5db4a112 100755
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -70,6 +70,13 @@
     <div class="row" id="add_branch">
         <div class="col-12">
             <div class="card-body">
+
+
+                <div class="row float-left" style="position: relative; bottom: 20px; left: 13px;">
+                    <button type="button" id="btnAutoBranchFetch"
+                        class="btn btn-primary waves-effect waves-light btn-sm "> Auto Fetch branch Details</button>
+                </div>
+
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
                     <button type="button" id="btnBranchBack"
                         class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="mdi mdi-format-list-bulleted"
@@ -82,7 +89,12 @@
                     <input type="hidden" class="form-control" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
                     <input type="hidden" name="client_id" id="client_id_branch"
                         value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
+
+                    <input type="hidden" name="pre_branch_id" id="pre_branch_id" 
+                        value="<?= isset($pre_branch_id) ? $pre_branch_id : '' ?>" />
+
                     <input type="hidden" name="branch_id_primarykey" id="branch_id_primarykey" />
+
                     <div class="form-group">
                         <div class="form-row">
                             <div class="form-group col-md-6">
diff --git a/app/Views/client_deposit_list.php b/app/Views/client_deposit_list.php
index 7fcfff6b..81c80750 100755
--- a/app/Views/client_deposit_list.php
+++ b/app/Views/client_deposit_list.php
@@ -16,14 +16,13 @@
                             <a href="<?= base_url("client/client_deposit"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
                         </div> -->
                 </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
+                <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">Insurer Name</th>
-                            <th class="font-weight-medium">Insurer Branch Name</th>
-                            <th class="font-weight-medium">CD Account Number</th>
-                            <th class="font-weight-medium">Current Balance</th>
+                            <th class="font-weight-medium">Insurer Name&nbsp;</th>
+                            <th class="font-weight-medium">Insurer Branch Name&nbsp;</th>
+                            <th class="font-weight-medium">CD Account Number&nbsp;</th>
+                            <th class="font-weight-medium">Current Balance&nbsp;</th>
                             <th class="font-weight-medium">Action</th>
                         </tr>
                     </thead>
@@ -70,31 +69,43 @@
 $(document).ready(function() {
 
     $('#tickets-table').DataTable({
-        dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>",
-        buttons: [{
-            extend: 'csv',
-            text: 'CSV',
-            title: 'Client Deposit Details - ' + ' <?php echo $clientName[0]['client_name'];?>',
-            className: 'my_class',
-            exportOptions: {
-                columns: ':not(:last-child)'
-            },
-        },
-        {
-            extend: 'pdf',
-            text: 'PDF',
-            title: 'Client Deposit Details - ' + ' <?php echo $clientName[0]['client_name'];?>',
-            exportOptions: {
-                columns: ':not(:last-child)'
-            },
-        }
-    ],
-
-
+        // 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>>>",
+        buttons: [
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Client Deposit Details - ' + ' <?php echo $clientName[0]['client_name'];?>',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    },
+                                    {
+                                        extend: 'pdf',
+                                        text: '<i class="mdi mdi-file-pdf " ></i><span class="  btn-custom">  PDF </span>',
+                                        title: 'Client Deposit Details - ' + ' <?php echo $clientName[0]['client_name'];?>',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
+                    }
+                ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
 
     });
 
diff --git a/app/Views/client_info.php b/app/Views/client_info.php
index 0b43ecb5..aeb052cf 100755
--- a/app/Views/client_info.php
+++ b/app/Views/client_info.php
@@ -21,8 +21,18 @@
 
                     <div class="row" style="padding-top: 20px;margin-bottom: 18px;">
                         <div class="col-6">
-                            <h4 style="position: relative;left: 18px;top: 2px;">Client Basic Info - <strong> <?= $client['client_name'] ?> (
-                                <?= $client['short_name'] ?> ) </strong></h4>
+                            
+                        <h4 style="position: relative; left: 18px; top: 2px;">
+                        <span class="client_info_close fs-6" id="close_btn"> 
+                            <i class="mdi mdi-chevron-left" style="font-size: 28px;cursor:pointer;"></i> 
+                        </span> 
+                        <span>
+                            Client Basic Info - 
+                            <strong> <?= $client['client_name'] ?> ( <?= $client['short_name'] ?> ) </strong>
+                        </span>
+
+                        </h4>
+
                         </div>
 
                         <div class="col-6">
@@ -30,8 +40,6 @@
                             <div class="row">
 
                                 <div class="col-6" style="position: relative;left: 455px;">
-                                    <button id="close_btn"
-                                        class="btn btn-primary waves-effect waves-light client_info_close">Close</button>
                                 </div>
                                 <div class="col-1 float-right" style="position: relative;left: 255px;">
                                     <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse"
@@ -125,28 +133,36 @@
                                                 <?php if($value['open_for_enrollment'] == 'Open' ) { ?>
 
                                                 <span
-                                                    class="badge badge-success"><?= $value['open_for_enrollment']  ?></span>
+                                                    class="px-2 py-1"
+                                                    style="background-color: #F9F8CD; color: #000 !important; border-radius:10px !important; "
+                                                    ><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } else if($value['open_for_enrollment'] == 'Closed') { ?>
 
                                                 <span
-                                                    class="badge badge-warning"><?= $value['open_for_enrollment']  ?></span>
+                                                    class="px-2 py-1"
+                                                    style="background-color: #C2C2C2; color: #000 !important; border-radius:10px !important;"><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } else { ?>
 
                                                 <span
-                                                    class="badge badge-secondary"><?= $value['open_for_enrollment']  ?></span>
+                                                    style="background-color: #E26728; color: #000 !important; border-radius:10px !important;"
+                                                    class="px-2 py-1"><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } ?>
                                             </td>
                                             <td>
                                                 <?php if($value['policy_status'] == 'Active' ) { ?>
 
-                                                <span class="badge badge-success"><?= $value['policy_status']  ?></span>
+                                                <span 
+                                                style="background-color: #D1F8E7; color: #000 !important; border-radius:10px !important;"
+                                                class="px-2 py-1"><?= $value['policy_status']  ?></span>
 
                                                 <?php } else { ?>
 
-                                                <span class="badge badge-danger"><?= $value['policy_status']  ?></span>
+                                                <span 
+                                                style="background-color: #BD0707; color: #000 !important; border-radius:10px !important;"
+                                                class="px-2 py-1 "><?= $value['policy_status']  ?></span>
 
                                                 <?php } ?>
                                             </td>
diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php
index b7f543d8..e68543e2 100755
--- a/app/Views/client_kyc.php
+++ b/app/Views/client_kyc.php
@@ -1,49 +1,15 @@
-<style>
-    #kyc_table #tbody td,
-    #other_docs_table tbody td
-    {
-        background-color: white !important;
-    }
-
-    #kyc_table #tbody tr ,
-    #other_docs_table tbody tr
-    {
-        box-shadow: 0px 2px 4px 0px #00000024;
-        background-color: white;
-        border-radius: 10px;
-    }
-
-    #kyc_table #tbody tr:hover td  ,
-    #other_docs_table tr:hover td
-    {
-        background-color: #e0e0e0 !important;
-    }
-
-    #KYC-DOC-tab .card-body ,
-    #other_docs_table .card-body
-    {
-        background-color: #F5FFFF !important;
-        border-radius: 10px;
-        box-shadow: 0px 4px 4px 0px #00000040;
-    }
-
-    #KYC-DOC-tab thead{
-         padding: 15px !important;
-    }
-
-</style>
-
+<style> .card-body{ margin-top: 0px !important; } </style>
 
 <div class="tab-pane fade" id="KYC-DOC-tab">
 
     <div class="col-lg-12">
-        <div class="card">
+        <div class="card" id="collapseOne">
             <div class="card-body">
                 <div class="table-responsive">
-                    <table data-custom-table-css="table" id="kyc_table" class="table table-sm mb-0">
+                    <table data-custom-table-css="second-table" id="kyc_table" class="table table-sm mb-0">
                         <thead>
                             <tr>
-                                <th>S.no</th>
+                                <th>S. No</th>
                                 <th>Document Name</th>
                                 <th>Status</th>
                                 <th>Action</th>
@@ -63,7 +29,7 @@
    
     <div class="row" id="others">
         <div class="col-12">
-            <div class="card" style="margin-left: 12px;margin-right: -12px;">
+            <div class="card" id="collapseOne" style="margin-left: 12px;margin-right: -12px;">
                 <div class="card-body">
                     <h3>Additional Documents</h3>
                     <form role="form" class="parsley-examples" method="post" id="kyc_form" 
@@ -101,10 +67,10 @@
     </div> <!-- end row -->
 
     <div class="col-lg-12" id="other_docs_table">
-        <div class="card">
+        <div class="card" id="collapseOne">
             <div class="card-body">
                 <div class="table-responsive">
-                    <table data-custom-table-css="table" id="kyc_table" class="table table-sm mb-0">
+                    <table data-custom-table-css="second-table" id="kyc_table" class="table table-sm mb-0">
                         <thead>
                             <tr>
                                 <th>Document Name</th>
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index b46846e3..8cacb6bc 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -1,6 +1,6 @@
 
 <style>
-.table th,
+/* .table th,
 .table td {
     padding: 8px;
 }
@@ -11,7 +11,7 @@ table.dataTable tbody td {
 
 table.dataTable thead th {
     padding: 4px 4px !important;
-}
+} */
 
 .col-12{
 
@@ -74,32 +74,31 @@ table.dataTable thead th {
     <div class="col-12">
         <div class="card">
             <div class="card-body">
-                    <div class="row" style="margin-bottom:1rem;">
-                        <div class="col-6" style="align-self: center;">
-                            <h4 style="position: relative;">Client List</h4>
-                        </div>
+                    <!-- <div class="row" style="margin-bottom:1rem;">-->
+                        <!-- <div class="col-6" style="align-self: center;">
+                            <h4 style="position: relative;">Client</h4>
+                        </div> -->
                         <!-- <div class="col-2" style="text-align: right; position: relative;top: 56px; left: 303px;">
                             <a class="btn btn-primary waves-effect waves-light" onclick="showModal()">Add From Lead</a>                
                         </div>
                         <div class="col-1" style="text-align: right; position: relative;top: 56px; left: 294px;">
                             <a href="<?= base_url("client/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">Add</a>                
                         </div> -->
-                    </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
+                    <!-- </div>-->
+                <table data-custom-table-css="table" class="table mb-0 nowrap" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">S.No</th>
-                            <th class="font-weight-medium">Client Name</th>
-                            <th class="font-weight-medium">Account Manager</th>
-                            <th class="font-weight-medium">Action</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
+                            <th class="font-weight-medium">Client Name&nbsp;</th>
+                            <th class="font-weight-medium">Account Manager&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
                         </tr>
                     </thead>
 
                     <tbody>
                      <?php foreach($clientList as $index => $row){ ?>
                         <tr >
-                            <td><?=$index+1?></td>
+                            <td class="text-center"><?=$index+1?></td>
                             <td class="client_info" data-id="<?php echo $row->id; ?>"><?php echo $row->client_name; ?> ( <?php echo $row->short_name; ?> ) </td>
                             <td>
                                 <?php $account_managers = ''; ?>
@@ -108,7 +107,9 @@ table.dataTable thead th {
                                         <?php $account_managers .= $client->account_manager . ', '; ?>
                                     <?php endif; ?>
                                 <?php endforeach; ?>
-                                <?php echo rtrim($account_managers, ', '); ?> 
+                                <?php 
+                                 $account_managers = rtrim($account_managers, ', ');
+                                 echo $account_managers !== '' ? $account_managers : 'N/A'; ?> 
                             </td>
                             <td>
                                 <div class="btn-group dropdown">
@@ -166,7 +167,8 @@ table.dataTable thead th {
             </div>
         </div><!-- /.modal-content -->
     </div>
-</div><!-- /.modal -->
+</div>
+<!-- /.modal -->
 
 <script>
    document.addEventListener("DOMContentLoaded", function () {
@@ -296,11 +298,11 @@ table.dataTable thead th {
 $(document).ready(function()
 {
     $('#tickets-table').DataTable({
-        dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
-            "<'row'<'col-sm-12'tr>>" + 
-            "<'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-7'p>>",
+
         buttons: [
- 
             {
                 text: 'Add From Lead',
                 className: 'btn-filter add-from-lead', // custom class
@@ -309,31 +311,36 @@ $(document).ready(function()
                 }
             },
             {
-                text: '+ create New Client',
-                className: 'btn-filter buttons-html5', // custom class
+                text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                className: 'btn app-btn-primary  mr-2',
                 action: function(e, dt, node, config) {
                     addClient();
                 }
             },
-            {
-                extend: 'csv',
-                text: 'CSV',
-                title: 'ClientList',
-                className: 'my_class',
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                },
-            }
-        ],
-
-        initComplete: function() {
-            $('.btn-filter')
-                .removeClass('btn-secondary') 
-                .addClass('btn btn-primary');  
-        },
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Client-List',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
+            search: `
+            <div class="datatable-search-wrapper">
+                _INPUT_
+                <i class="mdi mdi-magnify datatable-search-icon"></i>
+            </div>`,
+            searchPlaceholder: "Search"
         },
         paging: true ,
         // pagingType: 'full_numbers'
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 5366d1a8..e5da1242 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -1,44 +1,39 @@
 <style>
+    body {
+        .multiselect-native-select {
+            position: relative;
+
+            /* bottom: 32px; */
+            select {
+                border: 0 !important;
+                clip: rect(0 0 0 0) !important;
+                height: 1px !important;
+                margin: -1px -1px -1px -3px !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                position: absolute !important;
+                width: 1px !important;
+                left: 50%;
+                top: 30px;
+            }
+        }
+
+        .multiselect-container {
+            width: 100% !important;
+        }
+
+        .multiselect-selected-text {
+            float: left !important;
+        }
 
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
     }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
-.navtab-bg .nav-link {
-    margin: 0 5px 10px!important;
-}
-
-.readonly-select {
-    pointer-events: none;
-    /* background-color: #f0f0f0;  */
-    background-color: #e0e0e0;
-    color: #666; 
-}
 
+    .readonly-select {
+        pointer-events: none;
+        /* background-color: #f0f0f0;  */
+        background-color: #e0e0e0;
+        color: #666;
+    }
 </style>
 
 <style>
@@ -47,10 +42,6 @@ body {
         font-size: 14px;
     }
 
-    .container-fluid {
-        padding: 12px;
-    }
-
     .user-card {
         background: white;
         border-radius: 8px;
@@ -90,7 +81,7 @@ body {
         font-size: 0.85em;
         opacity: 0.9;
         margin: 0;
-        color:rgb(56, 55, 55);
+        color: rgb(56, 55, 55);
     }
 
     .accordion-icon {
@@ -259,48 +250,19 @@ body {
         border: 1px solid #dee2e6;
     }
 
-    #client_add .nav-pills ,
-    #client_add .nav-link    
-    {
-        background-color: #F5FFFF !important;
-        color : #00999E !important;
-        border-radius:10px;
-        
-    }
 
-    #client_add .nav-pills 
-    {
-        background-color: #F5FFFF !important;
-        color : #00999E !important;
-        box-shadow: 0px 2px 4px 0px #00000040;
-        padding-top: 5px ;
-    }
-
-
-    #client_add .nav-link.active-tab {
-        color: white !important;
-        background-color: #00999E !important;
-        font-size: small !important;
-        padding:8px 16px;
-        border-radius: 10px !important; 
-        box-shadow: 0px 2px 4px 0px #00000040;
-    
-    }
-
-    #hr_activity_history_append_area{
-        padding-top:0; 
-        margin-top:0; 
+    #hr_activity_history_append_area {
+        padding-top: 0;
+        margin-top: 0;
         background-color: #F5FFFF !important;
         border: 2px solid #F5FFFF;
         border-radius: 10px;
         box-shadow: 0px 4px 4px 0px #00000040;
     }
 
-    #hr_activity_history_append_area tbody tr{
+    #hr_activity_history_append_area tbody tr {
         background-color: white !important;
     }
-
-
 </style>
 
 
@@ -311,78 +273,94 @@ body {
             <div class="card-body">
                 <div class="row" style="padding-bottom: 10px;">
                     <div class="col-6" style="align-self: center;">
-                        <h4  style="position: relative;">Client Onboarding  <?php if(isset($client)) {echo ' - ' . $client['client_name']; } ?></h4>
+                        <h4 style="position: relative;">Client Onboarding <?php if (isset($client)) {
+                                                                                echo ' - ' . $client['client_name'];
+                                                                            } ?></h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
                         <a href="<?= base_url("client/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i></a>
                     </div>
                 </div>
-                
+
                 <br>
 
-                <ul class="nav nav-pills navtab-bg" >
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active" id="general_tab">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                            <span class="d-none d-sm-inline-block">KYC Docs</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#RM-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="RM_tab">
-                            <span class="mr-1"><i class="mdi mdi-account-switch"></i></span>
-                            <span class="d-none d-sm-inline-block"> Relationship Manager</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="branch_tab">
-                            <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
-                            <span class="d-none d-sm-inline-block">Branch & Contacts</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#notification-tab"  data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="notification_tab">
-                            <span class="mr-1"><i class="mdi mdi-bell"></i></span>
-                            <span class="d-none d-sm-inline-block">Notifications</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#police-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="policy_tab">
-                            <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
-                            <span class="d-none d-sm-inline-block">Policies</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#hr-access-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_access_tab" onclick="appendHrAccessControllHtml(this)">
-                            <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
-                            <span class="d-none d-sm-inline-block">HR Access Control</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#hr-activity-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_activity_tab" onclick="appendHrActivityHistoryHtml(this)">
-                            <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
-                            <span class="d-none d-sm-inline-block">HR Activity</span>
-                        </a>
-                    </li>
-                    <!-- <li class="nav-item">
-                        <a href="#api-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="api_tab">
-                            <span class="mdi mdi-api"></span>
-                            <span class="d-none d-sm-inline-block">API</span>
-                        </a>
-                    </li> -->
-                    <!-- <li class="nav-item">
-                        <a href="#others-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="others_tab">
-                            <span class="mr-1"><i class="mdi mdi-tag-text-outline"></i></span>
-                            <span class="d-none d-sm-inline-block">Others</span>
-                        </a>
-                    </li> -->
-                </ul>
+                <div class="tab-wrapper position-relative">
+                    <!-- Left Arrow -->
+
+
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item ">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active" id="general_tab">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
+                                <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                                <span class="d-none d-sm-inline-block">KYC Docs</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#RM-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="RM_tab">
+                                <span class="mr-1"><i class="mdi mdi-account-switch"></i></span>
+                                <span class="d-none d-sm-inline-block"> Relationship Manager</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="branch_tab">
+                                <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
+                                <span class="d-none d-sm-inline-block">Branch & Contacts</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#notification-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="notification_tab">
+                                <span class="mr-1"><i class="mdi mdi-bell"></i></span>
+                                <span class="d-none d-sm-inline-block">Notifications</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#police-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="policy_tab">
+                                <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
+                                <span class="d-none d-sm-inline-block">Policies</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#hr-access-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_access_tab" onclick="appendHrAccessControllHtml(this)">
+                                <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
+                                <span class="d-none d-sm-inline-block">HR Access Control</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#hr-activity-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_activity_tab" onclick="appendHrActivityHistoryHtml(this)">
+                                <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
+                                <span class="d-none d-sm-inline-block">HR Activity</span>
+                            </a>
+                        </li>
+                        <!-- <li class="nav-item">
+                                <a href="#api-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="api_tab">
+                                    <span class="mdi mdi-api"></span>
+                                    <span class="d-none d-sm-inline-block">API</span>
+                                </a>
+                            </li> -->
+                        <!-- <li class="nav-item">
+                                <a href="#others-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="others_tab">
+                                    <span class="mr-1"><i class="mdi mdi-tag-text-outline"></i></span>
+                                    <span class="d-none d-sm-inline-block">Others</span>
+                                </a>
+                            </li> -->
+                        <li class="nav-item">
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+
+
+                </div>
+
                 <div class="tab-content">
 
                     <div class="tab-pane fade" id="hr-access-tab">
@@ -408,7 +386,8 @@ body {
                     </div>
 
                     <?php include("client_api.php"); ?>
-                    <?php // include('client_others_tab.php'); ?>
+                    <?php // include('client_others_tab.php'); 
+                    ?>
                     <?php include('notification.php'); ?>
                     <?php include('client_basic_info.php'); ?>
                     <?php include('client_kyc.php'); ?>
@@ -422,81 +401,141 @@ body {
 </div>
 
 
-<script>
+<div class="modal fade" id="autoFetchBranchModal" tabindex="-1" role="dialog" aria-labelledby="autoFetchBranchModalLabel" accesskey=""
+    aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" style="margin-left: 400px !important;">
+        <div class="modal-content modal-lg">
+            <div class="modal-header">
+                <h5 class="modal-title" id="autoFetchBranchModalLabel">Auto Fetch Branch Details</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body" style="min-height:auto !important;">
 
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="form-group col-md-12">
+                            <label for="auto_fetch_client">Client List<span class="text-danger">*</span></label>
+                            <select class="form-control" id="auto_fetch_client" name="auto_fetch_client" required>
+                                <option value="">Select Client</option>
+                                <?php if (!empty($auto_fetch_client_list)): ?>
+                                    <?php foreach ($auto_fetch_client_list as $client_list): ?>
+                                        <option value="<?= esc($client_list['id']) ?>">
+                                            <?= esc($client_list['client_name']) ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                <?php endif; ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="col-md-6">
+                        <div class="form-group col-md-12">
+                            <label for="auto_fetch_branch">Branch List<span class="text-danger">*</span></label>
+                            <select class="form-control" id="auto_fetch_branch" name="auto_fetch_branch" required>
+                                <option value="">Select Branch</option>
+
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn cancel-btn" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary submit-btn" id="submitAutoFetch">Submit</button>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<script>
     let hrAccessControlHtmlAppended = false;
     let hrActivityHistoryHtmlAppended = false;
 
     function client_kyc_docs() {
         var check_client_id = $('#general_PrimaryKey');
-        
 
-        if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
+
+        if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
             }
         }
-        
+
     }
 
     function client_relationship_manager() {
         var check_client_id = $('#general_PrimaryKey');
-        
 
-        if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
+
+        if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#relation_form').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             $('#relation_form').show();
         }
-        
+
     }
 
     function client_policies() {
         var check_client_id = $('#general_PrimaryKey').val();
-        
-        if(check_client_id == '' || check_client_id == null || check_client_id == 0){
+
+        if (check_client_id == '' || check_client_id == null || check_client_id == 0) {
             $('#BtnAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnPolicyBack')[0].style.display == 'none') {
                 $('#BtnAdd').show();
             }
         }
-        
+
     }
 
     function client_branch_contact() {
         var check_client_id = $('#general_PrimaryKey');
-        
 
-        if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
+
+        if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
             }
         }
-        
+
     }
 
     function client_notification() {
         var check_client_id = $('#general_PrimaryKey');
-        
 
-        if(check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0){
+
+        if (check_client_id[0].value == '' || check_client_id[0].value == null || check_client_id[0].value == 0) {
             $('#notification-tab').hide();
-            toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('Please Add the Client!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#notification-tab')[0].style.display == 'none') {
                 $('#notification-tab').show();
             }
         }
-        
+
     }
 
     document.getElementById("kyc_tab").addEventListener("click", function(event) {
@@ -513,7 +552,7 @@ body {
         event.preventDefault();
         client_policies();
     });
-    
+
     document.getElementById("branch_tab").addEventListener("click", function(event) {
         event.preventDefault();
         client_branch_contact();
@@ -525,15 +564,17 @@ body {
     });
 
     //HR Access Controll
-    function appendHrAccessControllHtml(input){
+    function appendHrAccessControllHtml(input) {
         console.log(input.id);
         let client_id = $('#general_PrimaryKey').val();
         console.log('client_id ', client_id);
 
         let url = '<?= base_url('util/viewHrAccessData') ?>';
-        let requestData = {client_id : client_id};
+        let requestData = {
+            client_id: client_id
+        };
 
-        if(hrAccessControlHtmlAppended == false){
+        if (hrAccessControlHtmlAppended == false) {
             sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
                 console.log('Data fetched successfully:', response);
 
@@ -550,13 +591,13 @@ body {
                 console.error(xhr.responseText);
                 hrAccessControlHtmlAppended = false;
             });
-        }else{
+        } else {
             console.log('Already HTML appended');
         }
     }
 
     //HR Activity History
-    function appendHrActivityHistoryHtml(input, submit = false){
+    function appendHrActivityHistoryHtml(input, submit = false) {
         console.log(input.id);
         let client_id = $('#general_PrimaryKey').val();
         let startDate = $('#startDate').val();
@@ -565,14 +606,18 @@ body {
         console.log('startDate ', startDate);
         console.log('endDate ', endDate);
 
-        if(submit){
-             hrActivityHistoryHtmlAppended = false;
+        if (submit) {
+            hrActivityHistoryHtmlAppended = false;
         }
 
         let url = '<?= base_url('user/getUserActivityHistory') ?>';
-        let requestData = {client_id : client_id, startDate : startDate, endDate : endDate};
+        let requestData = {
+            client_id: client_id,
+            startDate: startDate,
+            endDate: endDate
+        };
 
-        if(hrActivityHistoryHtmlAppended == false){
+        if (hrActivityHistoryHtmlAppended == false) {
             sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
                 console.log('Data fetched successfully:', response);
 
@@ -589,20 +634,18 @@ body {
                 console.error(xhr.responseText);
                 hrActivityHistoryHtmlAppended = false;
             });
-        }else{
+        } else {
             console.log('Already HTML appended');
         }
     }
-
 </script>
 
 <script>
-
     function toggleAccordion(header) {
-        if (event.target.classList.contains('fa-info-circle') || 
-        event.target.parentElement.classList.contains('fa-info-circle')) {
+        if (event.target.classList.contains('fa-info-circle') ||
+            event.target.parentElement.classList.contains('fa-info-circle')) {
             getHrActivityHistory();
-        return; // Do nothing if click was on the info icon
+            return; // Do nothing if click was on the info icon
         }
         const card = header.parentElement;
         const content = card.querySelector('.card-content');
@@ -650,9 +693,8 @@ body {
         return Array.from(checkboxes).map(cb => parseInt(cb.value));
     }
 
-    function getHrActivityHistory()
-    {
-        console.log(event.target.dataset.id);//return;
+    function getHrActivityHistory() {
+        console.log(event.target.dataset.id); //return;
         let ids = event.target.dataset.id.split('-');
         console.log('ids', ids)
         let client_id = $('#general_PrimaryKey').val();
@@ -661,7 +703,12 @@ body {
         console.log(url);
         let user_type = "hr";
 
-        let requestData = {user_id : ids[1], pre_hr_id : ids[0], user_type : user_type, client_id : client_id};
+        let requestData = {
+            user_id: ids[1],
+            pre_hr_id: ids[0],
+            user_type: user_type,
+            client_id: client_id
+        };
         console.log('requestData', requestData);
 
         sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
@@ -703,7 +750,10 @@ body {
                 allowed_pre_policies: getCheckedValues(`${userId}_pre_policies`),
                 allowed_active_policies: getCheckedValues(`${userId}_active_policies`),
                 allowed_cd: getCheckedValues(`${userId}_cd`),
-                allowed_claims: getCheckedValues(`${userId}_claims`)
+                allowed_claims: getCheckedValues(`${userId}_claims`),
+                pre_branch_id: formData.get(`${userId}_pre_branch_id`),
+                post_branch_id: formData.get(`${userId}_post_branch_id`),
+                pre_client_id: formData.get(`${userId}_pre_client_id`)
             };
 
             users.push(user);
@@ -721,7 +771,10 @@ body {
                 allowed_pre_policies: user.allowed_pre_policies.length ? `[${user.allowed_pre_policies.join(',')}]` : '[]',
                 allowed_active_policies: user.allowed_active_policies.length ? `[${user.allowed_active_policies.join(',')}]` : '[]',
                 allowed_cd: user.allowed_cd.length ? `[${user.allowed_cd.join(',')}]` : '[]',
-                allowed_claims: user.allowed_claims.length ? `[${user.allowed_claims.join(',')}]` : '[]'
+                allowed_claims: user.allowed_claims.length ? `[${user.allowed_claims.join(',')}]` : '[]',
+                pre_client_id: user.pre_client_id || "",
+                pre_branch_id: user.pre_branch_id || "",
+                post_branch_id: user.post_branch_id || ""
             };
         });
 
@@ -745,7 +798,10 @@ body {
         console.log(output);
 
         let url = '<?= base_url('util/saveHrAccessData') ?>';
-        let requestData = {json : output, client_id : client_id};
+        let requestData = {
+            json: output,
+            client_id: client_id
+        };
 
         sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
             console.log('Data fetched successfully:', response);
@@ -771,15 +827,15 @@ body {
         return Array.from(checkboxes).map(cb => cb.value);
     }
 
-    $(document).on('change', '.select-all', function () {
+    $(document).on('change', '.select-all', function() {
         let $this = $(this);
         let type = $this.data('type');
         let user = $this.data('user');
         let group = $this.data('group');
 
         console.log('--- SELECT-ALL CHANGED ---');
-        console.log('Type:', type);   // all / active / inactive
-        console.log('User:', user);   // user index
+        console.log('Type:', type); // all / active / inactive
+        console.log('User:', user); // user index
         console.log('Group:', group); // pre / post
 
         // Step 1: Uncheck other "select-all" checkboxes in the same user/group
@@ -972,19 +1028,131 @@ body {
 
     //     console.log('--- END ---');
     // });
+</script>
 
+
+<script>
+    $('#btnAutoBranchFetch').click(function() {
+
+        var myModal = new bootstrap.Modal(document.getElementById('autoFetchBranchModal'));
+        myModal.show();
+
+
+    })
 </script>
 
 <script>
-    $(document).ready(function(){
-    $('#client_add .nav-link').click(function(){
+    $('#auto_fetch_client').change(function() {
 
-    // change bg color of tab
-        $('#client_add .nav-link').removeClass('active-tab');
-        $(this).addClass('active-tab');
-    
+        $('#auto_fetch_branch').html(`<option value="">Select Branch</option>`);
 
+        $.ajax({
+            url: "<?php echo base_url('client/branch/auto_fetch_branch'); ?>",
+            type: "POST",
+            data: {
+                client_id: $('#auto_fetch_client').val()
+            },
+            dataType: "json",
+            success: function(response, textStatus, xhr) {
+                if (xhr.status === 200) {
+                    let options = `<option value="">Select Branch</option>`;
 
+                    response.data.forEach((data) => {
+                        options += `<option value="${data.id}">${data.branch_name}</option>`;
+                    });
+
+                    $('#auto_fetch_branch').html(options);
+                } else {
+                    $('#auto_fetch_branch').html('<option value="">No Branch Found</option>');
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error("Error occurred:", status, error);
+            },
+            complete: function() {
+                console.log("auto_fetch_client call is completed..!!");
+            }
+        });
     });
-});
 </script>
+
+<script>
+    $('#submitAutoFetch').click(function() {
+
+        let client_id = $('#auto_fetch_client').val();
+        let branch_id = $('#auto_fetch_branch').val();
+
+        if (client_id == "" || branch_id == "") {
+            Swal.fire({
+                icon: 'warning',
+                title: 'Missing Data',
+                text: 'Please select both Client and its Branch!',
+                confirmButtonText: 'OK'
+            });
+            return;
+        }
+
+        $.ajax({
+            url: "<?php echo base_url('client/branch/auto_fetch_branch_details'); ?>",
+            type: "POST",
+            data: {
+                client_id,
+                branch_id
+            },
+            dataType: "json",
+            success: function(response, textStatus, xhr) {
+                if (xhr.status === 200) {
+
+                    let result = response.data[0]??[];
+
+                    if(response.data[0] == []){
+                        console.log("Empty array ..!!!");
+                        return;
+                    }
+
+                    let units = JSON.parse(result['units']);
+
+                    let $select = $('#selected');
+                    $select.empty();
+
+                    units.forEach(unit => {
+                        // If you want to mark them as selected, set 'selected' attribute
+                        $select.append(`<option value="${unit}" selected>${unit}</option>`);
+                    });
+
+
+
+                    $('#pre_branch_id').val(branch_id);
+                    $('#branch_name').val(result['branch_name']??'');
+                    $('#branch_code').val(result['branch_code']??'');
+                    $('#address1').val(result['address1']??'');
+                    $('#address2').val(result['address2']??'');
+                    $('#state').val(result['state']??'');
+                    $('#district').val(result['district']??'');
+                    $('#branch_city').val(result['city']??'');
+                    $('#pincode').val(result['pincode']??'');
+                    $('#gst').val(result['gst']??'');
+                    $('#sez').val(result['sez']??'');
+
+                } else {
+                    console.log("User Error thrown");
+                    console.log("status" + xhr.status);                
+                }
+
+                closeModalById('autoFetchBranchModal');
+
+            },
+            error: function(xhr, status, error) {
+                console.error("Error occurred:", status, error);
+            },
+            complete: function() {
+                console.log("auto_fetch_branch_details call is completed..!!");
+            }
+
+        })
+
+
+
+
+    })
+</script>
\ No newline at end of file
diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php
index 58fd2da3..6bdd968a 100644
--- a/app/Views/dms_search.php
+++ b/app/Views/dms_search.php
@@ -1,90 +1,101 @@
 <style>
-.col-12 {
+    .col-12 {
 
-    max-width: 98% !important;
-}
-
-.autocomplete-suggestions {
-      border: 1px solid #d4d4d4;
-      max-height: 150px;
-      overflow-y: auto;
-      position: absolute;
-      background-color: white;
-      width: inherit;
-      z-index: 1;
+        max-width: 98% !important;
     }
+
+    .autocomplete-suggestions {
+        border: 1px solid #d4d4d4;
+        max-height: 150px;
+        overflow-y: auto;
+        position: absolute;
+        background-color: white;
+        width: inherit;
+        z-index: 1;
+    }
+
     .autocomplete-suggestion {
-      padding: 8px;
-      cursor: pointer;
-    }
-    .autocomplete-suggestion:hover {
-      background-color: #e9e9e9;
+        padding: 8px;
+        cursor: pointer;
     }
 
+    .autocomplete-suggestion:hover {
+        background-color: #e9e9e9;
+    }
 </style>
 
 <div class="row">
     <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <form method="post" action="<?= base_url("/dmsSearch");?>" id='dms_search_form'>
-                            <div class="form-row">
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                    <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body" style="margin-top: 0px;">
+                            <div class="form-group">
+                                <form method="post" action="<?= base_url("/dmsSearch"); ?>" id='dms_search_form'>
+                                    <div class="form-row">
 
-                                <div class="form-group col-md-2">
-                                    <label for="customer">Customer</label>
-                                    <!-- <div style="position:relative;"> -->
-                                        <input type="text" class="form-control" id="customer" placeholder="Enter customer name">
-                                        <input type="hidden" name="customer_id" class="form-control" id="customer_id" placeholder="Enter customer name">
-                                        <div id="customer_suggestions" class="autocomplete-suggestions" style="display:none;"></div>
-                                    <!-- </div> -->
-                                </div>
+                                        <div class="form-group col-md-4">
+                                            <label for="customer">Customer</label>
+                                            <!-- <div style="position:relative;"> -->
+                                            <input type="text" class="form-control" id="customer" placeholder="Enter customer name">
+                                            <input type="hidden" name="customer_id" class="form-control" id="customer_id" placeholder="Enter customer name">
+                                            <div id="customer_suggestions" class="autocomplete-suggestions" style="display:none;"></div>
+                                            <!-- </div> -->
+                                        </div>
 
-                                 <div class="form-group col-md-2">
-                                    <label for="customer">Customer document name</label>
-                                    <!-- <div style="position:relative;"> -->
-                                        <input type="text" name="cus_doc_name" class="form-control" id="cus_doc_name" placeholder="Enter customer doc name ">
-                                    <!-- </div> -->
-                                </div>
-                                <div class="form-group col-md-1" style="text-align: center;">
-                                    OR
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label for="customer">Policy</label>
-                                    <!-- <div style="position:relative;"> -->
-                                        <input type="text" class="form-control" id="policy" placeholder="Enter policy no">
-                                        <input type="hidden" name="policy_id" class="form-control" id="policy_id" placeholder="Enter policy no">
-                                        <div id="policy_suggestions" class="autocomplete-suggestions" style="display:none;"></div>
-                                    <!-- </div> -->
-                                </div>
+                                        <div class="form-group col-md-4">
+                                            <label for="customer">Customer document name</label>
+                                            <!-- <div style="position:relative;"> -->
+                                            <input type="text" name="cus_doc_name" class="form-control" id="cus_doc_name" placeholder="Enter customer doc name ">
+                                            <!-- </div> -->
+                                        </div>
+                                        <div class="form-group col-md-4"></div>
 
-                                 <div class="form-group col-md-3">
-                                    <label for="customer">Policy document name</label>
-                                    <!-- <div style="position:relative;"> -->
-                                        <input type="text" name="policy_doc_name" class="form-control" id="policy_doc_name" placeholder="Enter policy doc name ">
-                                    <!-- </div> -->
-                                </div>
+                                        <div class="form-group col-md-8" style="text-align: center; font-size: small;">
+                                            OR
+                                        </div>
+                                        <div class="form-group col-md-4"></div>
+
+                                        <div class="form-group col-md-4">
+                                            <label for="customer">Policy</label>
+                                            <!-- <div style="position:relative;"> -->
+                                            <input type="text" class="form-control" id="policy" placeholder="Enter policy no">
+                                            <input type="hidden" name="policy_id" class="form-control" id="policy_id" placeholder="Enter policy no">
+                                            <div id="policy_suggestions" class="autocomplete-suggestions" style="display:none;"></div>
+                                            <!-- </div> -->
+                                        </div>
+
+                                        <div class="form-group col-md-4">
+                                            <label for="customer">Policy document name</label>
+                                            <!-- <div style="position:relative;"> -->
+                                            <input type="text" name="policy_doc_name" class="form-control" id="policy_doc_name" placeholder="Enter policy doc name ">
+                                            <!-- </div> -->
+                                        </div>
+
+                                        <div class="form-group col-md-4 d-flex justify-content-end align-items-end">
+                                            <button type="button" class="btn app-btn-outline-secondary  mr-2" id="clear-filters">Clear</button>
+                                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="get-emp-list" onclick="fetchFileList(event);">Submit</button>
+                                            <!-- <input type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="get-emp-list" onclick="fetchFileList(event);" value="submit">                             -->
+                                        </div>
+
+                                    </div>
+                                </form>
                             </div>
-
-                            <div class="form-group text-right m-b-0">
-                                <button type="button" class="btn btn-secondary" id="clear-filters">Clear</button>
-                                <input type="submit" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchFileList(event);" value="submit">                            
-                            </div>
-                        </form>
                         </div>
                     </div>
                 </div>
-            </div>
 
+            </div>
         </div>
+
     </div>
 </div>
 
@@ -94,7 +105,8 @@
         <div class="card-body">
             <div class="row" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">File search result</h4>
+                    <h4 style="position: relative;">Files</h4>
+                    <!-- <h4 style="position: relative;">File search result</h4> -->
                 </div>
 
             </div>
@@ -102,17 +114,17 @@
             <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100">
                 <thead class="bg-light">
                     <tr>
-                        <th>S.No</th>
-                        <th>Doc name</th>
-                        <th>File name</th>
-                        <th>Action</th>
+                        <th>S.No&nbsp;</th>
+                        <th>Doc name&nbsp;</th>
+                        <th>File name&nbsp;</th>
+                        <th>Action&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php if (isset($files)) { ?>
                         <?php foreach($files as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1 ?></td>
+                            <td class="text-center"><?= $index + 1 ?></td>
                             <td><?php echo $row['doc_name']; ?></td>
                             <td><?php echo $row['file_name']; ?></td>
                             <td>
@@ -125,11 +137,13 @@
                                 </a>
                             </td>
 
-                        </tr>
+  
+
+                                </tr>
+                            <?php } ?>
                         <?php } ?>
-                    <?php } ?>
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
 
                 <div>
                 </div>
@@ -140,106 +154,124 @@
 
 
 <script>
- 
-$(document).ready(function() {
-    // $('#client_id').select2();
-    // $('#insurer_id').select2();
-    // $('#policy_type_id').select2();
-     const customer_suggestions = <?php echo json_encode($customers); ?>;
-     const policy_suggestions = <?php echo json_encode($policies); ?>;
-     showSuggestions('customer','customer_suggestions','customer_id',customer_suggestions);
-     showSuggestions('policy','policy_suggestions','policy_id',policy_suggestions);
+    $(document).ready(function() {
+        // $('#client_id').select2();
+        // $('#insurer_id').select2();
+        // $('#policy_type_id').select2();
+        const customer_suggestions = <?php echo json_encode($customers); ?>;
+        const policy_suggestions = <?php echo json_encode($policies); ?>;
+        showSuggestions('customer', 'customer_suggestions', 'customer_id', customer_suggestions);
+        showSuggestions('policy', 'policy_suggestions', 'policy_id', policy_suggestions);
 
-})
+    })
 
-// Datatable document ready
-$(document).ready(function() {
+    // Datatable document ready
+    $(document).ready(function() {
 
-var ticketsTable = $('#scroll-horizontal-datatable');
+        var ticketsTable = $('#scroll-horizontal-datatable');
 
-if (ticketsTable.length) {
-    ticketsTable.DataTable({
-        scrollX: true,
-        language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
-        paging: true, // Enable pagination
-        pageLength: 25, // Set default number of rows per page (optional)
-    });
-} else {
-    console.error("Table not found.");
-}
-});
-
-function showSuggestions(inputID, suggestionBoxID,hiddenInputID,suggestions) {
-   
-    // console.log('showSuggestions');
-    // console.log(suggestions);return;
-    const input = document.getElementById(inputID);
-    const suggestionBox = document.getElementById(suggestionBoxID);
-    const hiddenInput = document.getElementById(hiddenInputID);
-
-    input.addEventListener('input', function() {
-        const value = this.value.toLowerCase();
-        suggestionBox.innerHTML = ''; // Clear previous suggestions
-
-        if (value) {
-            const filteredSuggestions = suggestions.filter(item =>
-                item.display_value.toLowerCase().includes(value)
-            );
-            // console.log(filteredSuggestions);
-            filteredSuggestions.forEach(suggestion => {
-                const suggestionItem = document.createElement('div');
-                suggestionItem.textContent = suggestion.display_value;
-                suggestionItem.classList.add('autocomplete-suggestion');
-
-                suggestionItem.addEventListener('click', function() {
-                    input.value = suggestion.display_value;  // Display value in input
-                    hiddenInput.value = suggestion.id;        // Store id in hidden input
-                    suggestionBox.innerHTML = '';             // Clear suggestions after selecting
-                    suggestionBox.style.display = 'none';
-                });
-
-                suggestionBox.appendChild(suggestionItem);
-                suggestionBox.style.display = 'block';
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" +
+                    "<'row'<'col-sm-12'tr>>" +
+                    "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+                buttons: [{
+                    extend: 'collection',
+                    text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                    className: 'btn app-btn-secondary ',
+                    buttons: [{
+                            extend: 'csv',
+                            text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                            className: 'app-btn-primary ',
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                            exportOptions: {
+                                orthogonal: 'sort'
+                            },
+                            className: 'app-btn-primary ',
+                        }
+                    ]
+                }],
+                paging: true,
+                pageLength: 10,
+                order: [
+                    [0, 'desc']
+                ]
             });
+        } else {
+            console.error("Table not found.");
         }
     });
-}
 
+    function showSuggestions(inputID, suggestionBoxID, hiddenInputID, suggestions) {
 
-function fetchFileList(event)
-{
-    event.preventDefault();
+        // console.log('showSuggestions');
+        // console.log(suggestions);return;
+        const input = document.getElementById(inputID);
+        const suggestionBox = document.getElementById(suggestionBoxID);
+        const hiddenInput = document.getElementById(hiddenInputID);
 
-    var customer = document.getElementById('customer').value;
-    var customer_id = document.getElementById('customer_id').value;
-    var policy = document.getElementById('policy').value;
-    var policy_id = document.getElementById('policy_id').value;
-    var cus_doc_name = document.getElementById('cus_doc_name').value;
-    var policy_doc_name = document.getElementById('policy_doc_name').value;
+        input.addEventListener('input', function() {
+            const value = this.value.toLowerCase();
+            suggestionBox.innerHTML = ''; // Clear previous suggestions
 
-    if(customer == '' && cus_doc_name != '')
-    {
-        alert('choose customer');return false;
+            if (value) {
+                const filteredSuggestions = suggestions.filter(item =>
+                    item.display_value.toLowerCase().includes(value)
+                );
+                // console.log(filteredSuggestions);
+                filteredSuggestions.forEach(suggestion => {
+                    const suggestionItem = document.createElement('div');
+                    suggestionItem.textContent = suggestion.display_value;
+                    suggestionItem.classList.add('autocomplete-suggestion');
+
+                    suggestionItem.addEventListener('click', function() {
+                        input.value = suggestion.display_value; // Display value in input
+                        hiddenInput.value = suggestion.id; // Store id in hidden input
+                        suggestionBox.innerHTML = ''; // Clear suggestions after selecting
+                        suggestionBox.style.display = 'none';
+                    });
+
+                    suggestionBox.appendChild(suggestionItem);
+                    suggestionBox.style.display = 'block';
+                });
+            }
+        });
     }
 
-    if(policy == '' && policy_doc_name != '')
-    {
-        alert('choose policy');return false;
+
+    function fetchFileList(event) {
+        event.preventDefault();
+
+        var customer = document.getElementById('customer').value;
+        var customer_id = document.getElementById('customer_id').value;
+        var policy = document.getElementById('policy').value;
+        var policy_id = document.getElementById('policy_id').value;
+        var cus_doc_name = document.getElementById('cus_doc_name').value;
+        var policy_doc_name = document.getElementById('policy_doc_name').value;
+
+        if (policy == '' && customer == '') {
+            alert('choose customer or policy');
+            return false;
+        }
+
+        if (customer == '' && cus_doc_name != '') {
+            alert('choose customer');
+            return false;
+        }
+
+        if (policy == '' && policy_doc_name != '') {
+            alert('choose policy');
+            return false;
+        }
+
+
+        console.log('called');
+        let customEvent = new CustomEvent('fetchFileListCustomEvent');
+        $('#dms_search_form').submit();
+
     }
-
-    if(policy == '' && customer == '')
-    {
-        alert('choose customer or policy');return false;
-    }
-    console.log('called');
-    let customEvent = new CustomEvent('fetchFileListCustomEvent');
-    $('#dms_search_form').submit();
-
-}
-
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/drive_file_upload.php b/app/Views/drive_file_upload.php
index 275b5c6f..db20f6d4 100644
--- a/app/Views/drive_file_upload.php
+++ b/app/Views/drive_file_upload.php
@@ -36,7 +36,8 @@
         </div>
     </div>
 
-    <div id="file_table" class="card">
+    <div id="collapseOne">
+     <div id="file_table" class="card">
         <div class="card-body">
             <div class="row" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
@@ -45,13 +46,13 @@
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="second-table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Docs Name</th>
-                            <th>File Name</th>
-                            <th>Action</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Docs Name&nbsp;</th>
+                            <th>File Name&nbsp;</th>
+                            <th>Action&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody id="table_bd">
@@ -62,6 +63,7 @@
             </div>
         </div><!-- end col -->
     </div>
+    </div>
 </div>
 
 
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index d4507c26..a3948cce 100755
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -92,33 +92,33 @@
                 <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">SNO</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
 
                             <?php if (isset($getData)) { 
                                 if ($getData['client_id'] == '0' && $getData['policy_id'] == '0' && $getData['branch_id'] == '0' && ($getData['emp_code'] != "" || $getData['emp_name'] != "" || $getData['status'] != "")) { ?>
-                                    <th class="font-weight-medium">Client/Branch</th>
+                                    <th class="font-weight-medium">Client/Branch&nbsp;</th>
                             <?php } 
                                 if ($getData['client_id'] != '0' && $getData['branch_id'] == '0') { ?>
-                                    <th class="font-weight-medium">Branch</th>
+                                    <th class="font-weight-medium">Branch&nbsp;</th>
                             <?php } } ?>
 
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">EMP Code</th>
-                            <th class="font-weight-medium">Relationship</th>
-                            <th class="font-weight-medium">Gender</th>
-                            <th class="font-weight-medium">Email</th>
-                            <th class="font-weight-medium">Mobile</th>
-                            <th class="font-weight-medium">Date of Birth</th>
-                            <th class="font-weight-medium">Policy name</th>
-                            <th class="font-weight-medium">Insurer name</th>
-                            <th class="font-weight-medium">TPA ID</th>
-                            <th class="font-weight-medium">Risk ID</th>
-                            <th class="font-weight-medium">Policy status</th>
-                            <th class="font-weight-medium">(₹)Sum Insured</th>
-                            <th class="font-weight-medium">(₹)Premium</th>
-                            <th class="font-weight-medium" id="rata_premium" data-toggle="tooltip" data-placement="top">(₹)Pro Rata <br> Premium</th>
-                            <th class="font-weight-medium" id="gst" data-toggle="tooltip" data-placement="top">(₹)GST</th>
-                            <th class="font-weight-medium" > Action </th>
+                            <th class="font-weight-medium">Name&nbsp;</th>
+                            <th class="font-weight-medium">EMP Code&nbsp;</th>
+                            <th class="font-weight-medium">Relationship&nbsp;</th>
+                            <th class="font-weight-medium">Gender&nbsp;</th>
+                            <th class="font-weight-medium">Email&nbsp;</th>
+                            <th class="font-weight-medium">Mobile&nbsp;</th>
+                            <th class="font-weight-medium">Date of Birth&nbsp;</th>
+                            <th class="font-weight-medium">Policy name&nbsp;</th>
+                            <th class="font-weight-medium">Insurer name&nbsp;</th>
+                            <th class="font-weight-medium">TPA ID&nbsp;</th>
+                            <th class="font-weight-medium">Risk ID&nbsp;</th>
+                            <th class="font-weight-medium">Policy status&nbsp;</th>
+                            <th class="font-weight-medium">(₹)Sum Insured&nbsp;</th>
+                            <th class="font-weight-medium">(₹)Premium&nbsp;</th>
+                            <th class="font-weight-medium" id="rata_premium" data-toggle="tooltip" data-placement="top">(₹)Pro Rata <br> Premium&nbsp;</th>
+                            <th class="font-weight-medium" id="gst" data-toggle="tooltip" data-placement="top">(₹)GST&nbsp;</th>
+                            <th class="font-weight-medium" > Action &nbsp;</th>
                         </tr>
                     </thead>
 
@@ -129,7 +129,7 @@
                             $gst_total = 0;
                             foreach ($employees as $key => $employee) { ?>
                                 <tr>
-                                    <td><b><?php echo ($key + 1); ?></b></td>
+                                    <td class="text-center"><b><?php echo ($key + 1); ?></b></td>
 
                                     <?php if (isset($getData)) { 
                                         if ($getData['client_id'] == '0' && $getData['policy_id'] == '0' && $getData['branch_id'] == '0' && ($getData['emp_code'] != "" || $getData['emp_name'] != "" || $getData['status'] != "")) { ?>
@@ -343,18 +343,34 @@
                 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-7'p>>", // Pagination at the bottom, without page length selector
-                buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Member-List',
-                },{
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Member-List',
-                }],
+                buttons: [
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Member-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Member-List',
+                                    }
+                        ]
+                    }
+                ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 25 // Set default number of rows per page (optional)
diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php
index af1cde66..45ad39a0 100755
--- a/app/Views/employee_list.php
+++ b/app/Views/employee_list.php
@@ -1,530 +1,501 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.select2-selection__choice {
-    background-color: #0a8794 !important; 
-    color: white !important;             
-    font-weight: bold;                   
-}
+    .select2-selection__choice {
+        background-color: #0a8794 !important;
+        color: white !important;
+        font-weight: bold;
+    }
 
-.select2-selection__choice__remove {
-    color: white !important;        
-    margin-right: 5px;
-}
+    .select2-selection__choice__remove {
+        color: white !important;
+        margin-right: 5px;
+    }
 
-.custom-dropdown-menu {
-    display: none;
-    position: absolute;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    border-radius: 0.25rem;
-    padding: 0.5rem 0;
-    min-width: 10rem;
-    z-index: 9999;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
+    .custom-dropdown-menu {
+        display: none;
+        position: absolute;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 0, 0, 0.15);
+        border-radius: 0.25rem;
+        padding: 0.5rem 0;
+        min-width: 10rem;
+        z-index: 9999;
+        box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    }
 
-.custom-dropdown-menu .dropdown-item {
-    display: block !important;
-    width: 100% !important;
-    padding: 0.5rem 1rem !important;
-    color: #212529 !important;
-    text-decoration: none !important;
-    background-color: transparent !important;
-}
-
-.custom-dropdown-menu .dropdown-item:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}   
-
- .row{
-    margin-right:20px !important;
-    margin-left:30px  !important;
- }
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        color: #212529 !important;
+        text-decoration: none !important;
+        background-color: transparent !important;
+    }
 
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 </style>
 
 <div class="row">
     <div class="col-xl-12">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h3 class="m-1">
-                    <span>Members</span>
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h3>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <!-- <div class="text-center"> -->
-                        <div class="form-row">
-                            <div class="form-group col-md-4">
-                                <label>Client</label> <br />
-                                <select class="form-control" id="clients">
-                                    <option value="0">Select</option>
-                                </select>
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                        <h4>
+                            Filter
+                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                aria-expanded="true">
+                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                        </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <!-- <div class="text-center"> -->
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <label>Client</label> <br />
+                                    <select class="form-control" id="clients">
+                                        <option value="0">Select</option>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Branch</label> <br />
+                                    <select name="branch_id" class="form-control" id="branch_id">
+                                        <option value="0">Select</option>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Policy</label> <br />
+                                    <select class="form-control" id="policies">
+                                        <option value="0">Select</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Status</label> <br />
+                                    <select class="form-control" name="status2[]" id="status2" multiple>
+                                        <option value="0">Select</option>
+                                        <?php foreach ($status as $key => $value) { ?>
+                                            <option value="<?= $key ?>"
+                                                <?php
+                                                if ((!isset($getData) || in_array('active', $getData['status'])) && $key == 'active') {
+                                                    echo 'selected';
+                                                }
+                                                ?>>
+                                                <?= $value ?>
+                                            </option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Employee Code</label> <br />
+                                    <input type="text" class="form-control" id="emp_code" name="emp_code" value="<?= isset($getData['emp_code']) && !empty($getData['emp_code']) ? $getData['emp_code'] : '' ?>">
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Employee Name</label> <br />
+                                    <input type="text" class="form-control" id="emp_name" name="emp_name" value="<?= isset($getData['emp_name']) && !empty($getData['emp_name']) ? $getData['emp_name'] : '' ?>">
+                                </div>
+
                             </div>
-
-
-                            <div class="form-group col-md-4">
-                                <label>Branch</label> <br />
-                                <select name="branch_id" class="form-control" id="branch_id">
-                                    <option value="0">Select</option>
-                                </select>
+                            <div class="row justify-content-end">
+                                <div class="col-auto">
+                                    <!-- <div id="categoryFilter_12"> -->
+                                    <a href="#" class="btn btn-primary waves-effect waves-light"
+                                        style="background-color: #F5FFFF; color:black; border:1px solid #00999E;"
+                                        onclick="sendManualEcard(this)">Send Ecard</a>
+                                    <!-- </div> -->
+                                </div>
+                                <div class="col-auto">
+                                    <a href="<?= base_url("employee/list"); ?>"
+                                        class="btn btn-primary waves-effect waves-light" id="get-emp-list"
+                                        onclick="fetchEmpolyeeList(event);">Submit</a>
+                                </div>
                             </div>
-
-                            
-                            <div class="form-group col-md-4">
-                                <label>Policy</label> <br />
-                                <select class="form-control" id="policies">
-                                    <option value="0">Select</option>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label>Status</label> <br />
-                                <select class="form-control" name="status2[]" id="status2" multiple>
-                                    <option value="0">Select</option>
-                                    <?php foreach($status as $key => $value) { ?>
-                                    <option value="<?= $key ?>"
-                                        <?php  
-                                           if ((!isset($getData) || in_array('active', $getData['status'])) && $key == 'active') {
-                                                echo 'selected';
-                                            }
-                                        ?>>
-                                        <?= $value ?>
-                                    </option>
-                                    <?php } ?>
-                                </select>
-                            </div>
-
-
-                            <div class="form-group col-md-4">
-                                <label>Employee Code</label> <br />
-                                <input type="text" class="form-control" id="emp_code" name="emp_code" value="<?= isset($getData['emp_code']) && !empty($getData['emp_code']) ? $getData['emp_code'] : '' ?>">
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label>Employee Name</label> <br />
-                                <input type="text" class="form-control" id="emp_name" name="emp_name" value="<?= isset($getData['emp_name']) && !empty($getData['emp_name']) ? $getData['emp_name'] : '' ?>">
-                            </div>
-
+                            <!-- </div> -->
                         </div>
-                        <div class="row justify-content-end">
-                             <div class="col-auto">
-                                <!-- <div id="categoryFilter_12"> -->
-                                    <a href="#" class="btn btn-primary waves-effect waves-light" 
-                                    style="background-color: #F5FFFF; color:black; border:1px solid #00999E;"
-                                    onclick="sendManualEcard(this)">Send Ecard</a>
-                                <!-- </div> -->
-                            </div>
-                            <div class="col-auto">
-                                <a href="<?= base_url("employee/list"); ?>"
-                                    class="btn btn-primary waves-effect waves-light" id="get-emp-list"
-                                    onclick="fetchEmpolyeeList(event);">Submit</a>
-                            </div>
-                        </div>
-                        <!-- </div> -->
                     </div>
                 </div>
             </div>
         </div>
+
     </div>
 </div>
 
 
 
-<?php // include('employee_data_list.php');?>
+<?php // include('employee_data_list.php');
+?>
 
 <div id="employee_table_list"></div>
 
 <!-- end row -->
 <div id="loader" class="loader" style="display:none;">SPINNER</div>
 <script>
-// document.addEventListener("DOMContentLoaded", function () {
-//     const table = document.getElementById("tickets-table");
-    
-//     // Create custom dropdown
-//     function createCustomDropdown(row) {
-//         // Get the original dropdown items
-//         const originalDropdown = row.querySelector('.dropdown-menu');
-//         if (!originalDropdown) return null;
-        
-//         // Create new dropdown with proper background and spacing
-//         const customDropdown = document.createElement('div');
-//         customDropdown.className = 'custom-dropdown-menu';
-        
-//         // Copy inner content while maintaining icon alignment
-//         customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-//         return customDropdown;
-//     }
+    // document.addEventListener("DOMContentLoaded", function () {
+    //     const table = document.getElementById("tickets-table");
 
-//     let activeDropdown = null;
+    //     // Create custom dropdown
+    //     function createCustomDropdown(row) {
+    //         // Get the original dropdown items
+    //         const originalDropdown = row.querySelector('.dropdown-menu');
+    //         if (!originalDropdown) return null;
 
-//     // Add click event listener to rows
-//     table.querySelectorAll("tbody tr").forEach(row => {
-//         const customDropdown = createCustomDropdown(row);
-//         if (!customDropdown) return;
-        
-//         document.body.appendChild(customDropdown);
+    //         // Create new dropdown with proper background and spacing
+    //         const customDropdown = document.createElement('div');
+    //         customDropdown.className = 'custom-dropdown-menu';
 
-//         row.addEventListener("click", function(event) {
-//             // Ignore clicks on the action column
-//             if (event.target.closest('td:last-child')) {
-//                 return;
-//             }
+    //         // Copy inner content while maintaining icon alignment
+    //         customDropdown.innerHTML = originalDropdown.innerHTML;
 
-//             // Hide any active dropdown
-//             if (activeDropdown) {
-//                 activeDropdown.style.display = 'none';
-//             }
+    //         return customDropdown;
+    //     }
 
-//             // Get click position
-//             const rect = event.target.getBoundingClientRect();
-            
-//             // Position the dropdown with some offset
-//             customDropdown.style.display = 'block';
-//             customDropdown.style.position = 'fixed';
-//             customDropdown.style.left = `${rect.left}px`;
-//             customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-//             // Set as active dropdown
-//             activeDropdown = customDropdown;
-            
-//             event.stopPropagation();
-//         });
+    //     let activeDropdown = null;
 
-//         // Preserve click handlers and add auto-close
-//         customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-//             item.addEventListener('click', function(e) {
-//                 const onclickAttr = this.getAttribute('onclick');
-//                 if (onclickAttr) {
-//                     eval(onclickAttr);
-//                 }
-                
-//                 const href = this.getAttribute('href');
-//                 if (href && href !== '#') {
-//                     window.location.href = href;
-//                 }
+    //     // Add click event listener to rows
+    //     table.querySelectorAll("tbody tr").forEach(row => {
+    //         const customDropdown = createCustomDropdown(row);
+    //         if (!customDropdown) return;
 
-//                 // Close the dropdown after handling the click
-//                 if (activeDropdown) {
-//                     activeDropdown.style.display = 'none';
-//                     activeDropdown = null;
-//                 }
-                
-//                 e.stopPropagation();
-//             });
-//         });
-//     });
+    //         document.body.appendChild(customDropdown);
 
-//     // Close dropdown when clicking outside
-//     document.addEventListener("click", function() {
-//         if (activeDropdown) {
-//             activeDropdown.style.display = 'none';
-//             activeDropdown = null;
-//         }
-//     });
-// });
+    //         row.addEventListener("click", function(event) {
+    //             // Ignore clicks on the action column
+    //             if (event.target.closest('td:last-child')) {
+    //                 return;
+    //             }
 
-// document.addEventListener("DOMContentLoaded", init);
+    //             // Hide any active dropdown
+    //             if (activeDropdown) {
+    //                 activeDropdown.style.display = 'none';
+    //             }
 
-function init() {
-    const table = document.getElementById("tickets-table");
-    let activeDropdown = null;
+    //             // Get click position
+    //             const rect = event.target.getBoundingClientRect();
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+    //             // Position the dropdown with some offset
+    //             customDropdown.style.display = 'block';
+    //             customDropdown.style.position = 'fixed';
+    //             customDropdown.style.left = `${rect.left}px`;
+    //             customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
 
-        row.addEventListener("click", function(event) {
-            handleRowClick(event, customDropdown);
-        });
+    //             // Set as active dropdown
+    //             activeDropdown = customDropdown;
 
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-                handleItemClick(e, item);
+    //             event.stopPropagation();
+    //         });
+
+    //         // Preserve click handlers and add auto-close
+    //         customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+    //             item.addEventListener('click', function(e) {
+    //                 const onclickAttr = this.getAttribute('onclick');
+    //                 if (onclickAttr) {
+    //                     eval(onclickAttr);
+    //                 }
+
+    //                 const href = this.getAttribute('href');
+    //                 if (href && href !== '#') {
+    //                     window.location.href = href;
+    //                 }
+
+    //                 // Close the dropdown after handling the click
+    //                 if (activeDropdown) {
+    //                     activeDropdown.style.display = 'none';
+    //                     activeDropdown = null;
+    //                 }
+
+    //                 e.stopPropagation();
+    //             });
+    //         });
+    //     });
+
+    //     // Close dropdown when clicking outside
+    //     document.addEventListener("click", function() {
+    //         if (activeDropdown) {
+    //             activeDropdown.style.display = 'none';
+    //             activeDropdown = null;
+    //         }
+    //     });
+    // });
+
+    // document.addEventListener("DOMContentLoaded", init);
+
+    function init() {
+        const table = document.getElementById("tickets-table");
+        let activeDropdown = null;
+
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
+
+            document.body.appendChild(customDropdown);
+
+            row.addEventListener("click", function(event) {
+                handleRowClick(event, customDropdown);
+            });
+
+            // Preserve click handlers and add auto-close
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    handleItemClick(e, item);
+                });
             });
         });
-    });
 
-    // Close dropdown when clicking outside
-    document.addEventListener("click", handleDocumentClick);
+        // Close dropdown when clicking outside
+        document.addEventListener("click", handleDocumentClick);
 
-    function createCustomDropdown(row) {
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Clone original dropdown items while moving onclick handlers to data attributes
-        const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        // Transfer onclick handlers to data attributes
-        customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
-            const originalItem = originalItems[index];
-            const originalOnclick = originalItem.getAttribute('onclick');
-            if (originalOnclick) {
-                item.setAttribute('data-onclick', originalOnclick);
-                item.removeAttribute('onclick');  // Remove original handler
+        function createCustomDropdown(row) {
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
+
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
+
+            // Clone original dropdown items while moving onclick handlers to data attributes
+            const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
+            customDropdown.innerHTML = originalDropdown.innerHTML;
+
+            // Transfer onclick handlers to data attributes
+            customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
+                const originalItem = originalItems[index];
+                const originalOnclick = originalItem.getAttribute('onclick');
+                if (originalOnclick) {
+                    item.setAttribute('data-onclick', originalOnclick);
+                    item.removeAttribute('onclick'); // Remove original handler
+                }
+            });
+
+            return customDropdown;
+        }
+
+        function handleRowClick(event, customDropdown) {
+            if (event.target.closest('td:last-child')) return;
+
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
             }
-        });
 
-        return customDropdown;
-    }
+            const rect = event.target.getBoundingClientRect();
+            customDropdown.style.display = 'block';
+            customDropdown.style.position = 'fixed';
+            customDropdown.style.left = `${rect.left}px`;
+            customDropdown.style.top = `${rect.bottom + 5}px`;
 
-    function handleRowClick(event, customDropdown) {
-        if (event.target.closest('td:last-child')) return;
-
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
+            activeDropdown = customDropdown;
+            event.stopPropagation();
         }
 
-        const rect = event.target.getBoundingClientRect();
-        customDropdown.style.display = 'block';
-        customDropdown.style.position = 'fixed';
-        customDropdown.style.left = `${rect.left}px`;
-        customDropdown.style.top = `${rect.bottom + 5}px`;
+        function handleItemClick(e, item) {
+            e.preventDefault();
 
-        activeDropdown = customDropdown;
-        event.stopPropagation();
-    }
+            // Execute the stored onclick handler
+            const onclickAttr = item.getAttribute('data-onclick');
+            if (onclickAttr) {
+                eval(onclickAttr);
+            }
 
-    function handleItemClick(e, item) {
-        e.preventDefault(); 
-        
-        // Execute the stored onclick handler
-        const onclickAttr = item.getAttribute('data-onclick');
-        if (onclickAttr) {
-            eval(onclickAttr);
-        }
-        
-        // Handle href navigation
-        const href = item.getAttribute('href');
-        if (href && href !== '#') {
-            window.location.href = href;
+            // Handle href navigation
+            const href = item.getAttribute('href');
+            if (href && href !== '#') {
+                window.location.href = href;
+            }
+
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+
+            e.stopPropagation();
         }
 
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
-        
-        e.stopPropagation();
-    }
-
-    function handleDocumentClick() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
+        function handleDocumentClick() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
         }
     }
-}
-
 </script>
 <script>
+    $(document).ready(function() {
+        // Initialize select2
+        $("#clients").select2();
+        $("#policies").select2();
+        $("#branch_id").select2();
 
-$(document).ready(function() {
-    // Initialize select2
-    $("#clients").select2();
-    $("#policies").select2();
-    $("#branch_id").select2();
+        $("#status2").select2({
+            placeholder: 'Select Status'
+        });
 
-    $("#status2").select2({
-        placeholder : 'Select Status'
+        $("textarea.select2-search__field").attr('rows', '1');
+        $("textarea.select2-search__field").css('resize', 'none');
+
+        // if ($('.select2-selection__arrow').length > 0) {
+        //     $('.select2-selection__arrow').removeClass('select2-selection__arrow').addClass('fa fa-chevron-down');
+        // }
     });
 
-    $("textarea.select2-search__field").attr('rows', '1');
-    $("textarea.select2-search__field").css('resize', 'none');
+    // Declare a global variable to store API response data
+    var clientPolicies = [];
+    var clientPoliciesWithBranch = {
+        policies: []
+    };
+    var client_id = '<?= isset($getData) ? $getData['client_id'] : '0' ?>';
+    var client_branch_id = '<?= isset($getData) ? $getData['branch_id'] : '0' ?>';
 
-    // if ($('.select2-selection__arrow').length > 0) {
-    //     $('.select2-selection__arrow').removeClass('select2-selection__arrow').addClass('fa fa-chevron-down');
-    // }
-});
+    var statusData = <?= json_encode(isset($getData['status']) ? $getData['status'] : []) ?>;
 
-// Declare a global variable to store API response data
-var clientPolicies = [];
-var clientPoliciesWithBranch = {
-    policies: []
-};
-var client_id = '<?= isset($getData) ? $getData['client_id'] : '0' ?>';
-var client_branch_id = '<?= isset($getData) ? $getData['branch_id'] : '0' ?>';
+    $(document).ready(function() {
+        // Loop through each item in statusData and set the option as selected.
+        statusData.forEach(function(status) {
+            $('#status2 option[value="' + status + '"]').prop('selected', true);
+        });
 
-var statusData = <?= json_encode(isset($getData['status']) ? $getData['status'] : []) ?>;
-
-$(document).ready(function() {
-    // Loop through each item in statusData and set the option as selected.
-    statusData.forEach(function(status) {
-        $('#status2 option[value="' + status + '"]').prop('selected', true);
+        // Refresh the select element (necessary if you are using a plugin like Select2).
+        $('#status2').trigger('change');
     });
 
-    // Refresh the select element (necessary if you are using a plugin like Select2).
-    $('#status2').trigger('change');
-});
 
+    $(document).ready(function() {
+        console.log("document loaded");
+        //fetchClientPolicies();
+    });
 
-$(document).ready(function() {
-    console.log("document loaded");
-    //fetchClientPolicies();
-});
+    $(window).on("load", function() {
+        console.log("window loaded");
+        fetchClientPolicies();
+    });
 
-$(window).on("load", function() {
-    console.log("window loaded");
-    fetchClientPolicies();
-});
+    function fetchClientPolicies() {
+        $('#loader').show();
+        var apiURL = '<?php echo base_url(); ?>' + 'util/clients-with-policies';
+        console.log('fetchClientPolicies');
+        // console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'GET',
+            headers: {
+                "Content-Type": "application/json",
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            success: function(response) {
+                // console.log(response.code);
+                // console.log(response.dataStatus);
+                // console.log(response.data);
+                if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+                    try {
+                        clientPolicies = (response.data);
 
-function fetchClientPolicies() {
-    $('#loader').show();
-    var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies';
-    console.log('fetchClientPolicies');
-    // console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        headers: {
-            "Content-Type": "application/json",
-            "X-Requested-With": "XMLHttpRequest"
-        },
-        success: function(response) {
-            // console.log(response.code);
-            // console.log(response.dataStatus);
-            // console.log(response.data);
-            if (response.code === 200 && response.dataStatus === true && response.data !== "") {
-                try {
-                    clientPolicies = (response.data);
-
-                    response.data.forEach(policy => {
-                        // console.log('policies', policy.policies);
-                        policy.policies.forEach(p => {
-                            clientPoliciesWithBranch.policies.push(p);
+                        response.data.forEach(policy => {
+                            // console.log('policies', policy.policies);
+                            policy.policies.forEach(p => {
+                                clientPoliciesWithBranch.policies.push(p);
+                            });
                         });
-                    });
 
-                    // console.log('1',clientPolicies);
-                    appendClients(clientPolicies);
-                    
-                    //this function for reselect the policy
-                    setTimeout(function() {
-                        if (client_id != 0 ) {
-                            var foundPolicies = clientPolicies.find(function(item) {
-                                // console.log(typeof item.id)
-                                return item.id == client_id;
-                            });
-                            appendBranch(foundPolicies.branchs);
-                        }
-                    }, 500); 
-                    
-                    setTimeout(function() {
-                        if (client_branch_id != 0 ) {
+                        // console.log('1',clientPolicies);
+                        appendClients(clientPolicies);
 
-                            var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
-                                // console.log('item', item);
-                                return item.branch_id === client_branch_id;
-                            });
-
-                            if (foundPolicies) {
-                                // console.log('foundPolicies', foundPolicies);
-                                appendPolicies(foundPolicies);
-                            } else {
-                                console.log('No policies found for the selected client');
+                        //this function for reselect the policy
+                        setTimeout(function() {
+                            if (client_id != 0) {
+                                var foundPolicies = clientPolicies.find(function(item) {
+                                    // console.log(typeof item.id)
+                                    return item.id == client_id;
+                                });
+                                appendBranch(foundPolicies.branchs);
                             }
-                        }
-                    }, 500);
-                    //end
+                        }, 500);
 
-                } catch (error) {
-                    console.error('Error parsing API response data:', error);
+                        setTimeout(function() {
+                            if (client_branch_id != 0) {
+
+                                var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+                                    // console.log('item', item);
+                                    return item.branch_id === client_branch_id;
+                                });
+
+                                if (foundPolicies) {
+                                    // console.log('foundPolicies', foundPolicies);
+                                    appendPolicies(foundPolicies);
+                                } else {
+                                    console.log('No policies found for the selected client');
+                                }
+                            }
+                        }, 500);
+                        //end
+
+                    } catch (error) {
+                        console.error('Error parsing API response data:', error);
+                    }
+                } else if (response.code === 404 && response.dataStatus === false) {
+                    console.error('no data found', response);
+                } else {
+                    console.error('Something went wrong!');
                 }
-            } else if (response.code === 404 && response.dataStatus === false) {
-                console.error('no data found', response);
-            } else {
-                console.error('Something went wrong!');
+            },
+            error: function(xhr, status, error) {
+                console.error('Error fetching data from API:', error);
             }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching data from API:', error);
-        }
-    });
-
-    $('#loader').hide();
-}
-
-function appendClients(data) {
-    var clientID = <?= isset($getData) ? $getData['client_id'] : '0' ?>;
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name
         });
-        if (clientID == item.id) {
-            option.attr('selected', true);
-        }
-        $('#clients').append(option);
-    });
-}
 
-function appendBranch(data) {
+        $('#loader').hide();
+    }
 
-    $('#branch_id').empty();
-    $('#branch_id').append($('<option>', {
-        value: '0',
-        text: 'Select'
-    }));
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name 
+    function appendClients(data) {
+        var clientID = <?= isset($getData) ? $getData['client_id'] : '0' ?>;
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name
+            });
+            if (clientID == item.id) {
+                option.attr('selected', true);
+            }
+            $('#clients').append(option);
         });
-        if (client_branch_id == item.id) {
-            option.attr('selected', true);
-        }
-        $('#branch_id').append(option);
-    });
-}
+    }
 
-function appendPolicies(data) {
+    function appendBranch(data) {
 
-    $('#policies').empty();
-    $('#policies').append($('<option>', {
-        value: '0',
-        text: 'Select'
-    }));
-
-    var PolicyID = <?= isset($getData) ? $getData['policy_id'] : '0'?>;
-    // console.log(PolicyID)
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.client_policy_id,
-            // text: `${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
-            text:`${item.policy_type ?? ''} - ${item.policy_no ?? ''}`        
+        $('#branch_id').empty();
+        $('#branch_id').append($('<option>', {
+            value: '0',
+            text: 'Select'
+        }));
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            if (client_branch_id == item.id) {
+                option.attr('selected', true);
+            }
+            $('#branch_id').append(option);
         });
-        if (PolicyID == item.client_policy_id) {
-            option.attr('selected', true);
-        }
-        $('#policies').append(option);
-    });
-}
+    }
 
-$(document).ready(function() {
-    
-    $('#clients').on('change', function() {
+    function appendPolicies(data) {
 
         $('#policies').empty();
         $('#policies').append($('<option>', {
@@ -532,191 +503,213 @@ $(document).ready(function() {
             text: 'Select'
         }));
 
-        var selectedClient = $(this).val();
-        // console.log('selectedClient', selectedClient);
-        // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
-
-        // Check if the selected option exists in apiData
-        var foundPolicies = clientPolicies.find(function(item) {
-            return item.id === selectedClient;
+        var PolicyID = <?= isset($getData) ? $getData['policy_id'] : '0' ?>;
+        // console.log(PolicyID)
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.client_policy_id,
+                // text: `${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
+                text: `${item.policy_type ?? ''} - ${item.policy_no ?? ''}`
+            });
+            if (PolicyID == item.client_policy_id) {
+                option.attr('selected', true);
+            }
+            $('#policies').append(option);
         });
-        // console.log(foundPolicies.branchs);
-        appendBranch(foundPolicies.branchs);
-    });
-});
-
-$(document).ready(function() {
-
-    $('#branch_id').on('change', function() {
-        
-        var selectedClient = $(this).val();
-
-        // console.log('selectedBranch', selectedClient);
-        // console.log('clientPolicies', clientPoliciesWithBranch);
-
-        var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
-            // console.log('item', item);
-            return item.branch_id === selectedClient;
-        });
-
-
-        if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
-
-            appendPolicies(foundPolicies);
-            toastr.warning('No policies found for the selected client branch.');
-
-        } else {
-
-            // console.log('foundPolicies', foundPolicies);
-            appendPolicies(foundPolicies);
-        }
-    });
-
-});
-
-// Function to convert object to query parameters
-function objectToQueryString(obj) {
-    return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-}
-
-function fetchEmpolyeeList(event = null) {
-
-    if(event){
-        event.preventDefault(); // Prevent default action
     }
 
-    var client_id = $('#clients').val();
-    var policy_id = $('#policies').val();
-    var status = $('#status2').val();
-    var branch_id = $('#branch_id').val();
-    var emp_code = $('#emp_code').val();
-    var emp_name = $('#emp_name').val();
+    $(document).ready(function() {
 
-    var statusArray = [];
-    $('#status2 option:selected').each(function() {
-        statusArray.push($(this).val());
+        $('#clients').on('change', function() {
+
+            $('#policies').empty();
+            $('#policies').append($('<option>', {
+                value: '0',
+                text: 'Select'
+            }));
+
+            var selectedClient = $(this).val();
+            // console.log('selectedClient', selectedClient);
+            // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
+
+            // Check if the selected option exists in apiData
+            var foundPolicies = clientPolicies.find(function(item) {
+                return item.id === selectedClient;
+            });
+            // console.log(foundPolicies.branchs);
+            appendBranch(foundPolicies.branchs);
+        });
     });
 
-    // console.log(client_id + '-' + policy_id);
-    // if (client_id == '0' || policy_id == '0') {
-    //     alert('Please select values in both dropdowns.');
-    //     return;
-    // }
+    $(document).ready(function() {
 
-    var queryParams = {
+        $('#branch_id').on('change', function() {
 
-        client_id: client_id,
-        policy_id: policy_id,
-        branch_id: branch_id,
-        emp_code : emp_code,
-        emp_name : emp_name,
-        status   : statusArray,
-    };
+            var selectedClient = $(this).val();
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-    // console.log(apiURL);
-    // window.location.href = apiURL;
+            // console.log('selectedBranch', selectedClient);
+            // console.log('clientPolicies', clientPoliciesWithBranch);
 
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+            var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+                // console.log('item', item);
+                return item.branch_id === selectedClient;
+            });
 
 
-    // var apiURL2 = $('#get-emp-list').attr('href'); // Get href attribute value
-    console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        data: queryParams,
-        success: function(response) {
-            if(response.status == true){
-                $('#employee_table_list').html(response.html);
+            if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
+
+                appendPolicies(foundPolicies);
+                toastr.warning('No policies found for the selected client branch.');
+
+            } else {
+
+                // console.log('foundPolicies', foundPolicies);
+                appendPolicies(foundPolicies);
+            }
+        });
+
+    });
+
+    // Function to convert object to query parameters
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
+
+    function fetchEmpolyeeList(event = null) {
+
+        if (event) {
+            event.preventDefault(); // Prevent default action
+        }
+
+        var client_id = $('#clients').val();
+        var policy_id = $('#policies').val();
+        var status = $('#status2').val();
+        var branch_id = $('#branch_id').val();
+        var emp_code = $('#emp_code').val();
+        var emp_name = $('#emp_name').val();
+
+        var statusArray = [];
+        $('#status2 option:selected').each(function() {
+            statusArray.push($(this).val());
+        });
+
+        // console.log(client_id + '-' + policy_id);
+        // if (client_id == '0' || policy_id == '0') {
+        //     alert('Please select values in both dropdowns.');
+        //     return;
+        // }
+
+        var queryParams = {
+
+            client_id: client_id,
+            policy_id: policy_id,
+            branch_id: branch_id,
+            emp_code: emp_code,
+            emp_name: emp_name,
+            status: statusArray,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        // console.log(apiURL);
+        // window.location.href = apiURL;
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+
+        // var apiURL2 = $('#get-emp-list').attr('href'); // Get href attribute value
+        console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'GET',
+            data: queryParams,
+            success: function(response) {
+                if (response.status == true) {
+                    $('#employee_table_list').html(response.html);
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    setTimeout(function() {
+                        init()
+                    }, 1000)
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error('Error:', error);
+                toastr.error('Failed to fetch Data', 'Error');
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
-                setTimeout(function(){
-                    init()
-                }, 1000)
             }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error:', error);
-            toastr.error('Failed to fetch Data','Error');
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-        }
-    });
-}
-
-
-document.getElementById('toggleIcon').addEventListener('click', function() {
-    var icon = document.getElementById('icon');
-    icon.classList.toggle('mdi-chevron-down');
-    icon.classList.toggle('mdi-chevron-up');
-});
-
-
-function sendManualEcard(input)
-{
-    console.log('sendManualEcard function called');
-
-    var client_id = $('#clients').val()
-    var client_branch_id = $('#branch_id').val()
-    var policy_id = $('#policies').val()
-
-    console.log('input', input);
-    console.log('client_id', client_id);
-    console.log('client_branch_id', client_branch_id);
-
-    if(client_id == 0 || client_branch_id == 0 || policy_id == 0)
-    {   
-        Swal.fire({
-            title: "warning!",
-            text: 'Please select the Client, Client Branch and Policy.',
-            icon: "warning"
         });
-
-        return false
     }
 
-    Swal.fire({
-      title: "Do you want to send Ecard Mail?",
-      showDenyButton: true,
-      showCancelButton: false,
-      confirmButtonText: "Yes,Send",
-      denyButtonText: "Don't Send"
-    }).then((result) => {
 
-      if (result.isConfirmed) {
-
-             $.ajax({
-                url: '<?= base_url("util/send_manual_ecard/") ?>' + client_id + '/' + client_branch_id+'/'+policy_id,
-                type: "GET",
-                dataType: 'json',
-                success: function(res) {
-
-                    console.log('send_manual_ecard', res)
-
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-
-                    if(res.status == false){
-                        toastr.info(res.message, 'INFO');
-                    }else{
-                        toastr.success(res.message, 'SUCCESS');
-                    }
-
-                },
-                error: function(xhr, status, error) {
-                    console.error(xhr.responseText);
-                    console.error(status, error);
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                }
-            });
-            // Swal.fire("Saved!", "", "success");
-      }
+    document.getElementById('toggleIcon').addEventListener('click', function() {
+        var icon = document.getElementById('icon');
+        icon.classList.toggle('mdi-chevron-down');
+        icon.classList.toggle('mdi-chevron-up');
     });
 
-}
 
-</script>
+    function sendManualEcard(input) {
+        console.log('sendManualEcard function called');
+
+        var client_id = $('#clients').val()
+        var client_branch_id = $('#branch_id').val()
+        var policy_id = $('#policies').val()
+
+        console.log('input', input);
+        console.log('client_id', client_id);
+        console.log('client_branch_id', client_branch_id);
+
+        if (client_id == 0 || client_branch_id == 0 || policy_id == 0) {
+            Swal.fire({
+                title: "warning!",
+                text: 'Please select the Client, Client Branch and Policy.',
+                icon: "warning"
+            });
+
+            return false
+        }
+
+        Swal.fire({
+            title: "Do you want to send Ecard Mail?",
+            showDenyButton: true,
+            showCancelButton: false,
+            confirmButtonText: "Yes,Send",
+            denyButtonText: "Don't Send"
+        }).then((result) => {
+
+            if (result.isConfirmed) {
+
+                $.ajax({
+                    url: '<?= base_url("util/send_manual_ecard/") ?>' + client_id + '/' + client_branch_id + '/' + policy_id,
+                    type: "GET",
+                    dataType: 'json',
+                    success: function(res) {
+
+                        console.log('send_manual_ecard', res)
+
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+
+                        if (res.status == false) {
+                            toastr.info(res.message, 'INFO');
+                        } else {
+                            toastr.success(res.message, 'SUCCESS');
+                        }
+
+                    },
+                    error: function(xhr, status, error) {
+                        console.error(xhr.responseText);
+                        console.error(status, error);
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                    }
+                });
+                // Swal.fire("Saved!", "", "success");
+            }
+        });
+
+    }
+</script>
\ No newline at end of file
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index 09fb7637..00718a37 100755
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -11,12 +11,23 @@ option:disabled {
         <div class="col-xl-12">
             <div id="accordion1" class="mb-3">
                 <div class="card mb-1">
-                    <h5 class="m-1">
+
+                    <h4 class="m-1">
+                        <span>Filters</span>
                         <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
                             aria-expanded="true">
                             <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
                         </a>
-                    </h5>
+                    </h4>
+
+                    <!-- <label id="filterAccordion" class="m-1 d-flex justify-content-between align-items-center">    
+                            <span class="font-color-black">Filters</span>
+                            <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
+                                aria-expanded="true">
+                                <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                    </label> -->
+
                     <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion1">
                         <div class="card-body">
                             <!-- <div class="text-center"> -->
@@ -86,7 +97,7 @@ option:disabled {
                                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  
 
                                                 <button id="emp_form_submit_button" type="submit"
-                                                        class=" nav-link-btn px-3 py-1 btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
+                                                        class=" nav-link-btn px-3 py-2 btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
 
                                                 &nbsp;&nbsp;
 
@@ -94,7 +105,7 @@ option:disabled {
 
                                                 &nbsp;&nbsp;
 
-                                                <a class=" nav-link-btn px-3 py-1  btn btn-primary waves-effect waves-light justify-content-end"
+                                                <a class=" nav-link-btn px-3 py-2  btn btn-primary waves-effect waves-light justify-content-end"
                                                 id="fetch_enrolled_data" data-toggle="modal"
                                                 data-target="#full-width-modal" title="Download Sample Excel">Fetch
                                                 Enrolled Data</a>
diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php
index 3a4b4f93..cacfab96 100755
--- a/app/Views/endorsement_list.php
+++ b/app/Views/endorsement_list.php
@@ -14,66 +14,70 @@
     }
 </style>
 
-<div class="container-fluid">
-    <h2>Endorsement</h2>
+<div class="container-fluid-min">
     <div class="row">
         <div class="col-xl-12">
-            <div id="accordion" class="mb-3">
-                <div class="card mb-1">
-                    <h5 class="m-1">
-                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
-                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                        </a>
-                    </h5>
-                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                        <div class="card-body">
-                            <!-- <div class="text-center"> -->
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <label>Client</label> <br />
-                                    <select class="form-control" id="clients">
-                                        <option value="0">Select</option>
-                                    </select>
+            <div class="card-body">
+                <div id="accordion" class="mb-3">
+                    <div class="card mb-1">
+                        <h4>
+                            Filter
+                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                aria-expanded="true">
+                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                        </h4>
+                        <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                            <div class="card-body">
+                                <!-- <div class="text-center"> -->
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <label>Client</label> <br />
+                                        <select class="form-control" id="clients">
+                                            <option value="0">Select</option>
+                                        </select>
+                                    </div>
+
+
+                                    <div class="form-group col-md-4">
+                                        <label>Branch</label> <br />
+                                        <select name="branch_id" class="form-control" id="branch_id">
+                                            <option value="0">Select</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label>Policy</label> <br />
+                                        <select class="form-control" id="policies">
+                                            <option value="0">Select</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label>Status</label> <br />
+                                        <select class="form-control" id="status1">
+                                            <option value="0">Select</option>
+                                            <?php foreach ($status as $key => $value) { ?>
+                                                <option value="<?= $key ?>" <?= (isset($getData) && $getData['status'] == $key) ? 'selected' : '' ?>>
+                                                    <?= $value ?>
+                                                </option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+
                                 </div>
-
-
-                                <div class="form-group col-md-4">
-                                    <label>Branch</label> <br />
-                                    <select name="branch_id" class="form-control" id="branch_id">
-                                        <option value="0">Select</option>
-                                    </select>
+                                <div class="row">
+                                    <div class="col-12" style="text-align: right;">
+                                        <a href="<?= base_url("employee/endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
+                                    </div>
                                 </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Policy</label> <br />
-                                    <select class="form-control" id="policies">
-                                        <option value="0">Select</option>
-                                    </select>
-                                </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Status</label> <br />
-                                    <select class="form-control" id="status1">
-                                        <option value="0">Select</option>
-                                        <?php foreach ($status as $key => $value) { ?>
-                                            <option value="<?= $key ?>" <?= (isset($getData) && $getData['status'] == $key) ? 'selected' : '' ?>>
-                                                <?= $value ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-
+                                <!-- </div> -->
                             </div>
-                            <div class="row">
-                                <div class="col-12" style="text-align: right;">
-                                    <a href="<?= base_url("employee/endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
-                                </div>
-                            </div>
-                            <!-- </div> -->
                         </div>
                     </div>
                 </div>
             </div>
+
         </div>
     </div>
 
@@ -90,7 +94,7 @@
                     <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
                         <thead class="bg-light">
                             <tr>
-                                <th class="font-weight-medium">SNO</th>
+                                <th class="font-weight-medium">S.No&nbsp;</th>
                                 <th class="font-weight-medium">Name/code</th>
                                 <th class="font-weight-medium">Policy name</th>
                                 <th class="font-weight-medium">Endorsement ID</th>
@@ -108,7 +112,7 @@
                                 foreach ($employees as $key => $employee) { ?>
 
                                     <tr>
-                                        <td><b><?php echo ($key + 1) ?></b></td>
+                                        <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
                                         <td><?php echo $employee['name'] ?>( <?php echo $employee['emp_code'] ?> )</td>
                                         <!-- <td><?php echo isset($employee['policy_name']) ? $employee['policy_name'] : '' ?> - <?php echo isset($employee['policy_no']) ? $employee['policy_no'] : '' ?> - <?php echo isset($employee['policy_type']) ? $employee['policy_type'] : '' ?></td> -->
                                         <td><?php echo isset($employee['policy_type']) ?  $employee['policy_type'] : '' ?> - <?php echo isset($employee['policy_no']) ? $employee['policy_no'] : '' ?></td>
@@ -332,7 +336,7 @@
             var option = $('<option>', {
                 value: item.client_policy_id,
                 // text: `${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
-                text:`${item.policy_type ?? ''} - ${item.policy_no ?? ''}`
+                text: `${item.policy_type ?? ''} - ${item.policy_no ?? ''}`
             });
             if (PolicyID == item.client_policy_id) {
                 option.attr('selected', true);
@@ -386,7 +390,7 @@
                 toastr.warning('No policies found for the selected client branch.');
 
             } else {
-                
+
                 // console.log('foundPolicies', foundPolicies);
                 appendPolicies(foundPolicies);
             }
@@ -590,27 +594,54 @@
     $(document).ready(function() {
 
         $('#tickets-table').DataTable({
-            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-7'p>>",
             buttons: [{
-                extend: 'csv',
-                text: 'CSV',
-                title: 'Endorsement-List',
-                className: 'my_class',
-                exportOptions: {
-                    columns: ':not(:last-child)',
-                    format: {
-                        body: function (data, row, column, node) {
-                            // Convert data to string to avoid scientific notation in CSV
-                            if (!isNaN(data) && parseFloat(data) > 1e20) {
-                                return `'${data}`;
-                            }
-                            return data.toString();// Ensures all data is treated as strings
-                        }
+                    text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                    className: 'btn app-btn-primary  mr-2',
+                    action: function(e, dt, node, config) {
+                        openTicket();
                     }
+                },
+                {
+                    extend: 'collection',
+                    text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                    className: 'btn app-btn-secondary ',
+                    buttons: [{
+                            extend: 'csv',
+                            text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                            className: 'app-btn-primary ',
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                            exportOptions: {
+                                orthogonal: 'sort'
+                            },
+                            className: 'app-btn-primary ',
+                        }
+                    ]
                 }
-            }],
+            ],
+            // buttons: [{
+            //     extend: 'csv',
+            //     text: 'CSV',
+            //     title: 'Endorsement-List',
+            //     className: 'my_class',
+            //     exportOptions: {
+            //         columns: ':not(:last-child)',
+            //         format: {
+            //             body: function (data, row, column, node) {
+            //                 // Convert data to string to avoid scientific notation in CSV
+            //                 if (!isNaN(data) && parseFloat(data) > 1e20) {
+            //                     return `'${data}`;
+            //                 }
+            //                 return data.toString();// Ensures all data is treated as strings
+            //             }
+            //         }
+            //     }
+            // }],
             initComplete: function(settings, json) {
                 $('.my_class').css({
                     "position": "relative",
@@ -618,13 +649,19 @@
                 });
             },
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                searchPlaceholder: "Search"
             },
             paging: true,
             // pagingType: 'full_numbers'
-            columnDefs: [
-                { type: 'scientific', targets: 0 } // Apply custom sorting type to the first column
+            columnDefs: [{
+                    type: 'scientific',
+                    targets: 0
+                } // Apply custom sorting type to the first column
             ],
         });
 
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index b0839a80..bc968cd6 100755
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -21,7 +21,7 @@
     }
 
     #tickets-table_filter {
-    float: right;
+        float: right;
     }
 
     .click_hover {
@@ -31,212 +31,215 @@
         box-shadow: 6px 5px 8px 0 #00000036;
         cursor: pointer;
     }
-    .click_hover .text-muted{
+
+    .click_hover .text-muted {
         color: #fff !important;
     }
-    .click_hover span{
+
+    .click_hover span {
         color: #fff !important;
     }
+
     .card {
         border-radius: 10px;
     }
 
-    .row.visa_status_count_view .card-header{
-            background-color: #F5FFFF;
-            padding: 25px;
-            border: 2px solid #fff;
-            border-radius: 10px;
-            /* box-shadow: 2px 2px 2px; */
-            box-shadow: 0px 1px 1px 0px #00000040;
+    .row.visa_status_count_view .card-header {
+        background-color: #F5FFFF;
+        padding: 25px;
+        border: 2px solid #fff;
+        border-radius: 10px;
+        /* box-shadow: 2px 2px 2px; */
+        box-shadow: 0px 1px 1px 0px #00000040;
     }
 
-    .row.visa_status_count_view .card-header #categoryFilter_11 a{
+    .row.visa_status_count_view .card-header #categoryFilter_11 a {
         background-color: #D4F5F6 !important;
-        font-weight:800;
-        color:#000 !important;
-        border : 1px solid #D4F5F6 !important;
+        font-weight: 800;
+        color: #000 !important;
+        border: 1px solid #D4F5F6 !important;
         border-radius: 15px;
-        padding : 5px 10px;
+        padding: 5px 10px;
     }
 
-        #categoryFilter_12 a ,
-        #categoryFilter_13 a ,
-        #categoryFilter_14 a 
-        {
-            background-color: #00999E;
-            box-shadow: 0px 2px 4px 0px #00000040;
+    #categoryFilter_12 a,
+    #categoryFilter_13 a,
+    #categoryFilter_14 a {
+        background-color: #00999E;
+        box-shadow: 0px 2px 4px 0px #00000040;
 
-        }
+    }
 
-        #statusContent{
-            background-color: #F5FFFF;
-            border-radius: 10px;
-            box-shadow: 0px 1px 1px 0px #00000040;
-        }
+    #statusContent {
+        background-color: #F5FFFF;
+        border-radius: 10px;
+        box-shadow: 0px 1px 1px 0px #00000040;
+    }
 
-        #statusContent .statusContent-flex{
-            display:flex;
-            flex-flow: row wrap;
-        }
+    #statusContent .statusContent-flex {
+        display: flex;
+        flex-flow: row wrap;
+    }
 
-        .statusContent-flex .my-2{
-            color:black !important;
-        }
-
-        #statusContent .custom-card{
-            min-width:300px;
-            min-height: 50px;
-            padding:15px;
-            background-color: white;
-            color:black;
-            margin-right:15px;
-            margin-top :10px;
-            border-radius: 10px;
-            box-shadow: 0px 2px 4px 0px #00000024 !important;
-        }
+    .statusContent-flex .my-2 {
+        color: black !important;
+    }
 
+    #statusContent .custom-card {
+        min-width: 300px;
+        min-height: 50px;
+        padding: 15px;
+        background-color: white;
+        color: black;
+        margin-right: 15px;
+        margin-top: 10px;
+        border-radius: 10px;
+        box-shadow: 0px 2px 4px 0px #00000024 !important;
+    }
 </style>
 
 
-<div class="container-fluid">
-<h2>Enrollment</h2>
-<div class="row visa_status_count_view">
-    <div class="col-12">
-        <div class="card">
-            <div class="card-header">
-                <div class="row" >
-                    <div class="col-3">
-                        <div id="categoryFilter" >
-                            <label for="">Client</label>
-                            <select class="form-control" id="clients" onchange="populateBranches()">
-                                <option value="0">Select Client</option>
-                                <?php foreach ($client_list as $client) { ?>
-                                    <option value="<?= $client['id'] ?>"><?= $client['client_name'] ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div id="categoryFilter_11">
-                            <label for="">Branch</label>
-                            <select name="branch_id" class="form-control" id="branch_id" onchange="populatePolicies()">
-                                <option value="0">Select Branch</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div id="categoryFilter_14">
-                            <label for="">Policy</label>
-                            <select name="client_policy_id" class="form-control" id="client_policy_id">
-                                <option value="0">Select Policy</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div id="categoryFilter_11" >
-                            <a class="btn btn-primary waves-effect waves-light" 
-                            style="margin-top:30px !important"
-                            onclick="fetchEmpolyeeList(event);" 
-                            data-toggle="tooltip" data-placement="top" title="Search" 
-                            id="get-emp-list"><i class="mdi mdi-magnify" aria-hidden="true"></i></a>
-                        </div>
-                    </div>
-                    <div class="col-6" style="margin-right: 15px; margin-top:30px; ">
-                        <span id="categoryFilter_12" style="margin-right: 15px;">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)" data-toggle="tooltip" data-placement="top" title="Send Reminder"><span >Send Remainder</span></a>
-                        </span>
-  
-                        <span id="categoryFilter_13" style="margin-right: 15px;">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" data-toggle="tooltip" data-placement="top" title="Enrollment File Upload"><span >File Upload</span></a>
-                        </span>
-
-                        <button id="categoryFilter_14" type="button" class="btn btn-link visa_status_button" onclick="toggleContent()"  data-toggle="tooltip" data-placement="top" >
-                              <a class="btn btn-primary waves-effect waves-light"  data-toggle="tooltip" data-placement="top" title="View Status"><span >View Status</span></a>
-                        </button>
-                    </div>
-                </div>
-
-            </div>
-            <div class="card-body status-option" id="statusContent" >
-                <h4>Status</h4>
-                <div class="text-center">
-
-                    <div  style="margin-left: 60px; margin-top: 0px;">
-                        <div class="statusContent-flex">
-                            <div class="custom-card d-flex justify-content-between" id="emp_count_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Emp Count">Emp Count</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_count_view" >0</span>
-                                    </div>
-                            </div>
-                            <div class="custom-card d-flex justify-content-between" id="emp_enrolled_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Enrolled">Enroled</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_enrolled_view" >0</span>
-                                    </div>
-                            </div>
-                            <div class="custom-card d-flex justify-content-between" id="emp_not_enrolled_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Not Enrolled">Not Enroled</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_not_enrolled_view">0</span>
-                                    </div>
-                            </div>
-                            <div class="custom-card d-flex justify-content-between" id="emp_logged_in_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Logged-In">Logged-In</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_logged_in_view">0</span>
-                                    </div>
-                            </div>
-                            <div class="custom-card d-flex justify-content-between" id="emp_not_logged_in_view_click">
-                                    <div>
-                                        <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Not Logged-In">Not Logged-In</span>
-                                    </div>
-                                    <div>
-                                        <span class="my-2"><span data-plugin="counterup" id="emp_not_logged_in_view">0</span>
-                                    </div>
-                            </div>
-                        </div><!-- end col -->
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="row" id="client_list">
-    <div class="col-12">
-        <div class="card">
+<div class="container-fluid-min">
+    <div class="row visa_status_count_view">
+        <div class="col-12">
             <div class="card-body">
-                <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">SNO</th>
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">Emp Code</th>
-                            <th class="font-weight-medium">Relationship</th>
-                            <th class="font-weight-medium">Enroled</th>
-                            <th class="font-weight-medium">Logged-In</th>
-                        </tr>
-                    </thead>
-                    <tbody class="font-12">
-                        <!-- Table body -->
-                    </tbody>
-                </table>
+                <div class="card">
+                    <div class="card-header">
+                        <div class="row">
+                            <div class="col-3">
+                                <div id="categoryFilter">
+                                    <label for="">Client</label>
+                                    <select class="form-control" id="clients" onchange="populateBranches()">
+                                        <option value="0">Select Client</option>
+                                        <?php foreach ($client_list as $client) { ?>
+                                            <option value="<?= $client['id'] ?>"><?= $client['client_name'] ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div id="categoryFilter_11">
+                                    <label for="">Branch</label>
+                                    <select name="branch_id" class="form-control" id="branch_id" onchange="populatePolicies()">
+                                        <option value="0">Select Branch</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div id="categoryFilter_14">
+                                    <label for="">Policy</label>
+                                    <select name="client_policy_id" class="form-control" id="client_policy_id">
+                                        <option value="0">Select Policy</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div id="categoryFilter_11">
+                                    <a class="btn btn-primary waves-effect waves-light"
+                                        style="margin-top:30px !important"
+                                        onclick="fetchEmpolyeeList(event);"
+                                        data-toggle="tooltip" data-placement="top" title="Search"
+                                        id="get-emp-list"><i class="mdi mdi-magnify" aria-hidden="true"></i></a>
+                                </div>
+                            </div>
+                            <div class="col-6" style="margin-right: 15px; margin-top:30px; ">
+                                <span id="categoryFilter_12" style="margin-right: 15px;">
+                                    <a class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)" data-toggle="tooltip" data-placement="top" title="Send Reminder"><span>Send Remainder</span></a>
+                                </span>
+
+                                <span id="categoryFilter_13" style="margin-right: 15px;">
+                                    <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" data-toggle="tooltip" data-placement="top" title="Enrollment File Upload"><span>File Upload</span></a>
+                                </span>
+
+                                <button id="categoryFilter_14" type="button" class="btn btn-link visa_status_button" onclick="toggleContent()" data-toggle="tooltip" data-placement="top">
+                                    <a class="btn btn-primary waves-effect waves-light" data-toggle="tooltip" data-placement="top" title="View Status"><span>View Status</span></a>
+                                </button>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="card-body status-option" id="statusContent">
+                        <h4>Status</h4>
+                        <div class="text-center">
+
+                            <div style="margin-left: 60px; margin-top: 0px;">
+                                <div class="statusContent-flex">
+                                    <div class="custom-card d-flex justify-content-between" id="emp_count_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Emp Count">Emp Count</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_count_view">0</span>
+                                        </div>
+                                    </div>
+                                    <div class="custom-card d-flex justify-content-between" id="emp_enrolled_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Enrolled">Enroled</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_enrolled_view">0</span>
+                                        </div>
+                                    </div>
+                                    <div class="custom-card d-flex justify-content-between" id="emp_not_enrolled_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Not Enrolled">Not Enroled</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_not_enrolled_view">0</span>
+                                        </div>
+                                    </div>
+                                    <div class="custom-card d-flex justify-content-between" id="emp_logged_in_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Logged-In">Logged-In</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_logged_in_view">0</span>
+                                        </div>
+                                    </div>
+                                    <div class="custom-card d-flex justify-content-between" id="emp_not_logged_in_view_click">
+                                        <div>
+                                            <span class="text-muted font-weight-normal mt-0 text-truncate my-2" title="Not Logged-In">Not Logged-In</span>
+                                        </div>
+                                        <div>
+                                            <span class="my-2"><span data-plugin="counterup" id="emp_not_logged_in_view">0</span>
+                                        </div>
+                                    </div>
+                                </div><!-- end col -->
+                            </div>
+
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div class="row" id="client_list">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-body">
+                    <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
+                        <thead class="bg-light">
+                            <tr>
+                                <th class="font-weight-medium">S.No&nbsp;</th>
+                                <th class="font-weight-medium">Name</th>
+                                <th class="font-weight-medium">Emp Code</th>
+                                <th class="font-weight-medium">Relationship</th>
+                                <th class="font-weight-medium">Enroled</th>
+                                <th class="font-weight-medium">Logged-In</th>
+                            </tr>
+                        </thead>
+                        <tbody class="font-12">
+                            <!-- Table body -->
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </div>
     </div>
 </div>
-</div>
 
 <!-- Center modal content -->
 <div class="modal fade" id="upload_enrollment_model" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="false">
@@ -247,7 +250,7 @@
                 <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
-                <form class="parsley-examples" method="post" id="uploadForm" action="<?php echo base_url().'employee/upload'?>" enctype="multipart/form-data">
+                <form class="parsley-examples" method="post" id="uploadForm" action="<?php echo base_url() . 'employee/upload' ?>" enctype="multipart/form-data">
                     <input type="hidden" id="file_client_id" name="client_id">
                     <input type="hidden" id="file_branch_id" name="branch_id">
                     <input type="hidden" id="file_upload_actions" name="upload-action-type" value="enrollment">
@@ -256,7 +259,7 @@
                             <div class="form-group col-md-12">
                                 <label for="policy_id">Client Policy<span class="text-danger">*</span></label>
                                 <select class="form-control" id="policy_id" name="policy_id" required>
-                                    <option selected >Select Client Policy</option>
+                                    <option selected>Select Client Policy</option>
                                 </select>
                             </div>
                         </div>
@@ -278,9 +281,7 @@
 </div><!-- /.modal -->
 
 <script>
-
-    function populateBranches() 
-    {
+    function populateBranches() {
         var clientId = document.getElementById('clients').value;
         var branchDropdown = document.getElementById('branch_id');
 
@@ -302,8 +303,7 @@
         });
     }
 
-    function populatePolicies() 
-    {
+    function populatePolicies() {
         console.log('populatePolicies function called');
 
         var clientId = document.getElementById('clients').value;
@@ -334,19 +334,17 @@
         });
     }
 
-    function filterTable(columnIndex, filterValue) 
-    {
+    function filterTable(columnIndex, filterValue) {
         var table = $('#tickets-table').DataTable();
-        
+
         // Reset the search filter for all columns
         table.columns().search('').draw();
-        
+
         // Apply the filter to the specified column
         table.column(columnIndex).search(filterValue).draw();
     }
 
-    function fetchEmpolyeeList(event) 
-    {
+    function fetchEmpolyeeList(event) {
         event.preventDefault();
 
         var client_id = $('#clients').val();
@@ -372,7 +370,7 @@
                 $('.loader-mask').fadeIn();
             },
             success: function(response) {
-                
+
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
 
@@ -396,17 +394,17 @@
                 var loggedIn_count = 0;
                 data.forEach(function(employee, index) {
 
-                    if(employee.emp_status !== 'draft'){
+                    if (employee.emp_status !== 'draft') {
                         var enrolled = 'Yes';
                         enrolled_count++;
-                    }else{  
+                    } else {
                         var enrolled = 'No';
                     }
 
-                    if(employee.user_type === 'employee'){
+                    if (employee.user_type === 'employee') {
                         var loggedIn = 'Yes';
                         loggedIn_count++;
-                    }else{  
+                    } else {
                         var loggedIn = 'No';
                     }
 
@@ -433,7 +431,7 @@
                     var params = new URLSearchParams(window.location.search);
                     return params.get(name);
                 }
-           
+
             },
             error: function(xhr, status, error) {
                 console.error(xhr.responseText);
@@ -444,8 +442,7 @@
         });
     }
 
-    $(document).ready(function() 
-    {
+    $(document).ready(function() {
 
         function getUrlParameter(name) {
             var params = new URLSearchParams(window.location.search);
@@ -464,22 +461,24 @@
         if (branch_id) {
             setTimeout(function() { // Ensure branches are populated before setting branch ID
                 $('#branch_id').val(branch_id).trigger('change');
-                if($('#branch_id').val() != 0){
+                if ($('#branch_id').val() != 0) {
                     $('#get-emp-list').click().trigger();
                 }
             }, 500);
-            
+
         }
         if (history.pushState) {
             var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
-            window.history.pushState({path: newUrl}, '', newUrl);
+            window.history.pushState({
+                path: newUrl
+            }, '', newUrl);
         }
-        
+
         setTimeout(() => {
             // var type = getUrlParameter('type');
-                console.log("------------------------");
-                console.log(type);
-                $('#' + type).click().trigger();
+            console.log("------------------------");
+            console.log(type);
+            $('#' + type).click().trigger();
         }, 1000);
 
         $('#clients').select2();
@@ -488,39 +487,73 @@
         $('#client_policy_id').select2();
         var table = $('#tickets-table').DataTable({
             dom: 'fBrtip',
-            buttons: [
-                {
-                    extend: 'copy',
-                    text: '<i class="mdi mdi-content-copy"></i>',
-                    titleAttr: 'Copy',
-                    filename: 'Enrolment List'
-                },
-                {
-                    extend: 'print',
-                    text: '<i class="mdi mdi-printer"></i>',
-                    titleAttr: 'Print',
-                    filename: 'Enrolment List'
-                },
-                {
-                    extend: 'pdf',
-                    text: '<i class="mdi mdi-file-pdf"></i>',
-                    titleAttr: 'PDF',
-                    filename: 'Enrolment List'
-                },
-                {
-                    extend: 'csv',
-                    text: '<i class="mdi mdi-file-document"></i>',
-                    titleAttr: 'CSV',
-                    filename: 'Enrolment List'
-                }
-            ],
+            // buttons: [
+            //     {
+            //         extend: 'copy',
+            //         text: '<i class="mdi mdi-content-copy"></i>',
+            //         titleAttr: 'Copy',
+            //         filename: 'Enrolment List'
+            //     },
+            //     {
+            //         extend: 'print',
+            //         text: '<i class="mdi mdi-printer"></i>',
+            //         titleAttr: 'Print',
+            //         filename: 'Enrolment List'
+            //     },
+            //     {
+            //         extend: 'pdf',
+            //         text: '<i class="mdi mdi-file-pdf"></i>',
+            //         titleAttr: 'PDF',
+            //         filename: 'Enrolment List'
+            //     },
+            //     {
+            //         extend: 'csv',
+            //         text: '<i class="mdi mdi-file-document"></i>',
+            //         titleAttr: 'CSV',
+            //         filename: 'Enrolment List'
+            //     }
+            // ],
+            buttons: [{
+                extend: 'collection',
+                text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                className: 'btn app-btn-secondary ',
+                buttons: [{
+                        extend: 'copy',
+                        text: '<i class="mdi mdi-content-copy"></i>',
+                        titleAttr: 'Copy',
+                        filename: 'Enrolment List'
+                        className: 'app-btn-primary ',
+                    },
+                    {
+                        extend: 'csv',
+                        text: '<i class="mdi mdi-file-document"></i>',
+                        titleAttr: 'CSV',
+                        filename: 'Enrolment List'
+                        className: 'app-btn-primary ',
+                    },
+                    {
+                        extend: 'print',
+                        text: '<i class="mdi mdi-printer"></i>',
+                        titleAttr: 'Print',
+                        filename: 'Enrolment List'
+                        className: 'app-btn-primary ',
+                    },
+                    {
+                        extend: 'pdf',
+                        text: '<i class="mdi mdi-file-pdf"></i>',
+                        titleAttr: 'PDF',
+                        filename: 'Enrolment List'
+                        className: 'app-btn-primary ',
+                    }
+                ]
+            }],
             initComplete: function() {
                 // Add custom class to the print button
                 $('.buttons-print').addClass('buttons-html5');
             }
         });
 
-        
+
         $('#emp_enrolled_view_click').on('click', function() {
             if ($(this).hasClass('click_hover')) {
                 // $(this).removeClass('click_hover');
@@ -528,7 +561,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -544,7 +577,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -560,7 +593,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -576,7 +609,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -592,7 +625,7 @@
                     $(this).removeClass('click_hover');
                 });
                 table.columns().search('').draw(); // Clear all filters and show all data
-            }else{
+            } else {
                 $('.click_hover').each(function() {
                     $(this).removeClass('click_hover');
                 });
@@ -604,8 +637,7 @@
         toggleContent();
     });
 
-    function toggleContent() 
-    {
+    function toggleContent() {
         var content = document.getElementById("statusContent");
         var toggleIcon = document.getElementById("toggleIcon");
         if (content.style.display === "none") {
@@ -622,8 +654,7 @@
     //----------------------------------------------------------------------------------------------------
 
 
-    function uploadEnrollmentFile(input)
-    {  
+    function uploadEnrollmentFile(input) {
         console.log('uploadEnrollmentFile called');
 
         var client_id = $('#clients').val()
@@ -633,8 +664,8 @@
         console.log('client_id', client_id);
         console.log('client_branch_id', client_branch_id);
 
-        if(client_id == 0 && client_branch_id == 0){   
-            
+        if (client_id == 0 && client_branch_id == 0) {
+
             Swal.fire({
                 title: "warning!",
                 text: 'Please select the Client and Client Branch.',
@@ -679,8 +710,7 @@
 
     }
 
-    function appendpolicy(data)
-    {
+    function appendpolicy(data) {
 
         $('#policy_id').empty();
         $('#policy_id').append($('<option>', {
@@ -692,7 +722,7 @@
         $.each(data, function(index, item) {
             var option = $('<option>', {
                 value: item.id,
-                text:`${item.policy_name ?? ''} - ${item.policy_no ?? ''}`
+                text: `${item.policy_name ?? ''} - ${item.policy_no ?? ''}`
             });
             $('#policy_id').append(option);
         });
@@ -712,7 +742,7 @@
                 return;
             }
 
-            if(client_id == 0 && client_branch_id == 0){   
+            if (client_id == 0 && client_branch_id == 0) {
                 toastr.warning('Select Client and Client Branch');
                 return false;
             }
@@ -776,8 +806,7 @@
     });
 
 
-    function sendManualReminder(input)
-    {
+    function sendManualReminder(input) {
         console.log('sendManualReminder function called');
 
         var client_id = $('#clients').val()
@@ -816,44 +845,44 @@
             return false;
         }
 
-    Swal.fire({
-      title: "Do you want to send reminder mail?",
-      showDenyButton: true,
-      showCancelButton: false,
-      confirmButtonText: "Yes,Send",
-      denyButtonText: "Don't Send"
-    }).then((result) => {
+        Swal.fire({
+            title: "Do you want to send reminder mail?",
+            showDenyButton: true,
+            showCancelButton: false,
+            confirmButtonText: "Yes,Send",
+            denyButtonText: "Don't Send"
+        }).then((result) => {
 
-      if (result.isConfirmed) {
+            if (result.isConfirmed) {
 
-             $.ajax({
-                url: '<?= base_url("util/send_manual_reminder/") ?>' + client_id + '/' + client_branch_id + '/' + client_policy_id,
-                type: "GET",
-                dataType: 'json',
-                success: function(res) {
+                $.ajax({
+                    url: '<?= base_url("util/send_manual_reminder/") ?>' + client_id + '/' + client_branch_id + '/' + client_policy_id,
+                    type: "GET",
+                    dataType: 'json',
+                    success: function(res) {
 
-                    console.log('send_manual_reminder', res)
+                        console.log('send_manual_reminder', res)
 
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
 
-                    if(res.status == false){
-                        toastr.info(res.message, 'INFO');
-                    }else{
-                        toastr.success(res.message, 'SUCCESS');
+                        if (res.status == false) {
+                            toastr.info(res.message, 'INFO');
+                        } else {
+                            toastr.success(res.message, 'SUCCESS');
+                        }
+
+                    },
+                    error: function(xhr, status, error) {
+                        console.error(xhr.responseText);
+                        console.error(status, error);
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
                     }
-
-                },
-                error: function(xhr, status, error) {
-                    console.error(xhr.responseText);
-                    console.error(status, error);
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                }
-            });
-            // Swal.fire("Saved!", "", "success");
-          }
-    });
+                });
+                // Swal.fire("Saved!", "", "success");
+            }
+        });
 
     }
-</script>
+</script>
\ No newline at end of file
diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index bceb3554..0b401026 100755
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -19,19 +19,18 @@
                 </div>
 
             </div>
-            <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0"
-                id="tickets-table">
+            <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
                 <thead class="bg-light">
                     <tr>
-                        <th class="font-weight-medium">SNO</th>
-                        <th class="font-weight-medium">File name</th>
-                        <th class="font-weight-medium">Client</th>
-                        <th class="font-weight-medium">Client Branch</th>
-                        <th class="font-weight-medium">Policy</th>
-                        <th class="font-weight-medium">Event</th>
-                        <th class="font-weight-medium">User/Time</th>
-                        <th class="font-weight-medium">Status</th>
-                        <th class="font-weight-medium">Action</th>
+                        <th class="font-weight-medium">S.No&nbsp;</th>
+                        <th class="font-weight-medium">File name&nbsp;</th>
+                        <th class="font-weight-medium">Client&nbsp;</th>
+                        <th class="font-weight-medium">Client Branch&nbsp;</th>
+                        <th class="font-weight-medium">Policy&nbsp;</th>
+                        <th class="font-weight-medium">Event&nbsp;</th>
+                        <th class="font-weight-medium">User/Time&nbsp;</th>
+                        <th class="font-weight-medium">Status&nbsp;</th>
+                        <th class="font-weight-medium">Action&nbsp;</th>
                     </tr>
                 </thead>
 
@@ -45,7 +44,7 @@
                     ?>
 
                     <tr>
-                        <td><b><?php echo ($key + 1) ?></b></td>
+                        <td class="text-center"><b><?php echo ($key + 1) ?></b></td>
                         <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>
@@ -461,28 +460,57 @@ $('body').on('click', '.reload', function() {
 $(document).ready(function() {
 
     $('#tickets-table').DataTable({
-        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-7'p>>",
-        "buttons": [{
-            "extend": 'csv',
-            "text": 'CSV',
-            "title": 'Employee-Upload-List',
-            "className": 'my_class',
-            "exportOptions": {
-                "columns": ':not(:last-child)'
+        buttons: [{
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Employee-Upload-List',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
+            language: {
+                search: `
+                <div class="datatable-search-wrapper">
+                    _INPUT_
+                    <i class="mdi mdi-magnify datatable-search-icon"></i>
+                </div>`,
+                searchPlaceholder: "Search"
             },
-        }],
-        "initComplete": function(settings, json) {
-            $('.my_class').css({
-                "position": "relative",
-                "left": "79px"
-            });
-        },
-        language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
+        // "buttons": [{
+        //     "extend": 'csv',
+        //     "text": 'CSV',
+        //     "title": 'Employee-Upload-List',
+        //     "className": 'my_class',
+        //     "exportOptions": {
+        //         "columns": ':not(:last-child)'
+        //     },
+        // }],
+        // "initComplete": function(settings, json) {
+        //     $('.my_class').css({
+        //         "position": "relative",
+        //         "left": "79px"
+        //     });
+        // },
+        // language: {
+        //     search: "_INPUT_",
+        //     searchPlaceholder: "Search..."
+        // },
         paging: true,
     });
 
diff --git a/app/Views/finance_team_list.php b/app/Views/finance_team_list.php
index ffb991ea..0ec2aed9 100644
--- a/app/Views/finance_team_list.php
+++ b/app/Views/finance_team_list.php
@@ -1,59 +1,62 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.col-12 {
+    .col-12 {
 
-    max-width: 98% !important;
-}
+        max-width: 98% !important;
+    }
 
-.dataTables_filter {
-    position: absolute;
-}
-.custom-dropdown-menu {
-    display: none;
-    position: absolute;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    border-radius: 0.25rem;
-    padding: 0.5rem 0;
-    min-width: 10rem;
-    z-index: 9999;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.custom-dropdown-menu .dropdown-item {
-    display: block !important;
-    width: 100% !important;
-    padding: 0.5rem 1rem !important;
-    color: #212529 !important;
-    text-decoration: none !important;
-    background-color: transparent !important;
-}
+    .custom-dropdown-menu {
+        display: none;
+        position: absolute;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 0, 0, 0.15);
+        border-radius: 0.25rem;
+        padding: 0.5rem 0;
+        min-width: 10rem;
+        z-index: 9999;
+        box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    }
 
-.custom-dropdown-menu .dropdown-item:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}   
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        color: #212529 !important;
+        text-decoration: none !important;
+        background-color: transparent !important;
+    }
+
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 </style>
 
-<div class="row" id="finance_filter">
-    <div class="col-12" style="margin-top: -12px;">
+
+<div class="col-12" id="finance_filter">
+    <div class="card-body">
         <div id="accordion" class="mb-3">
             <div class="card mb-1">
-                <h5 class="m-1">
+                <h4 class="m-1">
+                    <span>Filter</span>
                     <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
                         aria-expanded="true">
                         <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
                     </a>
-                </h5>
+                </h4>
                 <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                     <div class="card-body">
                         <div class="form-group">
@@ -64,11 +67,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="client_id" name="client_id">
                                         <option value="0">Select Client</option>
                                         <?php
-                                            if (isset($clients) && count($clients)) {
-                                                foreach ($clients as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
-                                                }
+                                        if (isset($clients) && count($clients)) {
+                                            foreach ($clients as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -79,9 +82,9 @@ table.dataTable tbody td {
                                     <select class="form-control" id="insurer_id" name="insurer_id">
                                         <option value="0" selected>Select Insurer</option>
                                         <?php if (isset($insurer) && count($insurer)) { ?>
-                                        <?php foreach ($insurer as $value) { ?>
-                                        <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
+                                            <?php foreach ($insurer as $value) { ?>
+                                                <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                            <?php } ?>
                                         <?php } ?>
                                     </select>
                                 </div>
@@ -91,11 +94,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="policy_type_id" name="policy_type_id">
                                         <option value="0">Select Policy Type</option>
                                         <?php
-                                            if (isset($policy_types) && count($policy_types)) {
-                                                foreach ($policy_types as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
-                                                }
+                                        if (isset($policy_types) && count($policy_types)) {
+                                            foreach ($policy_types as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -105,11 +108,11 @@ table.dataTable tbody td {
                                     <select class="form-control" id="issuer" name="issuer" required>
                                         <option value="0">Select Issure</option>
                                         <?php
-                                            if (isset($issuer) && count($issuer)) {
-                                                foreach ($issuer as $key => $value) {
-                                                    echo "<option value=" . $key . ">" . $value . "</option>";
-                                                }
+                                        if (isset($issuer) && count($issuer)) {
+                                            foreach ($issuer as $key => $value) {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
@@ -124,35 +127,34 @@ table.dataTable tbody td {
                                         onchange="hideDateField()">
                                         <option value="0">Select Date Type</option>
                                         <?php
-                                            if (isset($date_type) && count($date_type)) {
-                                                foreach ($date_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
-                                                }
+                                        if (isset($date_type) && count($date_type)) {
+                                            foreach ($date_type as $key => $value) {
+                                                echo "<option value='" . $key . "'>" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div>
 
                                 <div class="form-group col-md-3" style="display: none;" id="date_div">
                                     <label>Date<span class="text-danger"></span></label>
-                                    <div id="reportrange" class="form-control"
-                                        style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                        <span></span> <i class="mdi mdi-menu-down"></i>
+                                    <div class="input-icon">
+                                        <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
                                 </div>
-
-                                <div class="form-group col-md-3 text-right m-b-0" style="margin-top: 29px;">
-                                    <a href="<?= base_url("/policy_tranction/report/report-finance-list"); ?>"
-                                        class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a href="<?= base_url("/policy_tranction/report/report-finance-list"); ?>"
-                                        class="btn btn-primary" id="get-emp-list"
-                                        onclick="fetchEmpolyeeList(event);">Submit</a>
-                                </div>
-
                             </div>
+                            <div class="form-group text-right m-b-0">
+                                <a href="<?= base_url("/policy_tranction/report/report-finance-list"); ?>"
+                                    class="btn btn-secondary" id="clear-filters">Clear</a>
+                                <a href="<?= base_url("/policy_tranction/report/report-finance-list"); ?>"
+                                    class="btn btn-primary" id="get-emp-list"
+                                    onclick="fetchEmpolyeeList(event);">Submit</a>
+                            </div>
+
+
 
                             <!-- <div class="form-group text-right m-b-0">
                                 <button type="button" class="btn btn-secondary" id="clear-filters">Clear</button>
@@ -182,48 +184,48 @@ table.dataTable tbody td {
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Client Name</th>
-                            <th>Insurer</th>
-                            <th>Policy</th>
-                            <th>Policy No</th>
-                            <th>Endorsement No</th>
-                            <th>Event Type</th>
-                            <th>Action</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Client Name&nbsp;</th>
+                            <th>Insurer&nbsp;</th>
+                            <th>Policy&nbsp;</th>
+                            <th>Policy No&nbsp;</th>
+                            <th>Endorsement No&nbsp;</th>
+                            <th>Event Type&nbsp;</th>
+                            <th>Action&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody>
                         <?php if (isset($finance_list)) { ?>
-                        <?php foreach($finance_list as $index => $row){ ?>
-                        <tr>
-                            <td><?= $index + 1 ?></td>
-                            <td><?php echo $row['client_name']; ?></td>
-                            <td><?php echo $row['insurer_name']; ?></td>
-                            <td><?php echo $row['policy_type']; ?></td>
-                            <td><?php echo $row['policy_no']; ?></td>
-                            <td><?php echo $row['endorsement_no']; ?></td>
-                            <td><?php echo $row['action_type_full']; ?></td>
-                            <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>
-                                    <div class="dropdown-menu dropdown-menu-right">
-                                        <a href="
-                                                <?php 
-                                                    if ($row['action_type'] == 'I') {
-                                                        echo base_url("/policy_tranction/inception/list") . '?pt_id=' . $row['id']; 
-                                                    } else {
-                                                        echo base_url("/policy_tranction/endorsement/list") . '?pt_id=' . $row['id']; 
-                                                    }
+                            <?php foreach ($finance_list as $index => $row) { ?>
+                                <tr>
+                                    <td><?= $index + 1 ?></td>
+                                    <td><?php echo $row['client_name']; ?></td>
+                                    <td><?php echo $row['insurer_name']; ?></td>
+                                    <td><?php echo $row['policy_type']; ?></td>
+                                    <td><?php echo $row['policy_no']; ?></td>
+                                    <td><?php echo $row['endorsement_no']; ?></td>
+                                    <td><?php echo $row['action_type_full']; ?></td>
+                                    <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>
+                                            <div class="dropdown-menu dropdown-menu-right">
+                                                <a href="
+                                                <?php
+                                                if ($row['action_type'] == 'I') {
+                                                    echo base_url("/policy_tranction/inception/list") . '?pt_id=' . $row['id'];
+                                                } else {
+                                                    echo base_url("/policy_tranction/endorsement/list") . '?pt_id=' . $row['id'];
+                                                }
                                                 ?>" id="get-policy-list" class="dropdown-item btnEdit">
-                                            <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
-                                        </a>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                        <?php } ?>
+                                                    <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            <?php } ?>
                         <?php } ?>
                     </tbody>
                 </table>
@@ -236,160 +238,170 @@ table.dataTable tbody td {
 </div>
 
 <script>
-document.addEventListener("DOMContentLoaded", function () {
-    const table = document.getElementById("scroll-horizontal-datatable");
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("scroll-horizontal-datatable");
 
-    // Create custom dropdown
-    function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
-    }
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            // Get the original dropdown items
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
 
-    let activeDropdown = null;
+            // Create new dropdown with proper background and spacing
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        // Append the custom dropdown to the body
-        document.body.appendChild(customDropdown);
+            // Copy inner content while maintaining icon alignment
+            customDropdown.innerHTML = originalDropdown.innerHTML;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+            return customDropdown;
+        }
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+        let activeDropdown = null;
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
-            
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-            // Set as active dropdown
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
 
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
+            // Append the custom dropdown to the body
+            document.body.appendChild(customDropdown);
+
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the action column
+                if (event.target.closest('td:last-child')) {
+                    return;
                 }
 
-                // Close the dropdown after handling the click
+                // Hide any active dropdown
                 if (activeDropdown) {
                     activeDropdown.style.display = 'none';
-                    activeDropdown = null;
                 }
-                
-                e.stopPropagation();
+
+                // Get click position
+                const rect = event.target.getBoundingClientRect();
+
+                // Position the dropdown with some offset
+                customDropdown.style.display = 'block';
+                customDropdown.style.position = 'fixed';
+                customDropdown.style.left = `${rect.left}px`;
+                customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+                // Set as active dropdown
+                activeDropdown = customDropdown;
+
+                event.stopPropagation();
+            });
+
+            // Preserve click handlers and add auto-close
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    const onclickAttr = this.getAttribute('onclick');
+                    if (onclickAttr) {
+                        eval(onclickAttr);
+                    }
+
+                    const href = this.getAttribute('href');
+                    if (href && href !== '#') {
+                        window.location.href = href;
+                    }
+
+                    // Close the dropdown after handling the click
+                    if (activeDropdown) {
+                        activeDropdown.style.display = 'none';
+                        activeDropdown = null;
+                    }
+
+                    e.stopPropagation();
+                });
             });
         });
-    });
 
-    // Close dropdown when clicking outside
-    document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+        // Close dropdown when clicking outside
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
     });
-});
 </script>
 
 
 
 <script>
-// Datatable document ready
-$(document).ready(function() {
-
+    // Datatable document ready
+$(document).ready(function () {
     var ticketsTable = $('#scroll-horizontal-datatable');
 
     if (ticketsTable.length) {
         ticketsTable.DataTable({
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
+            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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-BDS-List',
-                },
+            buttons: [
                 {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Policy-Tranction-BDS-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+                    extend: 'collection',
+                    text: '<span class="btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                    className: 'btn app-btn-secondary',
+                    buttons: [
+                        {
+                            extend: 'csv',
+                            text: '<i class="mdi mdi-file-delimited"></i><span class="btn-custom"> CSV </span>',
+                            title: 'Policy-Tranction-BDS-List'
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel"></i><span class="btn-custom"> EXCEL </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                            customize: function (xlsx) {
+                                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                                .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
+                                // Find cells in column AB (28th column in Excel)
+                                $('row c[r^="AB"]', sheet).each(function () {
+                                    var value = parseFloat($('v', this).text());
+                                    if (!isNaN(value)) {
+                                        total += value;
+                                    }
+                                });
+
+                                // Get the last row index and append the total row
+                                var lastRow = $('row:last', sheet);
+                                var rowIndex = parseInt(lastRow.attr('r')) + 2;
+
+                                var totalRow =
+                                    '<row r="' + rowIndex + '">' +
+                                    '<c t="inlineStr" r="AA' + rowIndex + '"><is><t>Total</t></is></c>' +
+                                    '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) + '</v></c>' +
+                                    '</row>';
+
+                                // Append the new total row to the sheet
+                                $(sheet).find('sheetData').append(totalRow);
                             }
-                        });
-
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                            2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
-
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    }
+                        }
+                    ]
                 }
-
             ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                    <div class="datatable-search-wrapper">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon"></i>
+                    </div>`,
+                searchPlaceholder: "Search"
             },
-            paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
-            ordering: false, 
+            paging: true,
+            pageLength: 10,
+            ordering: false
         });
     } else {
         console.error("Table not found.");
     }
 });
 
+
 $(document).ready(function() {
     getURLParams()
     $('#client_id').select2();
@@ -488,7 +500,7 @@ $(function() {
     // var end = moment();
 
     function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+        $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
         $('#startDate').val(start.format('DD-MM-YYYY'));
         $('#endDate').val(end.format('DD-MM-YYYY'));
     }
@@ -496,6 +508,7 @@ $(function() {
     $('#reportrange').daterangepicker({
         startDate: start,
         endDate: end,
+        locale: { format: 'DD-MM-YYYY' },
         ranges: {
             'Today': [moment(), moment()],
             'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
@@ -506,53 +519,174 @@ $(function() {
                 .endOf('month')
             ]
         }
-    }, cb);
-
-    cb(start, end);
-
-    $('#clear-filters').on('click', function() {
-        // Reset all select dropdowns to the first option
-        $('#client_id').val('0').change();
-        $('#insurer_id').val('0').change();
-        $('#policy_type_id').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer').val('0');
-        $('#date_div').hide()
-
-        // Reset the date range picker to default
-        $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
-        $('#reportrange').data('daterangepicker').setEndDate(moment());
-        cb(start, end); // Update the displayed date range
     });
 
-});
+    $(document).ready(function() {
+        getURLParams()
+        $('#client_id').select2();
+        $('#insurer_id').select2();
+        $('#policy_type_id').select2();
+    })
 
-function hideDateField(input = null) {
-    let val = $('#date_type').val();
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-    if (input) {
-        val = input;
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').val();
+
+        console.log(start_date + '-' + end_date);
+
+        var queryParams = {
+            start_date: start_date,
+            end_date: end_date,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            policy_type_id: policy_type_id,
+            date_type: date_type,
+            issuer: issuer,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-    if (val != 0) {
-        $('#date_div').show()
-    } else {
-        $('#date_div').hide()
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
     }
-}
 
-function sendPolicyTransactionID(event, pt_id) {
-    event.preventDefault(); // Prevent default action
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
 
-    console.log(pt_id);
+        const startDate = params.get('start_date') || 0; // Default to 0 if not found
+        const endDate = params.get('end_date') || 0; // Default to 0 if not found
+        const client_id = params.get('client_id') || 0; // Default to 0 if not found
+        const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+        const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
+        const date_type = params.get('date_type') || 0; // Default to 0 if not found
+        const issuer = params.get('issuer') || 0; // Default to 0 if not found
 
-    var queryParams = {
-        pt_id: pt_id,
-    };
+        hideDateField(date_type)
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
+        console.log('startDate', startDate)
+        console.log('endDate', endDate)
+        console.log('client_id', client_id)
+        console.log('insurer_id', insurer_id)
+        console.log('policy_type_id', policy_type_id)
+        console.log('date_type', date_type)
+        console.log('issuer', issuer)
+
+        // Log the values or use them as needed
+        console.log('Start Date:', startDate);
+        console.log('End Date:', endDate);
+
+        if (startDate != 0 && endDate != 0) {
+            setTimeout(function() {
+                $('#start_date').val(startDate)
+                $('#end_date').val(endDate)
+                $('#client_id').val(client_id).change()
+                $('#insurer_id').val(insurer_id).change()
+                $('#policy_type_id').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer').val(issuer)
+            }, 1000)
+
+        }
+
+    }
+
+    $(function() {
+
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        // Get start and end dates from URL parameters, or use default values
+        const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD-MM-YYYY');
+        const endDateParam = params.get('end_date') || moment().format('DD-MM-YYYY');
+
+        // Parse the dates to moment objects
+        var start = moment(startDateParam, 'DD-MM-YYYY');
+        var end = moment(endDateParam, 'DD-MM-YYYY');
+
+        // var start = moment().subtract(29, 'days');
+        // var end = moment();
+
+        function cb(start, end) {
+            $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#startDate').val(start.format('DD-MM-YYYY'));
+            $('#endDate').val(end.format('DD-MM-YYYY'));
+        }
+
+        $('#reportrange').daterangepicker({
+            startDate: start,
+            endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
+            ranges: {
+                'Today': [moment(), moment()],
+                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month')
+                    .endOf('month')
+                ]
+            }
+        }, cb);
+
+        cb(start, end);
+
+        $('#clear-filters').on('click', function() {
+            // Reset all select dropdowns to the first option
+            $('#client_id').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').val('0');
+            $('#date_div').hide()
+
+            // Reset the date range picker to default
+            $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
+            $('#reportrange').data('daterangepicker').setEndDate(moment());
+            cb(start, end); // Update the displayed date range
+        });
+
+    });
+
+    function hideDateField(input = null) {
+        let val = $('#date_type').val();
+
+        if (input) {
+            val = input;
+        }
+
+        if (val != 0) {
+            $('#date_div').show()
+        } else {
+            $('#date_div').hide()
+        }
+    }
+
+    function sendPolicyTransactionID(event, pt_id) {
+        event.preventDefault(); // Prevent default action
+
+        console.log(pt_id);
+
+        var queryParams = {
+            pt_id: pt_id,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/hr_access_controll.php b/app/Views/hr_access_controll.php
index 8baf6872..cbd2838e 100644
--- a/app/Views/hr_access_controll.php
+++ b/app/Views/hr_access_controll.php
@@ -61,11 +61,14 @@
 </style>
 
 
-<div class="container-fluid">
+<div class="container-fluid-min">
     <div class="row">
         <div class="col-12">
 
-            <?php if (isset($hr_access_data) && !empty($hr_access_data)) { ?>
+            <?php if (isset($hr_access_data) && !empty($hr_access_data)) {
+                $listed_pre  = [];
+                $listed_post = [];
+            ?>
                 <form id="insuranceForm" onsubmit="submitForm(event)">
 
                     <?php foreach ($hr_access_data as $key => $value) {
@@ -79,13 +82,17 @@
                             <input type="hidden" name="<?= 'user' . $key ?>_pre_hr_id" value="<?= $value['pre_hr_id'] ?>">
                             <input type="hidden" name="<?= 'user' . $key ?>_post_hr_id" value="<?= $value['post_hr_id'] ?>">
                             <input type="hidden" name="<?= 'user' . $key ?>_post_client_id" value="<?= $value['post_client_id'] ?>">
+                            <input type="hidden" name="<?= 'user' . $key ?>_pre_branch_id" value="<?= $value['pre_branch_id'] ?>">
+                            <input type="hidden" name="<?= 'user' . $key ?>_post_branch_id" value="<?= $value['post_branch_id'] ?>">
+                            <input type="hidden" name="<?= 'user' . $key ?>_pre_client_id" value="<?= $value['pre_client_id'] ?>">
 
                             <div class="card-header" onclick="toggleAccordion(this)" style="background-color: #F5FFFF;">
                                 <div class="user-info">
-                                    <h5 class="mb-0"><?= $value['hr_name'] ?>
+                                    <h5 class="mb-0"> Name -<?= $value['hr_name'] ?>
                                         <!-- <i class="mdi mdi-information-outline" aria-hidden="true" data-id="<?= (!empty($value['pre_hr_id']) ? $value['pre_hr_id'] : 0) . '-' . (!empty($value['post_hr_id']) ? $value['post_hr_id'] : 0) ?>"></i> -->
                                     </h5>
-                                    <p class="user-email"><?= $value['hr_mail'] ?></p>
+                                    <p style="color: black;"> <b>branch - <?= $value['post_branch_name']?></b></p>
+                                    <p class="user-email"> Mail - <?= $value['hr_mail'] ?></p>
                                 </div>
                                 <div class="accordion-icon">
                                     <i class="mdi mdi-chevron-down"></i>
@@ -128,6 +135,15 @@
                                                     <?php foreach ($pre_policy_data as $key1 => $policies) {
                                                         $statusText = $policies['policy_status'] == 1 ? 'Active' : 'In-Active';
                                                         $statusClass = $policies['policy_status'] == 1 ? 'active' : 'inactive';
+                                                        if (
+                                                            in_array($policies['branch_id'].'-'.$policies['policy_no'], $listed_pre)
+                                                            &&
+                                                            $value['pre_branch_id'] != $policies['branch_id']                                                          
+                                                            ) {
+                                                            continue;
+                                                        } else {
+                                                            $listed_pre[] = $policies['branch_id'].'-'.$policies['policy_no'];
+                                                        }
                                                     ?>
                                                         <div class="checkbox-item">
                                                             <input type="checkbox" class="policy-checkbox <?= $statusClass ?>" name="<?= 'user' . $key ?>_pre_policies" data-user="<?= $key ?>" data-group="pre" value="<?= $policies['client_policy_id'] ?>"
@@ -180,12 +196,26 @@
                                                     <?php foreach ($post_policy_data as $key2 => $policies) {
                                                         $statusText = $policies['policy_status'] == 1 ? 'Active' : 'In-Active';
                                                         $statusClass = $policies['policy_status'] == 1 ? 'active' : 'inactive';
+                                                        if(
+                                                            in_array($policies['branch_id'].'-'.$policies['policy_no'] , $listed_post) 
+                                                            &&
+                                                            $value['post_branch_id'] != $policies['branch_id'] 
+                                                        ) 
+                                                        {
+                                                            continue;
+                                                        } 
+                                                        else 
+                                                        {
+                                                            $listed_post[] = $policies['branch_id'].'-'.$policies['policy_no'];
+                                                        }
+
                                                     ?>
                                                         <div class="checkbox-item">
                                                             <input type="checkbox" class="policy-checkbox <?= $statusClass ?>" id="<?= 'user' . $key ?>-gmc2" name="<?= 'user' . $key ?>_active_policies" data-user="<?= $key ?>" data-group="post"
                                                                 value="<?= $policies['client_policy_id'] ?>" <?php if (in_array($policies['client_policy_id'], $value['allowed_active_policies'])) {
                                                                                                                     echo 'checked';
                                                                                                                 } ?>>
+                                                            &nbsp;&nbsp;
                                                             <label for="<?= 'user' . $key ?>-gmc2" style="<?php if ($policies['policy_status'] == 0) {
                                                                                                                 echo 'color:#ff5757';
                                                                                                             } ?>">
diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php
index e868cf8b..8f52d592 100644
--- a/app/Views/hr_activity_history.php
+++ b/app/Views/hr_activity_history.php
@@ -44,6 +44,10 @@ table.dataTable tbody td {
     box-shadow: 0px 2px 4px 0px #00000024 !important;  
  }
 
+#hr_activity_history_append_area tbody tr {
+  background-color: transparent !important;
+}
+
 </style>
 
 <!-- <div class="row" style="position: relative;left: 250px;top: 55px;">
@@ -60,7 +64,7 @@ table.dataTable tbody td {
     </div>
 </div> -->
 
-<table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap flex-grow">
+<table data-custom-table-css="second-table" id="scroll-horizontal-datatable" class="table w-100 nowrap flex-grow">
     <thead class="bg-light">
         <tr>
             <th>S. No</th>
@@ -93,15 +97,16 @@ $(document).ready(function () {
     if (ticketsTable.length) {
         var table = ticketsTable.DataTable({
             scrollX: true,
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // search left, buttons right
-                 "<'row'<'col-sm-12'tr>>" +
-                 "<'row'<'col-sm-3'i><'col-sm-2'l><'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-7'p>>",
             language: {
                 search: "_INPUT_",
                 searchPlaceholder: "Search..."
             },
             paging: true,
-            pageLength: 25,
+            pageLength: 10,
             ordering: false,
             buttons: [
                 {
@@ -120,6 +125,17 @@ $(document).ready(function () {
             ]
         });
 
+        // run after DataTable is ready
+$('.dataTables_filter input').css({
+    'background': '#F0F0F0',
+    'border': 'none',
+    'border-radius': '8px',
+    'padding-right': '35px'
+}).wrap('<div style="position:relative; display:inline-block;"></div>')
+  .after('<i class="mdi mdi-magnify" ' +
+         'style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i>');
+
+
         // Attach submit handler separately so it works
         $(document).on("click", "#submitBtn", function () {
             appendHrActivityHistoryHtml(this, true);
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 936d603f..dd0c7b33 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -10,11 +10,26 @@
         <div class="col-xl-12">
             <div id="accordion" class="mb-3">
                 <div class="card mb-1">
-                    <h5 class="m-1">
+
+                    <h4 class="m-1">
+                        <span>Filters</span>
                         <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
                             <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
                         </a>
-                    </h5>
+                    </h4>
+
+                    <!-- <h5 class="m-1">
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h5> 
+                    <label id="filterAccordion" class="m-1 d-flex justify-content-between align-items-center">    
+                            <span class="font-color-black">Filters</span>
+                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
+                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                    </label> -->
+
                     <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                         <div class="card-body">
                             <!-- <div class="text-center"> -->
@@ -103,15 +118,15 @@
                 id="hr_tickets_table">
                 <thead class="bg-light">
                     <tr>
-                        <th class="font-weight-medium">SNO</th>
-                        <th class="font-weight-medium">File name</th>
-                        <th class="font-weight-medium">Client</th>
-                        <th class="font-weight-medium">Client Branch</th>
-                        <th class="font-weight-medium">Policy</th>
-                        <th class="font-weight-medium">Event</th>
-                        <th class="font-weight-medium">User/Time</th>
-                        <th class="font-weight-medium">Status</th>
-                        <th class="font-weight-medium">Action</th>
+                        <th class="font-weight-medium">S.No&nbsp;</th>
+                        <th class="font-weight-medium">File name&nbsp;</th>
+                        <th class="font-weight-medium">Client&nbsp;</th>
+                        <th class="font-weight-medium">Client Branch&nbsp;</th>
+                        <th class="font-weight-medium">Policy&nbsp;</th>
+                        <th class="font-weight-medium">Event&nbsp;</th>
+                        <th class="font-weight-medium">User/Time&nbsp;</th>
+                        <th class="font-weight-medium">Status&nbsp;</th>
+                        <th class="font-weight-medium">Action&nbsp;</th>
                     </tr>
                 </thead>
 
@@ -341,27 +356,33 @@
     // for datatable 
     $(document).ready(function() {
         $('#hr_tickets_table').DataTable({
-            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-7'p>>",
-            "buttons": [{
-                "extend": 'csv',
-                "text": 'CSV',
-                "title": 'Employee-Upload-List',
-                "className": 'my_class',
-                "exportOptions": {
-                    "columns": ':not(:last-child)'
-                },
-            }],
-            "initComplete": function(settings, json) {
-                $('.my_class').css({
-                    "position": "relative",
-                    "left": "79px"
-                });
-            },
+            buttons: [{
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Employee-Upload-List',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                <div class="datatable-search-wrapper">
+                    _INPUT_
+                    <i class="mdi mdi-magnify datatable-search-icon"></i>
+                </div>`,
+                searchPlaceholder: "Search"
             },
             paging: true,
         });
diff --git a/app/Views/import_export.php b/app/Views/import_export.php
index da473af6..276b51fd 100755
--- a/app/Views/import_export.php
+++ b/app/Views/import_export.php
@@ -10,19 +10,17 @@
 </style>
 
 <script>
-
     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
     var branch_policy = '';
 
-    $(document).ready(function(){
+    $(document).ready(function() {
         getClientAndBranchAndPolicy();
     })
 
     //featch client and branch and policy
-    function getClientAndBranchAndPolicy()
-    {   
+    function getClientAndBranchAndPolicy() {
         $.ajax({
             url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
             type: "GET",
@@ -30,7 +28,7 @@
             success: function(res) {
 
                 console.log('getClientAndBranchAndPolicy', res);
-                if(res.status == true){
+                if (res.status == true) {
 
                     client_list = res.client_data;
                     branch_list = res.branch_data;
@@ -39,8 +37,8 @@
                     appendClients(res.client_data);
                     appendClients2(res.client_data);
                     appendClients3(res.client_data);
-                    
-                }else{
+
+                } else {
                     console.log('No data found');
                 }
 
@@ -51,35 +49,42 @@
             }
         });
     }
-
 </script>
 
 <div class="row" id="client_add" style="position: relative; bottom: 25px;">
 
     <div class="col-12">
         <div class="card-body">
-                <h3>Inception</h3>
-                <br>
-            <ul class="nav nav-pills navtab-bg">
-                <li class="nav-item d-flex justify-content-center align-items-center">
-                    <a href="#general-q-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-1 active-tab" id="general_tab">
-                        <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                        <span class="d-none d-sm-inline-block dash-tab-font">Data From Client</span>
-                    </a>
-                </li>
-                <li class="nav-item d-flex justify-content-center align-items-center">
-                    <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1" id="kyc_tab">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block dash-tab-font">Insurer or TPA Data</span>
-                    </a>
-                </li>
-                <li class="nav-item d-flex justify-content-center align-items-center">
-                    <a href="#HR-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1" id="hr_tab">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block dash-tab-font">HR Uploaded Files</span>
-                    </a>
-                </li>
-            </ul>
+            <div class="tab-wrapper position-relative">
+                <ul class="nav nav-pills navtab-bg " id="myTab">
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2 active-tab " id="general_tab">
+                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                            <span class="d-none d-sm-inline-block ">Data From Client</span>
+                        </a>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block ">Insurer or TPA Data</span>
+                        </a>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <a href="#HR-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="hr_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block ">HR Uploaded Files</span>
+                        </a>
+                    </li>
+                     <li class="nav-item d-flex justify-content-center align-items-center">
+                        <!-- Right Arrow -->
+                        <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                    </li>
+                </ul>
+            </div>
+
             <div class="tab-content">
                 <?php include('employee_upload.php'); ?>
                 <?php include('insurer_or_tpa_data.php'); ?>
@@ -107,7 +112,7 @@
     function formatTextToCamelCase(str) {
         return str
             .replace(/_/g, ' ') // replace underscores with spaces
-            .toLowerCase()      // convert everything to lowercase
+            .toLowerCase() // convert everything to lowercase
             .replace(/\b\w/g, char => char.toUpperCase()); // capitalize each word
     }
 </script>
\ No newline at end of file
diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php
index 800d4e70..a92543a4 100755
--- a/app/Views/insurer_export_templete.php
+++ b/app/Views/insurer_export_templete.php
@@ -80,19 +80,19 @@
             <thead class="">
 
                 <tr>
-                    <th>S.NO</th>
-                    <th>Policy Type</th>
-                    <th>Event Type</th>
-                    <th>Upload/Download</th>
-                    <th>Template</th>
-                    <th>Action</th>
+                    <th>S.NO&nbsp;</th>
+                    <th>Policy Type&nbsp;</th>
+                    <th>Event Type&nbsp;</th>
+                    <th>Upload/Download&nbsp;</th>
+                    <th>Template&nbsp;</th>
+                    <th>Action&nbsp;</th>
                 </tr>
             </thead>
             <tbody>
                 <?php if(isset($insurer_templete_list)){  ?>
                     <?php foreach($insurer_templete_list as $key => $value ){ ?>
                         <tr>
-                            <td><?= $key+1; ?></td>
+                            <td class="text-center"><?= $key+1; ?></td>
                             <td><?= $value['policy_type']; ?></td>
                             <td><?= $events[$value['event_name']]; ?></td>
                             <td><?= $value['type_name'] == 'import' ? 'Upload' : 'Download'; ?></td>
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 9b52aa41..59727f76 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -1,6 +1,5 @@
 <style>
-
-.custom-dropdown-menu {
+  .custom-dropdown-menu {
     display: none;
     position: absolute;
     background-color: #ffffff !important;
@@ -10,311 +9,323 @@
     min-width: 10rem;
     z-index: 9999;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
+  }
 
-.custom-dropdown-menu .dropdown-item {
+  .custom-dropdown-menu .dropdown-item {
     display: block !important;
     width: 100% !important;
     padding: 0.5rem 1rem !important;
     color: #212529 !important;
     text-decoration: none !important;
     background-color: transparent !important;
-}
+  }
 
-.custom-dropdown-menu .dropdown-item:hover {
+  .custom-dropdown-menu .dropdown-item:hover {
     background-color: #f8f9fa !important;
     color: #16181b !important;
     cursor: pointer !important;
-}   
+  }
 
-.btn-color{
-  background-color: rgba(52, 174, 178, 1);
-  color: white;
-  border:1px solid rgba(52, 174, 178, 1);
-}
+  .btn-color {
+    background-color: rgba(52, 174, 178, 1);
+    color: white;
+    border: 1px solid rgba(52, 174, 178, 1);
+  }
 
-.btn-color:hover{
+  .btn-color:hover {
     background-color: rgba(41, 139, 142, 1);
     color: white;
-    border:1px solid  rgba(41, 139, 142, 1);
-}
-
+    border: 1px solid rgba(41, 139, 142, 1);
+  }
 </style>
-<div class="row" id="insurer_list">
+
+<div class="container-fluid-min">
+  <div class="row" id="insurer_list">
     <div class="col-12">
-        <div class="card">
-            <div class="card-body maincard">
-                    <div class="row" style="margin-bottom:1rem;">
+      <div class="card">
+        <div class="card-body maincard">
+          <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Insurers</h4>
                         </div>
-                    </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">Type</th>
-                            <th class="font-weight-medium">Action</th>
-                        </tr>
-                    </thead>
+                    </div> -->
+          <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+            id="tickets-table">
+            <thead class="bg-light">
+              <tr>
+                <th class="font-weight-medium">Name</th>
+                <th class="font-weight-medium">Type</th>
+                <th class="font-weight-medium">Action</th>
+              </tr>
+            </thead>
 
-                    <tbody>
-                    <?php if(is_array($insurerList)) {foreach($insurerList as $row){ ?>
-                      <tr>
-                        <td><?php echo $row['name']; ?> ( <?php echo $row['short_name']; ?> ) </td>
-                        <td><?php echo $row['type']; ?></td>
-                        <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>
-                            <div class="dropdown-menu dropdown-menu-right">
-                              <a class="dropdown-item" href="<?= base_url("master/insurer/list/"); ?><?= $row['id'];?>"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
-                              <a class="dropdown-item" data-id="<?= $row['id'];?>" onclick="removeInsurer(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                    <?php }}?>
+            <tbody>
+              <?php if (is_array($insurerList)) {
+                foreach ($insurerList as $row) { ?>
+                  <tr>
+                    <td><?php echo $row['name']; ?> ( <?php echo $row['short_name']; ?> ) </td>
+                    <td><?php echo $row['type']; ?></td>
+                    <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>
+                        <div class="dropdown-menu dropdown-menu-right">
+                          <a class="dropdown-item" href="<?= base_url("master/insurer/list/"); ?><?= $row['id']; ?>"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                          <a class="dropdown-item" data-id="<?= $row['id']; ?>" onclick="removeInsurer(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
+                        </div>
+                      </div>
+                    </td>
+                  </tr>
+              <?php }
+              } ?>
 
-                    </tbody>
-                </table>
-            </div>
+            </tbody>
+          </table>
         </div>
+      </div>
     </div><!-- end col -->
+  </div>
 </div>
+
 <!-- end row -->
 
 <script>
-
-document.addEventListener("DOMContentLoaded", function () {
+  document.addEventListener("DOMContentLoaded", function() {
     const table = document.getElementById("tickets-table");
-    
+
     // Create custom dropdown
     function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
+      // Get the original dropdown items
+      const originalDropdown = row.querySelector('.dropdown-menu');
+      if (!originalDropdown) return null;
+
+      // Create new dropdown with proper background and spacing
+      const customDropdown = document.createElement('div');
+      customDropdown.className = 'custom-dropdown-menu';
+
+      // Copy inner content while maintaining icon alignment
+      customDropdown.innerHTML = originalDropdown.innerHTML;
+
+      return customDropdown;
     }
 
     let activeDropdown = null;
 
     // Add click event listener to rows
     table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+      const customDropdown = createCustomDropdown(row);
+      if (!customDropdown) return;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+      document.body.appendChild(customDropdown);
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+      row.addEventListener("click", function(event) {
+        // Ignore clicks on the action column
+        if (event.target.closest('td:last-child')) {
+          return;
+        }
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
-            
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-            // Set as active dropdown
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
-
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-              event.preventDefault(e);
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
-                }
-
-                // Close the dropdown after handling the click
-                if (activeDropdown) {
-                    activeDropdown.style.display = 'none';
-                    activeDropdown = null;
-                }
-                
-                e.stopPropagation();
-            });
+        // Hide any active dropdown
+        if (activeDropdown) {
+          activeDropdown.style.display = 'none';
+        }
+
+        // Get click position
+        const rect = event.target.getBoundingClientRect();
+
+        // Position the dropdown with some offset
+        customDropdown.style.display = 'block';
+        customDropdown.style.position = 'fixed';
+        customDropdown.style.left = `${rect.left}px`;
+        customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+        // Set as active dropdown
+        activeDropdown = customDropdown;
+
+        event.stopPropagation();
+      });
+
+      // Preserve click handlers and add auto-close
+      customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+        item.addEventListener('click', function(e) {
+          event.preventDefault(e);
+          const onclickAttr = this.getAttribute('onclick');
+          if (onclickAttr) {
+            eval(onclickAttr);
+          }
+
+          const href = this.getAttribute('href');
+          if (href && href !== '#') {
+            window.location.href = href;
+          }
+
+          // Close the dropdown after handling the click
+          if (activeDropdown) {
+            activeDropdown.style.display = 'none';
+            activeDropdown = null;
+          }
+
+          e.stopPropagation();
         });
+      });
     });
 
     // Close dropdown when clicking outside
     document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+      if (activeDropdown) {
+        activeDropdown.style.display = 'none';
+        activeDropdown = null;
+      }
     });
-});
-
+  });
 </script>
 
 <script>
-
- $(document).ready(function(){
+  $(document).ready(function() {
 
   $('#tickets-table').DataTable({
-        dom:  "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" + 
-              "<'row'<'col-sm-12'tr>>" + 
-              "<'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-7'p>>",
         buttons: [
-            {
-                extend: 'csv',
-                text: 'CSV', 
-                title: 'InsurerList', 
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                }
-            },
-            {
-                text: 'ADD',
-                className: 'btn btn-color',
-                action: function () {
-                    window.location.href = "<?= base_url("master/insurer/create"); ?>";
-                }
-            }
-        ],
-
-
+                    {
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function() { 
+                            window.location.href = "<?= base_url("master/insurer/create"); ?>";
+                        }
+                    },
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'InsurerList', 
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        }
+                                    }
+                        ]
+                    }
+                ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
         },
-        paging: true ,
+        paging: true,
     });
 
- }) 
+  })
 
-const btnExport = document.querySelector("#btnExport");
-const tableElement = document.querySelector("#tickets-table");
+  const btnExport = document.querySelector("#btnExport");
+  const tableElement = document.querySelector("#tickets-table");
 
-btnExport.addEventListener("click", () => {
-  const obj = new csvExport(tableElement);
-  const csvData = obj.exportCsv();
-  const blob = new Blob([csvData], { type: "text/csv" });
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement("a");
-  a.href = url;
-  a.download = "UserList.csv";
-  a.click();
+  btnExport.addEventListener("click", () => {
+    const obj = new csvExport(tableElement);
+    const csvData = obj.exportCsv();
+    const blob = new Blob([csvData], {
+      type: "text/csv"
+    });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = "UserList.csv";
+    a.click();
 
-  setTimeout(() => {
-    URL.revokeObjectURL(url);
-  }, 500);
-});
+    setTimeout(() => {
+      URL.revokeObjectURL(url);
+    }, 500);
+  });
 
 
-class csvExport {
-  constructor(table, header = true) {
-    this.table = table;
-    this.rows = Array.from(table.querySelectorAll("tr"));
-    if (!header && this.rows[0].querySelectorAll("th").length) {
-      this.rows.shift();
-    }
-  }
-
-  exportCsv() {
-    const lines = [];
-    const ncols = this._longestRow();
-    for (const row of this.rows) {
-      let line = "";
-      for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
-        if (row.children[i] !== undefined) {
-          line += csvExport.safeData(row.children[i]);
-        }
-        line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+  class csvExport {
+    constructor(table, header = true) {
+      this.table = table;
+      this.rows = Array.from(table.querySelectorAll("tr"));
+      if (!header && this.rows[0].querySelectorAll("th").length) {
+        this.rows.shift();
       }
-      lines.push(line);
     }
-    return lines.join("\n");
-  }
 
-  _longestRow() {
-    return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
-  }
+    exportCsv() {
+      const lines = [];
+      const ncols = this._longestRow();
+      for (const row of this.rows) {
+        let line = "";
+        for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
+          if (row.children[i] !== undefined) {
+            line += csvExport.safeData(row.children[i]);
+          }
+          line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+        }
+        lines.push(line);
+      }
+      return lines.join("\n");
+    }
 
-  static safeData(td) {
-    let data = td.textContent;
-    //Replace all double quote to two double quotes
-    data = data.replace(/"/g, `""`);
-    //Replace , and \n to double quotes
-    data = /[",\n"]/.test(data) ? `"${data}"` : data;
-    return data;
+    _longestRow() {
+      return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
+    }
+
+    static safeData(td) {
+      let data = td.textContent;
+      //Replace all double quote to two double quotes
+      data = data.replace(/"/g, `""`);
+      //Replace , and \n to double quotes
+      data = /[",\n"]/.test(data) ? `"${data}"` : data;
+      return data;
+    }
   }
-}
 
 
   function removeInsurer(element) {
 
     Swal.fire({
-            title: "Are you sure?",
-            text: "You need to remove this insurer.",
-            icon: "info",
-            showCancelButton: true,
-            confirmButtonColor: "#3085d6",
-            confirmButtonText: "Yes",
+      title: "Are you sure?",
+      text: "You need to remove this insurer.",
+      icon: "info",
+      showCancelButton: true,
+      confirmButtonColor: "#3085d6",
+      confirmButtonText: "Yes",
     }).then((result) => {
 
-            if (result.isConfirmed) {
-              var id = element.getAttribute('data-id');
-              var form_action = '<?= base_url("master/insurer/remove/") ?>' + id; 
-              $.ajax({
-                  url: form_action,
-                  type: "GET",
-                  dataType: 'json',
-                  processData: false,
-                  contentType: false,
-                  success: function(res) {
-                    // console.log(res.status == true);
-                      if(res){
-                        if (res.status == true) {
-                          toastr.success('Insurer removed successfully', 'success');
-                          location.reload();
-                        } else {
-                          toastr.warning('Failed to remove insurer', 'warning');
-                        }
-                      }
-                  },
-                  error: function (xhr, status, error) {
-                      console.error(xhr.responseText);
-                      console.error(status, error);
-                      $('.loader').fadeOut();
-                      $('.loader-mask').delay(350).fadeOut('slow');
-                      toastr.warning('Failed to remove insurer', 'warning');
-                  }
-              });
+      if (result.isConfirmed) {
+        var id = element.getAttribute('data-id');
+        var form_action = '<?= base_url("master/insurer/remove/") ?>' + id;
+        $.ajax({
+          url: form_action,
+          type: "GET",
+          dataType: 'json',
+          processData: false,
+          contentType: false,
+          success: function(res) {
+            // console.log(res.status == true);
+            if (res) {
+              if (res.status == true) {
+                toastr.success('Insurer removed successfully', 'success');
+                location.reload();
+              } else {
+                toastr.warning('Failed to remove insurer', 'warning');
+              }
             }
+          },
+          error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+            toastr.warning('Failed to remove insurer', 'warning');
+          }
+        });
+      }
 
     });
 
   }
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index 2c290d15..2889ba13 100755
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -20,34 +20,44 @@
                         <span class="title-text ">Insurer</span>
                     </h4>
                 </div>
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active-tab active">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_branch_contacts_id">
-                            <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
-                            <span class="d-none d-sm-inline-block">Branch & Contacts</span>
-                        </a>
-                    </li>
-
-                    <?php if(isset($insurer['id'])){ ?>
 
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
                         <li class="nav-item">
-                            <a href="#template-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_export_templete">
-                                <span class="mr-1"><i class="mdi mdi-file-export font-16"></i></span>
-                                <span class="d-none d-sm-inline-block">Insurer Download Templete</span>
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active-tab active">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_branch_contacts_id">
+                                <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
+                                <span class="d-none d-sm-inline-block">Branch & Contacts</span>
                             </a>
                         </li>
 
-                    <?php } ?>
+                        <?php if (isset($insurer['id'])) { ?>
 
+                            <li class="nav-item">
+                                <a href="#template-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_export_templete">
+                                    <span class="mr-1"><i class="mdi mdi-file-export font-16"></i></span>
+                                    <span class="d-none d-sm-inline-block">Insurer Download Templete</span>
+                                </a>
+                            </li>
+
+                        <?php } ?>
+
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
 
-                </ul>
                 <div class="tab-content">
                     <?php include('insurer_basic_info.php'); ?>
                     <?php include('insurer_branch.php'); ?>
@@ -60,17 +70,18 @@
 
 
 <script>
-
     function insurer_branch_contact() {
         var check_insurer_id = $('#insurer_General_PrimaryKey');
 
-        if(check_insurer_id[0].value == '' || check_insurer_id[0].value == null || check_insurer_id[0].value == 0){
+        if (check_insurer_id[0].value == '' || check_insurer_id[0].value == null || check_insurer_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Insurer!', 'warning',{timeOut: 2000});
-        }else{
-         // if ($('#btnBranchBack')[0].style.display == 'none') {
-                $('#btnBranchAdd').show();
-         // }
+            toastr.warning('First Add the Insurer!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
+            // if ($('#btnBranchBack')[0].style.display == 'none') {
+            $('#btnBranchAdd').show();
+            // }
         }
     }
 
@@ -79,6 +90,4 @@
 
         insurer_branch_contact();
     });
-</script>
-
-
+</script>
\ No newline at end of file
diff --git a/app/Views/insurer_or_tpa_data.php b/app/Views/insurer_or_tpa_data.php
index fc822a52..b4c615b3 100755
--- a/app/Views/insurer_or_tpa_data.php
+++ b/app/Views/insurer_or_tpa_data.php
@@ -10,11 +10,21 @@
         <div class="col-xl-12">
             <div id="accordion" class="mb-3">
                 <div class="card mb-1">
-                    <h5 class="m-1">
+
+                    <h4 class="m-1">
+                        <span>Filters</span>
                         <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
                             <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
                         </a>
-                    </h5>
+                    </h4>
+
+                    <!-- <label id="filterAccordion" class="m-1 d-flex justify-content-between align-items-center">    
+                            <span class="font-color-black">Filters</span>
+                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
+                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                    </label> -->
+
                     <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                         <div class="card-body">
                             <!-- <div class="text-center"> -->
@@ -48,7 +58,7 @@
 
                                     <div class="form-row">
 
-                                        <div class="form-group col-md-4">
+                                        <div class="form- group col-md-4">
                                             <label>Insurer/TPA Data<span class="text-danger">*</span></label> <br />
                                             <select name="insurer_or_tpa" class="form-control" id="insurer_or_tpa" required>
                                                 <option value="">Select</option>
diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php
index 6689488a..6c5d67bb 100644
--- a/app/Views/insurer_statement_list.php
+++ b/app/Views/insurer_statement_list.php
@@ -1,107 +1,105 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-/* table.dataTable thead th {
+    /* table.dataTable thead th {
     padding: 4px 4px !important;
 } */
 
-.col-12 {
+    
 
-    max-width: 98% !important;
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.dataTables_filter {
-    position: absolute;
-}
+    .highlight {
+        border: 2px solid red;
+        background-color: #ffe6e6;
+    }
 
-.highlight {
-    border: 2px solid red; 
-    background-color: #ffe6e6; 
-}
+    .column-header {
+        margin-right: 10px;
+        /* Adjust this value as needed */
+    }
 
-.column-header {
-    margin-right: 10px; /* Adjust this value as needed */
-}
+    .form-section {
+        border: 1px solid #ccc;
+        padding: 15px;
+        margin-bottom: 20px;
+    }
 
-.form-section {
-    border: 1px solid #ccc;
-    padding: 15px;
-    margin-bottom: 20px;
-}
-
-.row-box {
-    border: 1px solid #ccc;
-    padding: 10px;
-    margin-bottom: 10px;
-}
+    .row-box {
+        border: 1px solid #ccc;
+        padding: 10px;
+        margin-bottom: 10px;
+    }
 </style>
 
 <style>
     .switch {
-    position: relative;
-    display: inline-block;
-    width: 54px;
-    height: 34px;
+        position: relative;
+        display: inline-block;
+        width: 54px;
+        height: 34px;
     }
 
-    .switch input { 
-    opacity: 0;
-    width: 0;
-    height: 0;
+    .switch input {
+        opacity: 0;
+        width: 0;
+        height: 0;
     }
 
     .slider {
-    position: absolute;
-    cursor: pointer;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: #ccc;
-    -webkit-transition: .4s;
-    transition: .4s;
+        position: absolute;
+        cursor: pointer;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: #ccc;
+        -webkit-transition: .4s;
+        transition: .4s;
     }
 
     .slider:before {
-    position: absolute;
-    content: "";
-    height: 19px;
-    width: 19px;
-    left: 4px;
-    bottom: 4px;
-    background-color: white;
-    -webkit-transition: .4s;
-    transition: .4s;
+        position: absolute;
+        content: "";
+        height: 19px;
+        width: 19px;
+        left: 4px;
+        bottom: 4px;
+        background-color: white;
+        -webkit-transition: .4s;
+        transition: .4s;
     }
 
-    input:checked + .slider {
-    background-color: #2196F3;
+    input:checked+.slider {
+        background-color: #2196F3;
     }
 
-    input:focus + .slider {
-    box-shadow: 0 0 1px #2196F3;
+    input:focus+.slider {
+        box-shadow: 0 0 1px #2196F3;
     }
 
-    input:checked + .slider:before {
-    -webkit-transform: translateX(26px);
-    -ms-transform: translateX(26px);
-    transform: translateX(26px);
+    input:checked+.slider:before {
+        -webkit-transform: translateX(26px);
+        -ms-transform: translateX(26px);
+        transform: translateX(26px);
     }
 
     /* Rounded sliders */
     .slider.round {
-    border-radius: 34px;
+        border-radius: 34px;
     }
 
     .slider.round:before {
-    border-radius: 50%;
+        border-radius: 50%;
     }
 
     .disabled-option {
@@ -109,144 +107,196 @@ table.dataTable tbody td {
     }
 
     .custom-dropdown-menu {
-    display: none;
-    position: absolute;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    border-radius: 0.25rem;
-    padding: 0.5rem 0;
-    min-width: 10rem;
-    z-index: 9999;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
+        display: none;
+        position: absolute;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 0, 0, 0.15);
+        border-radius: 0.25rem;
+        padding: 0.5rem 0;
+        min-width: 10rem;
+        z-index: 9999;
+        box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    }
 
-.custom-dropdown-menu .dropdown-item {
-    display: block !important;
-    width: 100% !important;
-    padding: 0.5rem 1rem !important;
-    color: #212529 !important;
-    text-decoration: none !important;
-    background-color: transparent !important;
-}
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        color: #212529 !important;
+        text-decoration: none !important;
+        background-color: transparent !important;
+    }
 
-.custom-dropdown-menu .dropdown-item:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}   
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 </style>
+<style>
+    .payment-card {
+        width: 100%;
+        background: #F7F7F7;
+        box-shadow: 0px 2px 2px 0px #00000040;
+        border-radius: 6px;
+        padding: 15px;
+        margin-bottom: 15px;
+    }
 
-<div class="row" id="inception_list">
-    <div class="col-12">
-        <div class="card">
-            <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
-                    <div class="col-9" style="align-self: center;">
-                        <h4 style="position: relative;">Insurer Statement List</h4>
-                        <!-- <div id="statusSwitchWrapper" class="dt-switch-wrapper">
+    .payment-card .row {
+        align-items: flex-end;
+    }
+
+    .payment-card label {
+        font-size: 13px;
+        font-weight: 500;
+        margin-bottom: 4px;
+        display: block;
+    }
+
+    .payment-card .form-control {
+        border-radius: 6px;
+        height: 35px;
+        font-size: 14px;
+    }
+
+    .payment-card .btn {
+        margin-left: 5px;
+        border-radius: 6px;
+    }
+</style>
+<div class="container-fluid-min">
+    <div class="row" id="inception_list">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-body">
+                    <div class="row" style="margin-bottom:1rem;">
+                        <div class="col-8" style="align-self: center;">
+                            <h4 style="position: relative;">Insurer Statements</h4>
+                            <!-- <div id="statusSwitchWrapper" class="dt-switch-wrapper">
                                 <div class="custom-control custom-switch">
                                     <input type="checkbox" class="custom-control-input" id="statusSwitch">
                                     <label class="custom-control-label" for="statusSwitch">Failed Status</label>
                                 </div>
                         </div> -->
-                    </div>
-                    <!-- <div class="col-4">
+                        </div>
+                        <!-- <div class="col-4">
                         <div class="custom-control custom-switch">
                             <input type="checkbox" class="custom-control-input" id="failedSwitch">
                             <label class="custom-control-label" for="failedSwitch">Failed</label>
                         </div>
                     </div> -->
-                    
-                    <div class="col-3" style="text-align: right;">
-                        <div class="row align-items-center">
-                            <div class="col-8">
-                                <div id="statusSwitchWrapper" class="dt-switch-wrapper">
-                                    <div class="custom-control custom-switch" style="text-align: left;">
-                                        <input type="checkbox" class="custom-control-input" id="statusSwitch">
-                                        <label class="custom-control-label" for="statusSwitch">Failed Status</label>
+
+                        <div class="col-4" style="text-align: right;">
+                            <div class="row align-items-center">
+                                <div class="offset-3 col-5">
+                                    <div id="statusSwitchWrapper" class="dt-switch-wrapper">
+                                        <div class="custom-control custom-switch" style="text-align: left;">
+                                            <input type="checkbox" class="custom-control-input" id="statusSwitch">
+                                            <label class="custom-control-label" for="statusSwitch">Failed Status</label>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="col-4">
-                                <button type="button" id="btnAdd" onclick="showFileUploadModal()" class="btn btn-primary waves-effect waves-light">Upload</button>
+                                <div class="col-4">
+                                    <button type="button" id="btnAdd" onclick="showFileUploadModal()" class="btn btn-primary waves-effect waves-light">Upload <i class="mdi mdi-upload"></i></button>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div><div class="dataTables_length d-flex align-items-center">
-                </div>
-                <div>
-                    <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
-                        <thead class="bg-light">
-                            <tr>
-                                <th></th>
-                                <th><div class="column-header">Insurer</div></th>
-                                <th><div class="column-header">Month</div></th>
-                                <th><div class="column-header">Statement<br>sno</div></th>
-                                <th><div class="column-header">Filename</div></th>
-                                <th><div class="column-header">Line<br>items</div></th>
-                                <th><div class="column-header">File<br>status</div></th>
-                                <th><div class="column-header">Invoice<br>status</div></th>
-                                <th><div class="column-header">User/Time</div></th>
-                                <th><div class="column-header">Action</div></th>
-                            </tr>
-                        </thead>
+                    <div class="dataTables_length d-flex align-items-center">
+                    </div>
+                    <div>
+                        <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                            <thead class="bg-light">
+                                <tr>
+                                    <th></th>
+                                    <th>
+                                        <div class="column-header">Insurer</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Month</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Statement<br>sno</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Filename</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Line<br>items</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">File<br>status</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Invoice<br>status</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">User/Time</div>
+                                    </th>
+                                    <th>
+                                        <div class="column-header">Action</div>
+                                    </th>
+                                </tr>
+                            </thead>
 
-                        <tbody>
-                            <?php foreach($insurer_statement_list as $row){ ?>
-                            <tr>
-                                <td><input type="hidden" class="row-select" data-id="<?= $row['id']; ?>"></td>
-                                <td><?php echo $row['short_name'].'-'.$row['branch_code']; ?></td>
-                                <td><?php echo change_date_format($row['month'],'Y-m-d','M-Y'); ?></td>
-                                <td><?php echo $row['stmt_sno'] ?> </td>
-                                <td><?php echo $row['file_name'] ?> </td>
-                                <td><?php echo $row['line_items'] ?></td>
-                                <td><?php echo $row['file_status']; 
-                                      if($row['file_status'] == 'failed') 
-                                        {
-                                            echo " <span class='col-xl-3 col-lg-4 col-sm-6'> <i class='fe-alert-circle' data-toggle='modal' data-target='#file-err-modal' data-err=" . $row['id'] . "></i></span>";
-                                        }
-                                    ?>
-                                </td>
+                            <tbody>
+                                <?php foreach ($insurer_statement_list as $row) { ?>
+                                    <tr>
+                                        <td><input type="hidden" class="row-select" data-id="<?= $row['id']; ?>"></td>
+                                        <td><?php echo $row['short_name'] . '-' . $row['branch_code']; ?></td>
+                                        <td><?php echo change_date_format($row['month'], 'Y-m-d', 'M-Y'); ?></td>
+                                        <td><?php echo $row['stmt_sno'] ?> </td>
+                                        <td><?php echo $row['file_name'] ?> </td>
+                                        <td><?php echo $row['line_items'] ?></td>
+                                        <td><?php echo $row['file_status'];
+                                            if ($row['file_status'] == 'failed') {
+                                                echo " <span class='col-xl-3 col-lg-4 col-sm-6'> <i class='fe-alert-circle' data-toggle='modal' data-target='#file-err-modal' data-err=" . $row['id'] . "></i></span>";
+                                            }
+                                            ?>
+                                        </td>
 
-                                <td><?php echo (isset($invoice_status_array[ $row['invoice_status'] ]) ? $invoice_status_array[ $row['invoice_status'] ] : ' - ') ?>
-                                <span class="col-xl-3 col-lg-4 col-sm-6">
-                                    <?php if($row['file_status'] == 'success' ) { ?>
-                                    <i class="fe-alert-circle" 
-                                       data-toggle="tooltip" 
-                                       data-placement="right" 
-                                       title="<?php  echo 'Invoice Amt: ' . (isset($row['invoice_amount']) ? $row['invoice_amount'] : '0.00' ) . '  Received Amt: ' . (isset($row['received_inv_amt']) ? $row['received_inv_amt'] : '0.00') ;  ?>" 
-                                       data-original-title="Tooltip on right">
-                                    </i>
+                                        <td><?php echo (isset($invoice_status_array[$row['invoice_status']]) ? $invoice_status_array[$row['invoice_status']] : ' - ') ?>
+                                            <span class="col-xl-3 col-lg-4 col-sm-6">
+                                                <?php if ($row['file_status'] == 'success') { ?>
+                                                    <i class="fe-alert-circle"
+                                                        data-toggle="tooltip"
+                                                        data-placement="right"
+                                                        title="<?php echo 'Invoice Amt: ' . (isset($row['invoice_amount']) ? $row['invoice_amount'] : '0.00') . '  Received Amt: ' . (isset($row['received_inv_amt']) ? $row['received_inv_amt'] : '0.00');  ?>"
+                                                        data-original-title="Tooltip on right">
+                                                    </i>
+                                                <?php } ?>
+                                            </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 if ($row['file_status'] != 'failed') { ?>
+                                                <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>
+                                                    <div class="dropdown-menu dropdown-menu-right">
+                                                        <a class="dropdown-item btnEdit" data-id="<?= $row['id']; ?>" data-exp-amt="<?= $row['exp_inv_amt']; ?>" data-received-amt="<?= $row['received_inv_amt']; ?>" onclick="showInvoiceStatusModal(event)">
+                                                            <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Invoice status
+                                                        </a>
+                                                        <a class="dropdown-item btnEdit" data-id="<?= $row['id']; ?>" onclick="deleteStatement(<?= $row['id']; ?>)">
+                                                            <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            <?php } ?>
+                                        </td>
+
+                                    </tr>
                                 <?php } ?>
-                                </span>
-
-                               </td>
-                                <td><?php echo change_date_format($row['created_at'],'Y-m-d H:i:s','d M Y h:i a').' by <br>'.$row['first_name'] ?></td>
-                                <td>
-                                    <?php if($row['file_status'] != 'failed'){?>
-                                    <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>
-                                        <div class="dropdown-menu dropdown-menu-right">
-                                            <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>" data-exp-amt="<?= $row['exp_inv_amt'];?>" data-received-amt="<?= $row['received_inv_amt'];?>" onclick="showInvoiceStatusModal(event)">
-                                                <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Invoice status
-                                            </a>
-                                            <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>"onclick="deleteStatement(<?= $row['id'];?>)">
-                                                <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
-                                            </a>
-                                        </div>
-                                    </div>
-                                <?php } ?>
-                                </td>
-                                
-                            </tr>
-                            <?php } ?>
-                        </tbody>
-                    </table>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
-        </div>
-    </div><!-- end col -->
+        </div><!-- end col -->
+    </div>
 </div>
+
 <!-- end table row -->
 
 <div class="modal fade" id="file_upload" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -261,52 +311,61 @@ table.dataTable tbody td {
                 <div class="">
 
                     <form role="form" class="parsley-examples" method="post" id="insurer_statement_upload_form" enctype="multipart/form-data" action="upload">
-                        
+
                         <div class="form-group">
-
-                            <div class="form-group col-md-10">
-                                <label for="insurer"> Insurer <spanclass="text-danger">*</spanclass=></label>
-                                <select class="form-control" id="insurer" name="insurer" required>
-                                    <option value="" selected>Select Insurer</option>
-                                        <?php
-                                            if (isset($insurers) && count($insurers)) {
-                                                foreach ($insurers as $key => $value) {
-                                                    echo "<option value=" . $value['insurer_id'].'-'.$value['id'] . ">" . $value['insurer_name'] .'-'. $value['branch_code'] . "</option>";
-                                                }
-                                            }
-                                        ?>
-                                </select>
-                            </div>   
-                             <div class="form-group col-md-10">
-                                <label for="statement_month">Statement month</label>
-                                <input type="text" class="form-control" id="statement_month" name="statement_month" placeholder="" required readonly onchange="getStatementNo()">
+                            <div class="row">
+                                <div class="form-group float-right-end offset-8 col-4">
+                                    <span><a href="downloadSampleInsurerStatement" id="download_sample_file" style="font-size: small; color:red !important;">Download sample file</a></span>
+                                </div>
                             </div>
-
-                             <div class="form-group col-md-10">
-                                <label for="statement_no">Statement no</label>
-                                <select class="form-control" id="statement_no" name="statement_no" required >
-                                    <option value="" selected>Select statement no</option>
+                            <div class="row">
+                                <div class="form-group col-md-6">
+                                    <label for="insurer"> Insurer <spanclass="text-danger">*</spanclass=></label>
+                                    <select class="form-control" id="insurer" name="insurer" required>
+                                        <option value="" selected>Select Insurer</option>
                                         <?php
-                                        $stmt_no = [1,2,3,4,5,6,7];
-                                            if (isset($stmt_no) && count($stmt_no)) {
-                                                foreach ($stmt_no as $key => $value) {
-                                                    echo "<option value=" . $value . ">" . $value . "</option>";
-                                                }
+                                        if (isset($insurers) && count($insurers)) {
+                                            foreach ($insurers as $key => $value) {
+                                                echo "<option value=" . $value['insurer_id'] . '-' . $value['id'] . ">" . $value['insurer_name'] . '-' . $value['branch_code'] . "</option>";
                                             }
+                                        }
                                         ?>
-                                </select>
+                                    </select>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <label for="statement_month">Statement month</label>
+                                    <input type="text" class="form-control" id="statement_month" name="statement_month" placeholder="" required readonly onchange="getStatementNo()">
+                                </div>
                             </div>
-
-                            <div class="form-group col-md-10" >
-                                <label for="statment">Statement </label> <span><a href="downloadSampleInsurerStatement" id="download_sample_file" style="font-size: small;">Download sample file</a></span>
-                                <input type="file" class="form-control" name="statement" required  accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet">
+                            <div class="row">
+                                <div class="form-group col-md-6">
+                                    <label for="statement_no">Statement no</label>
+                                    <select class="form-control" id="statement_no" name="statement_no" required>
+                                        <option value="" selected>Select statement no</option>
+                                        <?php
+                                        $stmt_no = [1, 2, 3, 4, 5, 6, 7];
+                                        if (isset($stmt_no) && count($stmt_no)) {
+                                            foreach ($stmt_no as $key => $value) {
+                                                echo "<option value=" . $value . ">" . $value . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <label for="statment">Statement </label>
+                                    <div class="input-icon">
+                                        <input type="file" class="form-control" name="statement" required accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet">
+                                        <i class="mdi mdi-upload additional-icon"></i>
+                                    </div>
+                                </div>
                             </div>
 
                         </div>
 
                         <div class="form-group text-right m-b-0">
-                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
-                                id="btnSubmit">Submit</button>
+                            <button type="button" class="btn app-btn-outline-secondary mr-2" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
                         </div>
                     </form>
                 </div>
@@ -341,8 +400,8 @@ table.dataTable tbody td {
 
             <div class="modal-body p-4">
                 <div class="">
-                    <form role="form" class="parsley-examples" method="post" id="invoiceForm" enctype="multipart/form-data" action="<?php echo base_url().'policy_tranction/statement/saveInvoicePaymentDetails'?>">
-                        
+                    <form role="form" class="parsley-examples" method="post" id="invoiceForm" enctype="multipart/form-data" action="<?php echo base_url() . 'policy_tranction/statement/saveInvoicePaymentDetails' ?>">
+
                         <div class="form-group">
                             <div class="row">
                                 <div class="form-group col-md-4">
@@ -350,82 +409,80 @@ table.dataTable tbody td {
                                     <select class="form-control" id="invoice_status" name="invoice_status" required>
                                         <option value="" selected>Select Invoice Status</option>
                                         <?php
-                                            if (isset($invoice_status_array) && count($invoice_status_array)) {
-                                                foreach ($invoice_status_array as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
-                                                }
+                                        if (isset($invoice_status_array) && count($invoice_status_array)) {
+                                            foreach ($invoice_status_array as $key => $value) {
+                                                echo "<option value='" . $key . "'>" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                     <input type="hidden" id="hidden_statement_id" name="hidden_statement_id">
                                 </div>
-                               <!--  <div class="form-group col-md-4">
+                                <!--  <div class="form-group col-md-4">
                                     <label for="addon_policy">Exp Amount</label>
                                         <input type="text" class="form-control" id="modal_exp_amt" placeholder="" disabled>
                                 </div> -->
-                                
+
                             </div>
+                            <hr>
 
                             <!-- Invoice Number and Invoice Date in same row -->
                             <!-- <div id="invoice_no_div_modal" style="display: none;"> -->
-                                <div class="row" id="invoice_no_div_modal" style="display: none;">
-                                    <div class="form-group col-md-4">
-                                          <label for="invoice_no">Invoice Number<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="text" class="form-control" id="invoice_no_modal" name="invoice_no" placeholder="Enter Invoice Number" required>
-                                    </div>
-                                    
-                                    <div class="form-group col-md-4">
-                                         <label for="invoice_date">Invoice Date</label>
-                                        <input type="text" class="form-control" id="invoice_date_modal" name="invoice_date" value="<?php echo date('Y-m-d'); ?>"  readonly required>
-                                    </div>
-
-                                     <div class="form-group col-md-4">
-                                          <label for="invoice_value_modal">Invoice value<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="number" class="form-control" id="invoice_value_modal" name="invoice_value" placeholder="Enter Invoice Value" readonly step="0.01">
-                                    </div>
-
-                                        
-                                     
+                            <div class="row" id="invoice_no_div_modal" style="display: none;">
+                                <div class="form-group col-md-4">
+                                    <label for="invoice_no">Invoice Number<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="invoice_no_modal" name="invoice_no" placeholder="Enter Invoice Number" required>
                                 </div>
-                                <div class="row" id="invoice_no_div_modal2" style="display: none;">
 
-                                    <div class="form-group col-md-4">
-                                          <label for="gst_value_modal">GST %<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="number" class="form-control" id="gst_per_modal" name="invoice_gst_per" placeholder="Enter GST %" required onchange="calcGSTValue()">
-                                    </div>
+                                <div class="form-group col-md-4">
+                                    <label for="invoice_date">Invoice Date</label>
+                                    <input type="text" class="form-control" id="invoice_date_modal" name="invoice_date" value="<?php echo date('Y-m-d'); ?>" readonly required>
+                                </div>
 
-                                     <div class="form-group col-md-4">
-                                          <label for="gst_value_modal">GST Value<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="number" class="form-control" id="gst_value_modal" name="invoice_gst" placeholder="Enter Invoice Value" required readonly step="0.01">
-                                    </div>
-                                     <div class="form-group col-md-4">
-                                          <label for="invoice_no">Invoice Amount<span id="base_danger" class="text-danger"></span></label>
-                                        <input type="number" class="form-control" id="invoice_amount_no_modal" name="invoice_amount" placeholder="Enter Invoice Amt" required readonly step="0.01">
-                                    </div>
+                                <div class="form-group col-md-4">
+                                    <label for="invoice_value_modal">Invoice value<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="number" class="form-control" id="invoice_value_modal" name="invoice_value" placeholder="Enter Invoice Value" readonly step="0.01">
+                                </div>
 
-                                     <!-- <div class="form-group col-md-3" id="modal_received_amt_div">
+
+
+                            </div>
+                            <div class="row" id="invoice_no_div_modal2" style="display: none;">
+
+                                <div class="form-group col-md-4">
+                                    <label for="gst_value_modal">GST %<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="number" class="form-control" id="gst_per_modal" name="invoice_gst_per" placeholder="Enter GST %" required onchange="calcGSTValue()">
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="gst_value_modal">GST Value<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="number" class="form-control" id="gst_value_modal" name="invoice_gst" placeholder="Enter Invoice Value" required readonly step="0.01">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="invoice_no">Invoice Amount<span id="base_danger" class="text-danger"></span></label>
+                                    <input type="number" class="form-control" id="invoice_amount_no_modal" name="invoice_amount" placeholder="Enter Invoice Amt" required readonly step="0.01">
+                                </div>
+
+                                <!-- <div class="form-group col-md-3" id="modal_received_amt_div">
                                     <label for="addon_policy">Total Received Amount</label>
                                         <input type="text" class="form-control" id="modal_received_amt" placeholder="" disabled>
                                      </div>  -->
-                                   
-                                </div>
 
-                                 <div class="row" id="modal_received_amt_div">
-                                     <div class="form-group col-md-4" >
-                                        <label for="addon_policy">Total Received Amount</label>
-                                            <input type="number" class="form-control" id="modal_received_amt" placeholder="" disabled step="0.01">
-                                     </div> 
+                            </div>
+
+                            <div class="row" id="modal_received_amt_div">
+                                <div class="form-group col-md-4">
+                                    <label for="addon_policy">Total Received Amount</label>
+                                    <input type="number" class="form-control" id="modal_received_amt" placeholder="" disabled step="0.01">
                                 </div>
+                            </div>
                             <!-- </div> -->
 
                         </div>
 
                         <!-- Payment Received Table -->
                         <div class="form-group col-md-12" style="display: none;" id="payment_table_div_modal" style="max-width: 800px;">
-                            <button type="button" id="add_row_btn" class="btn btn-secondary float-right"><i class="fa fa-plus"></i></button>
-
-
-                            <table data-custom-table-css="table" class="table table-bordered" id="payment_table_modal">
+                            <!-- <table data-custom-table-css="table" class="table table-bordered" id="payment_table_modal">
                                 <thead>
                                     <tr>
                                         <th style="display: none;">pk</th>
@@ -448,14 +505,51 @@ table.dataTable tbody td {
                                         <td><i class="mdi mdi-delete mr-2 font-18 vertical-middle text-danger remove-row" style="text-align: center;"></i></td>
                                     </tr>
                                 </tbody>
-                            </table>
+                            </table> -->
                             <!-- <button type="button" id="add_row_btn" class="btn btn-secondary float-right mt-2"><i class="fa fa-plus"></i></button> -->
 
+                            <div class="payment-card">
+                                <input type="hidden" class="form-control" name="pk[]" placeholder="Enter Amount">
+                                <div class="row">
+                                    <div class="col">
+                                        <label>Invoice value</label>
+                                        <input type="number" class="form-control" name="received_amount[]" placeholder="Enter Amount" required step="0.01" onchange="checkInvAmont(event)">
+                                    </div>
+                                    <div class="col">
+                                        <label>GST</label>
+                                        <input type="number" class="form-control" name="gst_amount[]" placeholder="Enter GST" required step="0.01" onchange="checkInvAmont(event)">
+                                    </div>
+                                    <div class="col">
+                                        <label>TDS</label>
+                                        <input type="number" class="form-control" name="tds[]" placeholder="Enter TDS" onchange="checkInvAmont(event)" required>
+                                    </div>
+                                    <div class="col">
+                                        <label>UTR Number</label>
+                                        <input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No" required>
+                                    </div>
+                                    <div class="col">
+                                        <label>Date</label>
+                                        <input type="text" class="form-control payment_date" name="payment_date[]" value="<?php echo date('d/m/Y'); ?>" placeholder="dd/mm/yyyy" required readonly>
+                                    </div>
+                                    <div class="col-auto d-flex align-items-end">
+                                        <button type="button" class="btn btn-danger btn-sm remove-row">
+                                            <i class="mdi mdi-delete"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="payment_card_container"></div>
+                            <div class="form-group text-right m-b-0">
+                                <button type="button" id="add_row_btn" class=" ml-2 btn app-btn-primary"><i class="mdi mdi-plus"></i></button>
+                            </div>
+
+
                         </div>
 
                         <div class="form-group text-right m-b-0">
-                             <!-- <button type="button" id="add_row_btn" class="btn btn-primary waves-effect waves-light mr-1">Add payment</button> -->
-                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Save</button>
+                            <!-- <button type="button" id="add_row_btn" class="btn btn-primary waves-effect waves-light mr-1">Add payment</button> -->
+                            <button type="button" class="btn app-btn-outline-secondary mr-2" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                            <button type="submit" class="btn btn-primary waves-effect waves-light" id="btnSubmit">Save</button>
                         </div>
                     </form>
                 </div>
@@ -464,90 +558,88 @@ table.dataTable tbody td {
     </div>
 </div>
 <script>
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("tickets-table");
 
-document.addEventListener("DOMContentLoaded", function () {
-    const table = document.getElementById("tickets-table");
-    
-    // Create custom dropdown
-    function createCustomDropdown(row) {
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        customDropdown.innerHTML = originalDropdown.innerHTML;
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
 
-        // Remove inline onclick handlers and store them in data attributes
-        const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
-        customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
-            const originalOnclick = originalItems[index].getAttribute('onclick');
-            item.removeAttribute('onclick'); // Remove the inline handler
-            item.setAttribute('data-onclick', originalOnclick); // Store in data attribute
-        });
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
+            customDropdown.innerHTML = originalDropdown.innerHTML;
 
-        return customDropdown;
-    }
+            // Remove inline onclick handlers and store them in data attributes
+            const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
+            customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
+                const originalOnclick = originalItems[index].getAttribute('onclick');
+                item.removeAttribute('onclick'); // Remove the inline handler
+                item.setAttribute('data-onclick', originalOnclick); // Store in data attribute
+            });
 
-    let activeDropdown = null;
+            return customDropdown;
+        }
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+        let activeDropdown = null;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the first column
-            if (event.target.closest('td:first-child')) return;
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
 
-            if (activeDropdown) activeDropdown.style.display = 'none';
+            document.body.appendChild(customDropdown);
 
-            const rect = event.target.getBoundingClientRect();
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`;
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
-        // Handle custom dropdown clicks
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-                e.preventDefault();
-                
-                // Execute the original onclick from data attribute
-                const onclickAttr = this.getAttribute('data-onclick');
-                if (onclickAttr) eval(onclickAttr);
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the first column
+                if (event.target.closest('td:first-child')) return;
 
-                // Handle href navigation
-                const href = this.getAttribute('href');
-                if (href && href !== '#') window.location.href = href;
+                if (activeDropdown) activeDropdown.style.display = 'none';
 
-                if (activeDropdown) {
-                    activeDropdown.style.display = 'none';
-                    activeDropdown = null;
-                }
-                
-                e.stopPropagation();
+                const rect = event.target.getBoundingClientRect();
+                customDropdown.style.display = 'block';
+                customDropdown.style.position = 'fixed';
+                customDropdown.style.left = `${rect.left}px`;
+                customDropdown.style.top = `${rect.bottom + 5}px`;
+                activeDropdown = customDropdown;
+
+                event.stopPropagation();
+            });
+            // Handle custom dropdown clicks
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    e.preventDefault();
+
+                    // Execute the original onclick from data attribute
+                    const onclickAttr = this.getAttribute('data-onclick');
+                    if (onclickAttr) eval(onclickAttr);
+
+                    // Handle href navigation
+                    const href = this.getAttribute('href');
+                    if (href && href !== '#') window.location.href = href;
+
+                    if (activeDropdown) {
+                        activeDropdown.style.display = 'none';
+                        activeDropdown = null;
+                    }
+
+                    e.stopPropagation();
+                });
             });
         });
-    });
 
-    // Close dropdown on outside click
-    document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+        // Close dropdown on outside click
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
     });
-});
-
 </script>
 
 <script>
-    document.getElementById('invoice_status').addEventListener('change', function () {
+    document.getElementById('invoice_status').addEventListener('change', function() {
         const invoiceStatus = this.value;
         console.log(invoiceStatus);
         const invoiceNoDiv = document.getElementById('invoice_no_div_modal');
@@ -568,203 +660,276 @@ document.addEventListener("DOMContentLoaded", function () {
             invoiceNoDiv.style.display = 'flex';
             invoiceNoDiv2.style.display = 'flex';
             totalReceivedAmtDiv.style.display = 'none';
-            switchRequired('invoice_no_modal',true);
-            switchRequired('invoice_date_modal',true);
-            switchRequired('invoice_amount_no_modal',true);
+            switchRequired('invoice_no_modal', true);
+            switchRequired('invoice_date_modal', true);
+            switchRequired('invoice_amount_no_modal', true);
 
-             switchRequired('received_amount',false,'name');
-             switchRequired('tds',false,'name');
-             switchRequired('gst_amount',false,'name');
-             switchRequired('utr_no',false,'name');
-             switchRequired('payment_date',false,'name');
-             switchRequired('pk',false,'name');
+            switchRequired('received_amount', false, 'name');
+            switchRequired('tds', false, 'name');
+            switchRequired('gst_amount', false, 'name');
+            switchRequired('utr_no', false, 'name');
+            switchRequired('payment_date', false, 'name');
+            switchRequired('pk', false, 'name');
             // invoiceDateDiv.style.display = 'block';
         } else if (invoiceStatus === 'payment_received') {
             invoiceNoDiv.style.display = 'flex';
             invoiceNoDiv2.style.display = 'flex';
             paymentTableDiv.style.display = 'block';
             totalReceivedAmtDiv.style.display = 'block';
-             switchRequired('invoice_no_modal',true);
-             switchRequired('invoice_date_modal',true);
-             switchRequired('invoice_amount_no_modal',true);
+            switchRequired('invoice_no_modal', true);
+            switchRequired('invoice_date_modal', true);
+            switchRequired('invoice_amount_no_modal', true);
 
 
-             switchRequired('received_amount',true,'name');
-             switchRequired('utr_no',true,'name');
-             switchRequired('tds',true,'name');
-             switchRequired('gst_amount',true,'name');
-             switchRequired('payment_date',true,'name');
-             switchRequired('pk',true,'name');
-        }else if(invoiceStatus === 'pending')
-        {
-             invoiceNoDiv.style.display = 'none';
-             invoiceNoDiv2.style.display = 'none';
-             paymentTableDiv.style.display = 'none';
-             totalReceivedAmtDiv.style.display = 'none';
-             // switchRequired('modal_received_amt_div',false);
-             switchRequired('invoice_no_modal',false);
-             switchRequired('invoice_date_modal',false);
-             switchRequired('invoice_amount_no_modal',false);
+            switchRequired('received_amount', true, 'name');
+            switchRequired('utr_no', true, 'name');
+            switchRequired('tds', true, 'name');
+            switchRequired('gst_amount', true, 'name');
+            switchRequired('payment_date', true, 'name');
+            switchRequired('pk', true, 'name');
+        } else if (invoiceStatus === 'pending') {
+            invoiceNoDiv.style.display = 'none';
+            invoiceNoDiv2.style.display = 'none';
+            paymentTableDiv.style.display = 'none';
+            totalReceivedAmtDiv.style.display = 'none';
+            // switchRequired('modal_received_amt_div',false);
+            switchRequired('invoice_no_modal', false);
+            switchRequired('invoice_date_modal', false);
+            switchRequired('invoice_amount_no_modal', false);
 
-             switchRequired('received_amount',false,'name');
-             switchRequired('utr_no',false,'name');
-             switchRequired('payment_date',false,'name');
-             switchRequired('pk',false,'name');
-             switchRequired('tds',false,'name');
-             switchRequired('gst_amount',false,'name');
+            switchRequired('received_amount', false, 'name');
+            switchRequired('utr_no', false, 'name');
+            switchRequired('payment_date', false, 'name');
+            switchRequired('pk', false, 'name');
+            switchRequired('tds', false, 'name');
+            switchRequired('gst_amount', false, 'name');
 
         }
 
         calcGSTValue();
     });
 
-    
-
-    $(document).ready(function () {
-
-     $('#file-err-modal').on('show.bs.modal', function(event) {
-        // console.log(event.relatedTarget);
-        var myVal = $(event.relatedTarget).data('err');
-        // console.log(myVal);
-        var loader =
-            '<div style="text-align: center;"><img src="<?php echo base_url()?>public/assets/images/simple_loader.gif" height="50px" width="50px" ></div>';
-        $('#file-err-modal').find(".modal-body").html(loader);
-        var model_data = fetchFileError(myVal);
-        // console.log('data received.');
-        // console.log(model_data);
-
-    });
 
 
-    $('#invoiceForm').on('submit', function (e) {
-        e.preventDefault();  // Prevent default form submission
+    $(document).ready(function() {
 
-         var res = checkInvAmont();
-        if(!res)
-        {
-            return false;
-        }
+        $('#file-err-modal').on('show.bs.modal', function(event) {
+            // console.log(event.relatedTarget);
+            var myVal = $(event.relatedTarget).data('err');
+            // console.log(myVal);
+            var loader =
+                '<div style="text-align: center;"><img src="<?php echo base_url() ?>public/assets/images/simple_loader.gif" height="50px" width="50px" ></div>';
+            $('#file-err-modal').find(".modal-body").html(loader);
+            var model_data = fetchFileError(myVal);
+            // console.log('data received.');
+            // console.log(model_data);
 
-        var form = document.getElementById('invoiceForm');
-        // alert(form.checkValidity());
-        // alert($('#invoice_date_modal').val());
-        if((!form.checkValidity()))
-        {
-            console.log('error2');
-            console.log(form.checkValidity());
-            return false;
-        }
+        });
 
-        if($('#invoice_date_modal').val().trim() === '' && $('#invoice_status').val() != 'pending')
-        {
-            // console.log('error1');
-            return false;
-        }
-        // console.log('final');
-        // return false;
-        // Serialize form data to array and then convert to JSON
-        var formData = new FormData(form);
-        var formDataJSON = {};
 
-        // Iterate over FormData entries
-        formData.forEach(function(value, key) {
-            // Check if the key ends with '[]' indicating an array-like input
-            if (key.endsWith('[]')) {
-                // Remove '[]' from the key and store it as an array in formDataJSON
-                var arrayKey = key.slice(0, -2);
-                if (!formDataJSON[arrayKey]) {
-                    formDataJSON[arrayKey] = [];
+        $('#invoiceForm').on('submit', function(e) {
+            e.preventDefault(); // Prevent default form submission
+
+            var res = checkInvAmont();
+            if (!res) {
+                return false;
+            }
+
+            var form = document.getElementById('invoiceForm');
+            // alert(form.checkValidity());
+            // alert($('#invoice_date_modal').val());
+            if ((!form.checkValidity())) {
+                console.log('error2');
+                console.log(form.checkValidity());
+                return false;
+            }
+
+            if ($('#invoice_date_modal').val().trim() === '' && $('#invoice_status').val() != 'pending') {
+                // console.log('error1');
+                return false;
+            }
+            // console.log('final');
+            // return false;
+            // Serialize form data to array and then convert to JSON
+            var formData = new FormData(form);
+            var formDataJSON = {};
+
+            // Iterate over FormData entries
+            formData.forEach(function(value, key) {
+                // Check if the key ends with '[]' indicating an array-like input
+                if (key.endsWith('[]')) {
+                    // Remove '[]' from the key and store it as an array in formDataJSON
+                    var arrayKey = key.slice(0, -2);
+                    if (!formDataJSON[arrayKey]) {
+                        formDataJSON[arrayKey] = [];
+                    }
+                    formDataJSON[arrayKey].push(value); // Push the value into the array
+                } else {
+                    formDataJSON[key] = value; // Standard single-value field
                 }
-                formDataJSON[arrayKey].push(value); // Push the value into the array
-            } else {
-                formDataJSON[key] = value; // Standard single-value field
-            }
-        });
+            });
 
-        // Convert the JSON object to a string
-        var jsonData = JSON.stringify(formDataJSON);
-        console.log(jsonData);
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
-        // Send the JSON data to the backend using AJAX
-        $.ajax({
-            url: 'saveInvoicePaymentDetails',  // Replace with your backend URL
-            type: 'POST',
-            contentType: 'application/json',
-            data: jsonData,
-            success: function (response) {
-                console.log(response);
-                // Close the modal
-    
-                 $('.close').click()
-                // Reset the form data
-                // $('#invoiceForm')[0].reset();
-                
-                alert('Invoice updated successfully!');
-                location.reload(); 
-            },
-            error: function (xhr, status, error) {
-                // Handle any errors
-                console.error('Form submission failed:', error);
-                alert('An error occurred while updating the invoice.');
-            }
+            // Convert the JSON object to a string
+            var jsonData = JSON.stringify(formDataJSON);
+            console.log(jsonData);
+            $('.loader').fadeIn();
+            $('.loader-mask').fadeIn();
+            // Send the JSON data to the backend using AJAX
+            $.ajax({
+                url: 'saveInvoicePaymentDetails', // Replace with your backend URL
+                type: 'POST',
+                contentType: 'application/json',
+                data: jsonData,
+                success: function(response) {
+                    console.log(response);
+                    // Close the modal
+
+                    $('.close').click()
+                    // Reset the form data
+                    // $('#invoiceForm')[0].reset();
+
+                    alert('Invoice updated successfully!');
+                    location.reload();
+                },
+                error: function(xhr, status, error) {
+                    // Handle any errors
+                    console.error('Form submission failed:', error);
+                    alert('An error occurred while updating the invoice.');
+                }
+            });
+            // location.reload(); 
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(10).fadeOut('slow');
         });
-        // location.reload(); 
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(10).fadeOut('slow');
-    });
     });
 
 
     // Add/Delete rows in the payment table
-    document.getElementById('add_row_btn').addEventListener('click', function () {
-        const tableBody = document.querySelector('#payment_table_modal tbody');
-        const newRow = document.createElement('tr');
+    // document.getElementById('add_row_btn').addEventListener('click', function () {
+    //     const tableBody = document.querySelector('#payment_table_modal tbody');
+    //     const newRow = document.createElement('tr');
 
-        newRow.innerHTML = `
-            <td style="display: none;"><input type="hidden" class="form-control" name="pk[]" placeholder="Enter Amount"></td>
-            <td><input type="number" class="form-control" name="received_amount[]" placeholder="Enter Amount" onchange="checkInvAmont(event)" required step="0.01"></td>
-            <td><input type="number" class="form-control" name="gst_amount[]" placeholder="Enter GST" onchange="checkInvAmont(event)" required step="0.01"></td>
-            <td><input type="number" class="form-control" name="tds[]" placeholder="Enter TDS" onchange="checkInvAmont(event)" required></td>
-            <td><input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No" required></td>
-            <td><input type="text" class="form-control payment_date" value="<?php echo date('d/m/Y'); ?>" name="payment_date[]" placeholder="dd/mm/yyyy" required readonly></td>
-            <td><i class="mdi mdi-delete mr-2 font-18 vertical-middle text-danger remove-row" style="text-align: center;"></i></td>
-        `;
+    //     newRow.innerHTML = `
+    //         <td style="display: none;"><input type="hidden" class="form-control" name="pk[]" placeholder="Enter Amount"></td>
+    //         <td><input type="number" class="form-control" name="received_amount[]" placeholder="Enter Amount" onchange="checkInvAmont(event)" required step="0.01"></td>
+    //         <td><input type="number" class="form-control" name="gst_amount[]" placeholder="Enter GST" onchange="checkInvAmont(event)" required step="0.01"></td>
+    //         <td><input type="number" class="form-control" name="tds[]" placeholder="Enter TDS" onchange="checkInvAmont(event)" required></td>
+    //         <td><input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No" required></td>
+    //         <td><input type="text" class="form-control payment_date" value="<?php echo date('d/m/Y'); ?>" name="payment_date[]" placeholder="dd/mm/yyyy" required readonly></td>
+    //         <td><i class="mdi mdi-delete mr-2 font-18 vertical-middle text-danger remove-row" style="text-align: center;"></i></td>
+    //     `;
 
-        tableBody.appendChild(newRow);
-            $('.payment_date').datepicker({
-                format: 'dd/mm/yyyy',
-                autoclose: true 
-            });
+    //     tableBody.appendChild(newRow);
+    //         $('.payment_date').datepicker({
+    //             format: 'dd/mm/yyyy',
+    //             autoclose: true 
+    //         });
+    // });
+
+    // Remove row
+    // document.getElementById('payment_table_modal').addEventListener('click', function (e) {
+    //     if (e.target && e.target.classList.contains('remove-row')) {
+    //         if (confirm("Do you want to delete this entry?")) {
+    //             var row = e.target.closest('tr');
+    //             var pk = row.querySelector('input[name="pk[]"]').value;
+
+    //             if (pk === "") {
+    //                 // If pk is empty, remove the row
+    //                 row.remove();
+    //             } else {
+    //                 // If pk is non-empty, send AJAX request to remove it from the backend
+    //                 $.ajax({
+    //                     url: 'deletePaymentEntry/'+pk, // Your backend URL here
+    //                     type: 'GET',
+    //                     // data: { pk: pk }, // Send the pk value to delete on server-side
+    //                     success: function (response) {
+    //                         // On success, remove the row
+    //                         console.log(response);
+    //                         if (response.dataStatus) {
+    //                             row.remove();
+    //                             alert('Payment deleted successfully.');
+    //                         } else {
+    //                             alert('Failed to delete the entry.');
+    //                         }
+    //                     },
+    //                     error: function () {
+    //                         alert('Error occurred while deleting the entry.');
+    //                     }
+    //                 });
+    //             }
+    //         }
+    //     }
+    // });
+
+    document.getElementById('add_row_btn').addEventListener('click', function() {
+        const container = document.getElementById('payment_card_container'); // wrapper div for cards
+        const newCard = document.createElement('div');
+        newCard.classList.add('payment-card');
+
+        newCard.innerHTML = `
+        <input type="hidden" class="form-control" name="pk[]" placeholder="Enter Amount">
+        <div class="row">
+            <div class="col">
+                <label>Invoice value</label>
+                <input type="number" class="form-control" name="received_amount[]" placeholder="Enter Amount" onchange="checkInvAmont(event)" required step="0.01">
+            </div>
+            <div class="col">
+                <label>GST</label>
+                <input type="number" class="form-control" name="gst_amount[]" placeholder="Enter GST" onchange="checkInvAmont(event)" required step="0.01">
+            </div>
+            <div class="col">
+                <label>TDS</label>
+                <input type="number" class="form-control" name="tds[]" placeholder="Enter TDS" onchange="checkInvAmont(event)" required>
+            </div>
+            <div class="col">
+                <label>UTR Number</label>
+                <input type="text" class="form-control" name="utr_no[]" placeholder="Enter UTR No" required>
+            </div>
+            <div class="col">
+                <label>Date</label>
+                <input type="text" class="form-control payment_date" value="<?php echo date('d/m/Y'); ?>" name="payment_date[]" placeholder="dd/mm/yyyy" required readonly>
+            </div>
+            <div class="col-auto d-flex align-items-end">
+                <button type="button" class="btn btn-danger btn-sm remove-row" style="text-align: center;">
+                    <i class="mdi mdi-delete"></i>
+                </button>
+            </div>
+        </div>
+    `;
+
+        container.appendChild(newCard);
+
+        // Reinit datepicker
+        $('.payment_date').datepicker({
+            format: 'dd/mm/yyyy',
+            autoclose: true
+        });
     });
 
-   // Remove row
-    document.getElementById('payment_table_modal').addEventListener('click', function (e) {
-        if (e.target && e.target.classList.contains('remove-row')) {
+    // Remove row (card)
+    document.getElementById('payment_card_container').addEventListener('click', function(e) {
+        if (e.target.closest('.remove-row')) {
+            const card = e.target.closest('.payment-card');
             if (confirm("Do you want to delete this entry?")) {
-                var row = e.target.closest('tr');
-                var pk = row.querySelector('input[name="pk[]"]').value;
+                const pk = card.querySelector('input[name="pk[]"]').value;
 
                 if (pk === "") {
-                    // If pk is empty, remove the row
-                    row.remove();
+                    // frontend only remove
+                    card.remove();
                 } else {
-                    // If pk is non-empty, send AJAX request to remove it from the backend
+                    // AJAX delete request
                     $.ajax({
-                        url: 'deletePaymentEntry/'+pk, // Your backend URL here
+                        url: 'deletePaymentEntry/' + pk,
                         type: 'GET',
-                        // data: { pk: pk }, // Send the pk value to delete on server-side
-                        success: function (response) {
-                            // On success, remove the row
-                            console.log(response);
+                        success: function(response) {
                             if (response.dataStatus) {
-                                row.remove();
+                                card.remove();
                                 alert('Payment deleted successfully.');
                             } else {
                                 alert('Failed to delete the entry.');
                             }
                         },
-                        error: function () {
+                        error: function() {
                             alert('Error occurred while deleting the entry.');
                         }
                     });
@@ -772,95 +937,87 @@ document.addEventListener("DOMContentLoaded", function () {
             }
         }
     });
-
-
-    
-
 </script>
 
 <script>
-
-function showFileUploadModal(input)
-{
+    function showFileUploadModal(input) {
         var myModal = new bootstrap.Modal(document.getElementById('file_upload'));
         myModal.show();
         // $(input).val('');
-}
+    }
 
-function formatDate(date) {
-    var day = ("0" + date.getDate()).slice(-2);
-    var month = ("0" + (date.getMonth() + 1)).slice(-2);
-    var year = date.getFullYear();
-    return day + "/" + month + "/" + year;
-}
-function formatDateToDMY(dateStr) {
-    // Split the date string by the hyphen
-    var parts = dateStr.split('-');
-    return parts[2] + '/' + parts[1] + '/' + parts[0]; // Rearrange to DD-MM-YYYY
-}
-function showInvoiceStatusModal(event)
-{
+    function formatDate(date) {
+        var day = ("0" + date.getDate()).slice(-2);
+        var month = ("0" + (date.getMonth() + 1)).slice(-2);
+        var year = date.getFullYear();
+        return day + "/" + month + "/" + year;
+    }
+
+    function formatDateToDMY(dateStr) {
+        // Split the date string by the hyphen
+        var parts = dateStr.split('-');
+        return parts[2] + '/' + parts[1] + '/' + parts[0]; // Rearrange to DD-MM-YYYY
+    }
+
+    function showInvoiceStatusModal(event) {
         console.log('############  showInvoiceStatusModal function called ##################');
-         var modal_received_amt_div = document.getElementById('modal_received_amt_div');
-         modal_received_amt_div.style.display = 'none';
+        var modal_received_amt_div = document.getElementById('modal_received_amt_div');
+        modal_received_amt_div.style.display = 'none';
         // alert();
         // console.log(event.target.data)
         var dataId = event.target.getAttribute('data-id');
         var dataExpAmt = event.target.getAttribute('data-exp-amt');
         var dataReceivedAmt = event.target.getAttribute('data-received-amt');
         // Set the value to a hidden input field in the modal
-        document.getElementById('hidden_statement_id').value = dataId; 
+        document.getElementById('hidden_statement_id').value = dataId;
         // document.getElementById('modal_exp_amt').value = dataExpAmt; 
-        document.getElementById('modal_received_amt').value = dataReceivedAmt; 
+        document.getElementById('modal_received_amt').value = dataReceivedAmt;
 
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
         // AJAX call to get the invoice details based on data-id
         $.ajax({
-            url: 'getPaymentDetails/'+ dataId, // Replace with your backend URL
+            url: 'getPaymentDetails/' + dataId, // Replace with your backend URL
             method: 'get',
             // data: { id: dataId },
             // dataType: 'json',
             success: function(response) {
                 $('.loader').fadeOut();
-            $('.loader-mask').delay(10).fadeOut('slow');
+                $('.loader-mask').delay(10).fadeOut('slow');
                 console.log(response);
                 // Assuming response contains the necessary data
                 if (response.dataStatus === true && response.code === 200) {
                     // Populate modal fields
-                    if(response.data.invoice_status !== null)
-                    {
+                    if (response.data.invoice_status !== null) {
                         var inv_status_element = document.getElementById('invoice_status');
                         inv_status_element.value = response.data.invoice_status;
                         var event = new Event('change');
                         inv_status_element.dispatchEvent(event);
                     }
-                    
+
                     document.getElementById('invoice_no_modal').value = response.data.invoice_no;
-                    document.getElementById('invoice_date_modal').value = response.data.invoice_date === '' ? <?php echo date('d-m-Y')?> : response.data.invoice_date;
+                    document.getElementById('invoice_date_modal').value = response.data.invoice_date === '' ? <?php echo date('d-m-Y') ?> : response.data.invoice_date;
                     document.getElementById('invoice_amount_no_modal').value = response.data.invoice_amount;
-                    
+
                     document.getElementById('invoice_value_modal').value = response.data.invoice_value;
                     document.getElementById('gst_per_modal').value = response.data.gst_per;
                     document.getElementById('gst_value_modal').value = response.data.gst_value;
                     console.log('response.data.gst_value - ' + response.data.gst_value);
-                    if(response.data.gst_value == 0 || response.data.gst_value == '' || response.data.gst_value == null)
-                    {
+                    if (response.data.gst_value == 0 || response.data.gst_value == '' || response.data.gst_value == null) {
                         calcGSTValue();
                     }
 
                     if (!$('#invoice_date_modal').val()) {
                         // alert('nope');
-                          // Set today's date as the default date
-                          $('#invoice_date_modal').datepicker('setDate', new Date());
+                        // Set today's date as the default date
+                        $('#invoice_date_modal').datepicker('setDate', new Date());
                     }
                     // Clear existing rows in the payment table
                     var paymentTableBody = document.querySelector('#payment_table_modal tbody');
-                    
+
                     console.log('response.data.payments.length', response.data.payments.length)
                     // Populate payment table rows
-                    if(response.data.payments.length)
-                    {
+                    if (response.data.payments.length) {
                         paymentTableBody.innerHTML = '';
                         response.data.payments.forEach(function(payment) {
                             var row = paymentTableBody.insertRow();
@@ -875,7 +1032,10 @@ function showInvoiceStatusModal(event)
                             `;
                         });
                     }
-                     $('.payment_date').datepicker({ format: 'dd/mm/yyyy',autoclose: true});
+                    $('.payment_date').datepicker({
+                        format: 'dd/mm/yyyy',
+                        autoclose: true
+                    });
                     // Show the modal
                     var myModal = new bootstrap.Modal(document.getElementById('invoice_modal'));
                     myModal.show();
@@ -896,70 +1056,70 @@ function showInvoiceStatusModal(event)
         // var myModal = new bootstrap.Modal(document.getElementById('invoice_modal'));
         // myModal.show();
         // $(input).val('');
-}
-
-$(document).ready(function(){
-   
-    // var rollover_date = flatpickr("#statement_month", {
-    //     dateFormat: "Y-M",
-    //     allowInput: true
-    // });
-     $('#statement_month').datepicker({
-      format: 'yyyy-M',
-      viewMode: 'months',
-      minViewMode: 'months',
-       autoclose: true
-    });
-
-
-     $('.payment_date').datepicker({
-      format: 'dd/mm/yyyy',
-       autoclose: true
-    });
-
-     // Get today's date
-var today = new Date();
-
-// Calculate the minimum date (60 days before today)
-var minDate = new Date();
-minDate.setDate(today.getDate() - 180);
-
-// Calculate the maximum date (60 days after today)
-var maxDate = new Date();
-maxDate.setDate(today.getDate() + 180);
-     $('#invoice_date_modal').datepicker({
-      format: 'dd/mm/yyyy',
-       autoclose: true,
-       startDate: minDate,
-    endDate: maxDate
-    });
-
-    //  var invoice_date_modal = flatpickr("#invoice_date_modal", {
-    //     dateFormat: "d-m-Y",
-    //     allowInput: true
-    // });
-});
-
-
- $('#insurer_statement_upload_form').submit(function(event) {
-    
-    event.preventDefault();
-    var isValid = $('#insurer_statement_upload_form').parsley().validate();
-    if (!isValid) {
-        console.log('Form is Empty', 'Warning');
-        // alert('choose all fileds');
-        return;
     }
 
-    $('#btnSubmit').prop('disabled', true).text('Submitting...');
-    // Create FormData object
-    var formData = new FormData($(this)[0]);
-    for (var pair of formData.entries()) {
-        console.log(pair[0] + ', ' + pair[1]);
-    }
+    $(document).ready(function() {
 
-         $('.loader').fadeIn();
-         $('.loader-mask').fadeIn();
+        // var rollover_date = flatpickr("#statement_month", {
+        //     dateFormat: "Y-M",
+        //     allowInput: true
+        // });
+        $('#statement_month').datepicker({
+            format: 'yyyy-M',
+            viewMode: 'months',
+            minViewMode: 'months',
+            autoclose: true
+        });
+
+
+        $('.payment_date').datepicker({
+            format: 'dd/mm/yyyy',
+            autoclose: true
+        });
+
+        // Get today's date
+        var today = new Date();
+
+        // Calculate the minimum date (60 days before today)
+        var minDate = new Date();
+        minDate.setDate(today.getDate() - 180);
+
+        // Calculate the maximum date (60 days after today)
+        var maxDate = new Date();
+        maxDate.setDate(today.getDate() + 180);
+        $('#invoice_date_modal').datepicker({
+            format: 'dd/mm/yyyy',
+            autoclose: true,
+            startDate: minDate,
+            endDate: maxDate
+        });
+
+        //  var invoice_date_modal = flatpickr("#invoice_date_modal", {
+        //     dateFormat: "d-m-Y",
+        //     allowInput: true
+        // });
+    });
+
+
+    $('#insurer_statement_upload_form').submit(function(event) {
+
+        event.preventDefault();
+        var isValid = $('#insurer_statement_upload_form').parsley().validate();
+        if (!isValid) {
+            console.log('Form is Empty', 'Warning');
+            // alert('choose all fileds');
+            return;
+        }
+
+        $('#btnSubmit').prop('disabled', true).text('Submitting...');
+        // Create FormData object
+        var formData = new FormData($(this)[0]);
+        for (var pair of formData.entries()) {
+            console.log(pair[0] + ', ' + pair[1]);
+        }
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
         $.ajax({
             url: $(this).attr("action"),
             type: "POST",
@@ -993,7 +1153,7 @@ maxDate.setDate(today.getDate() + 180);
                     toastr.error('Something went wrong! Try later', 'Error');
                     window.location.reload(true);
                 }
-                  $('.close').click()
+                $('.close').click()
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(10).fadeOut('slow');
 
@@ -1005,99 +1165,98 @@ maxDate.setDate(today.getDate() + 180);
                 console.error("Request failed:", status, error);
                 toastr.error('Something went wrong! Try later', 'Error');
                 // $('#uploadForm')[0].reset();
-                  $('.close').click()
+                $('.close').click()
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(10).fadeOut('slow');
                 window.location.reload(true);
             }
         });
-         
+
     });
 
- function fetchFileError(file_id) {
-    $('#loader').show();
-    var apiURL = 'getFileErr/' + file_id;
-    // console.log('fetchFileError');
-    // console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        headers: {
-            "X-Requested-With": "XMLHttpRequest"
-        },
-        success: function(response) {
-            console.log(response);
-            $(this).find(".modal-body").html("");
-            if (response.code === 200 && response.dataStatus === true && response.data !== "") {
-                try {
-                    // console.log((JSON.parse(response.data)));
-                    var file_error_data = (JSON.parse(response.data));
-                    var file_error_html = "";
+    function fetchFileError(file_id) {
+        $('#loader').show();
+        var apiURL = 'getFileErr/' + file_id;
+        // console.log('fetchFileError');
+        // console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'GET',
+            headers: {
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            success: function(response) {
+                console.log(response);
+                $(this).find(".modal-body").html("");
+                if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+                    try {
+                        // console.log((JSON.parse(response.data)));
+                        var file_error_data = (JSON.parse(response.data));
+                        var file_error_html = "";
 
-                    if (file_error_data['error_code'] == 1) {
-                        file_error_html += 'The following row no(s) from excel are <span style="font-weight:bold">not found with policy transactions / duplicates.</span>';
-                        file_error_html += ' : ' + '<span style="font-weight:bolder">' + file_error_data['error_data'].join(',') + '</span>';
+                        if (file_error_data['error_code'] == 1) {
+                            file_error_html += 'The following row no(s) from excel are <span style="font-weight:bold">not found with policy transactions / duplicates.</span>';
+                            file_error_html += ' : ' + '<span style="font-weight:bolder">' + file_error_data['error_data'].join(',') + '</span>';
+                        }
+
+                        // console.log(file_error_html);
+                        $('#file-err-modal').find(".modal-body").html(file_error_html);
+                        return file_error_html;
+                    } catch (error) {
+                        console.error('Error parsing API response data:', error);
                     }
-
-                    // console.log(file_error_html);
-                    $('#file-err-modal').find(".modal-body").html(file_error_html);
-                    return file_error_html;
-                } catch (error) {
-                    console.error('Error parsing API response data:', error);
+                } else if (response.code === 404 && response.dataStatus === false) {
+                    console.error('no data found', response);
+                } else {
+                    console.error('Something went wrong!');
                 }
-            } else if (response.code === 404 && response.dataStatus === false) {
-                console.error('no data found', response);
-            } else {
-                console.error('Something went wrong!');
+            },
+            error: function(xhr, status, error) {
+                console.error('Error fetching data from API:', error);
             }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching data from API:', error);
-        }
-    });
+        });
 
-    $('#loader').hide();
-}
-
-
-function checkInvAmont(event = null) {
-    var total = 0;
-    var receivedAmounts = document.querySelectorAll('input[name="received_amount[]"]');
-    var receivedGST = document.querySelectorAll('input[name="gst_amount[]"]');
-    var tdsAmounts = document.querySelectorAll('input[name="tds[]"]');
-    // console.log();
-    receivedAmounts.forEach(function(el, index) {
-        // Get the received amount
-        let receivedVal = parseFloat(el.value) || 0;
-        // Get the corresponding tds amount (paired with the received amount)
-        let gstVal = parseFloat(receivedGST[index].value) || 0;
-        let tdsVal = parseFloat(tdsAmounts[index].value) || 0;
-        // Add received amount and tds amount
-        // console.log();
-        total += (receivedVal + tdsVal + gstVal);
-    });
-    // console.log(total);
-    // Get the expected invoice amount
-    var exp_amt = parseFloat(document.getElementById('invoice_amount_no_modal').value) || 0;
-
-    // Check if the total exceeds the expected amount
-    if (exp_amt < total) {
-        alert('Exceeds Invoice amount...Plz adjust numbers');
-        if(event != null)
-        {
-            event.target.value = '';
-            
-        }
-        return false; // Reset the value of the element that triggered the event
+        $('#loader').hide();
     }
 
-    return true;
-}
+
+    function checkInvAmont(event = null) {
+        var total = 0;
+        var receivedAmounts = document.querySelectorAll('input[name="received_amount[]"]');
+        var receivedGST = document.querySelectorAll('input[name="gst_amount[]"]');
+        var tdsAmounts = document.querySelectorAll('input[name="tds[]"]');
+        // console.log();
+        receivedAmounts.forEach(function(el, index) {
+            // Get the received amount
+            let receivedVal = parseFloat(el.value) || 0;
+            // Get the corresponding tds amount (paired with the received amount)
+            let gstVal = parseFloat(receivedGST[index].value) || 0;
+            let tdsVal = parseFloat(tdsAmounts[index].value) || 0;
+            // Add received amount and tds amount
+            // console.log();
+            total += (receivedVal + tdsVal + gstVal);
+        });
+        // console.log(total);
+        // Get the expected invoice amount
+        var exp_amt = parseFloat(document.getElementById('invoice_amount_no_modal').value) || 0;
+
+        // Check if the total exceeds the expected amount
+        if (exp_amt < total) {
+            alert('Exceeds Invoice amount...Plz adjust numbers');
+            if (event != null) {
+                event.target.value = '';
+
+            }
+            return false; // Reset the value of the element that triggered the event
+        }
+
+        return true;
+    }
 
 
-function switchRequired(elementId, isRequired, type = 'id') {
+    function switchRequired(elementId, isRequired, type = 'id') {
         // console.log('switchRequired: ' + elementId+' - '+' - '+ type);
-        if(type == 'id')//id attribute
+        if (type == 'id') //id attribute
         {
             let element = document.getElementById(elementId);
             if (isRequired) {
@@ -1105,42 +1264,39 @@ function switchRequired(elementId, isRequired, type = 'id') {
             } else {
                 element.removeAttribute('required');
             }
-        }
-        else //name attribute
+        } else //name attribute
         {
-            var name_attribute = elementId+'[]';
+            var name_attribute = elementId + '[]';
             // Select all elements with the name 'invoice_amt[]'
             var elements = document.getElementsByName(name_attribute);
 
             // Loop through the elements and set or remove the 'required' attribute
             elements.forEach(function(element) {
                 if (isRequired) {
-                    element.setAttribute('required', 'required');  // Make required
+                    element.setAttribute('required', 'required'); // Make required
                 } else {
-                    element.removeAttribute('required');  // Remove required
+                    element.removeAttribute('required'); // Remove required
                 }
             });
         }
-}
-
-function getStatementNo()
-{
-    var insurer_id = $('#insurer').val();
-    var statement_month = $('#statement_month').val();
-
-    console.log(insurer_id+' / '+statement_month);
-    if(insurer_id == "")
-    {
-        alert('Choose insurer...!');
-        $('#statement_month').val('');
     }
 
+    function getStatementNo() {
+        var insurer_id = $('#insurer').val();
+        var statement_month = $('#statement_month').val();
+
+        console.log(insurer_id + ' / ' + statement_month);
+        if (insurer_id == "") {
+            alert('Choose insurer...!');
+            $('#statement_month').val('');
+        }
 
 
 
-         $('.loader').fadeIn();
-         $('.loader-mask').fadeIn();
-        var apiURL = 'getInsurerStatementMonth?insurer_id=' +insurer_id+'&month='+statement_month ;
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+        var apiURL = 'getInsurerStatementMonth?insurer_id=' + insurer_id + '&month=' + statement_month;
         $.ajax({
             url: apiURL,
             type: "GET",
@@ -1155,14 +1311,14 @@ function getStatementNo()
 
                 if (response.code === 200 && response.dataStatus === true && response
                     .data !== "") {
-                   
-                   disableStatementNo(response.data)
+
+                    disableStatementNo(response.data)
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(10).fadeOut('slow');
                 } else if (response.code === 404 && response.dataStatus === false) {
                     console.error('no data found', response);
                     // alert(response.message);
-                   // toastr.error(response.message, 'Failed');
+                    // toastr.error(response.message, 'Failed');
                     // window.location.reload(true);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(10).fadeOut('slow');
@@ -1186,277 +1342,269 @@ function getStatementNo()
                 $('.loader-mask').delay(10).fadeOut('slow');
             }
         });
-         // $('.loader').fadeOut();
-         // $('.loader-mask').delay(10).fadeOut('slow');
+        // $('.loader').fadeOut();
+        // $('.loader-mask').delay(10).fadeOut('slow');
 
 
-}
-
-function calcGSTValue()
-{
-    // alert('calcGSTValue');
-    console.log('calcGSTValue called');
-    var inv_status_element = document.getElementById('invoice_status');
-    
-    if(inv_status_element.value == 'generated' || inv_status_element.value == 'send' || inv_status_element.value == 'payment_received')
-    {
-
-        var gst_per = document.getElementById('gst_per_modal').value;
-        console.log('gst_per - ' + gst_per);
-
-        var invoice_value_dom_obj = document.getElementById('invoice_value_modal');
-        var invoice_value = invoice_value_dom_obj.value;
-        console.log('invoice_value - ' + invoice_value);
-
-        var gst_value_dom_obj = document.getElementById('gst_value_modal');
-        var gst_value = gst_value_dom_obj.value;
-        console.log('gst_value - ' + gst_value);
-
-        var invoice_amount_dom_obj = document.getElementById('invoice_amount_no_modal');
-        // var invoice_amount = invoice_amount_dom_obj.value();
-        
-        gst_value_dom_obj.value = Math.round((parseFloat(gst_per) / 100 ) * invoice_value);
-        // gst_value_dom_obj.value = ((parseFloat(gst_per) / 100 ) * invoice_value);
-        invoice_amount_dom_obj.value = parseFloat(invoice_value_dom_obj.value) + parseFloat(gst_value_dom_obj.value);
-            if(inv_status_element.value == 'payment_received')
-            {
-                checkInvAmont();
-            }
     }
 
+    function calcGSTValue() {
+        // alert('calcGSTValue');
+        console.log('calcGSTValue called');
+        var inv_status_element = document.getElementById('invoice_status');
 
-}
+        if (inv_status_element.value == 'generated' || inv_status_element.value == 'send' || inv_status_element.value == 'payment_received') {
 
-function disableStatementNo(arr)
-{
-    // JavaScript array with values to disable
-    // const disableValues = arr;
-    const disableIds = arr.map(item => item.stmt_sno);
-    console.log(disableIds);
+            var gst_per = document.getElementById('gst_per_modal').value;
+            console.log('gst_per - ' + gst_per);
 
-    // Get the select element
-    const selectElement = document.getElementById("statement_no");
-    // Variable to track if the first enabled option is selected
-    let firstEnabledOptionSelected = false;
-    // Iterate over the options in the select element
-    Array.from(selectElement.options).forEach(option => {
-        // If the option value is in the disableIds array, disable it
-        console.log(option.value);
-         option.disabled = false;
-         option.style.backgroundColor = "";
-        if (disableIds.includes((option.value))) {
-            option.disabled = true;
-            option.style.backgroundColor = "lightgray";
+            var invoice_value_dom_obj = document.getElementById('invoice_value_modal');
+            var invoice_value = invoice_value_dom_obj.value;
+            console.log('invoice_value - ' + invoice_value);
+
+            var gst_value_dom_obj = document.getElementById('gst_value_modal');
+            var gst_value = gst_value_dom_obj.value;
+            console.log('gst_value - ' + gst_value);
+
+            var invoice_amount_dom_obj = document.getElementById('invoice_amount_no_modal');
+            // var invoice_amount = invoice_amount_dom_obj.value();
+
+            gst_value_dom_obj.value = Math.round((parseFloat(gst_per) / 100) * invoice_value);
+            // gst_value_dom_obj.value = ((parseFloat(gst_per) / 100 ) * invoice_value);
+            invoice_amount_dom_obj.value = parseFloat(invoice_value_dom_obj.value) + parseFloat(gst_value_dom_obj.value);
+            if (inv_status_element.value == 'payment_received') {
+                checkInvAmont();
+            }
         }
-        else if (!firstEnabledOptionSelected && option.value !== "") {
-            // Automatically select the first enabled option
-            option.selected = true;
-            firstEnabledOptionSelected = true;
-        }
-    });
-}
 
-function deleteStatement(id)
-{
-    //alert(id);
-    Swal.fire({
-        title: "Do you want to delete statement & it's invoice data if any?",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#ff3333",
-    }).then((result) => {
 
-        console.log(result);
+    }
 
-        if (result.isConfirmed) {
+    function disableStatementNo(arr) {
+        // JavaScript array with values to disable
+        // const disableValues = arr;
+        const disableIds = arr.map(item => item.stmt_sno);
+        console.log(disableIds);
 
-            $('.loader').fadeIn();
-            $('.loader-mask').fadeIn();
-            var apiURL = 'deleteStatement/' + id;
-            // console.log('Truncate API URL : ', apiURL);
+        // Get the select element
+        const selectElement = document.getElementById("statement_no");
+        // Variable to track if the first enabled option is selected
+        let firstEnabledOptionSelected = false;
+        // Iterate over the options in the select element
+        Array.from(selectElement.options).forEach(option => {
+            // If the option value is in the disableIds array, disable it
+            console.log(option.value);
+            option.disabled = false;
+            option.style.backgroundColor = "";
+            if (disableIds.includes((option.value))) {
+                option.disabled = true;
+                option.style.backgroundColor = "lightgray";
+            } else if (!firstEnabledOptionSelected && option.value !== "") {
+                // Automatically select the first enabled option
+                option.selected = true;
+                firstEnabledOptionSelected = true;
+            }
+        });
+    }
 
-            $.ajax({
-                url: apiURL,
-                method: 'GET',
-                headers: {
-                    "X-Requested-With": "XMLHttpRequest"
-                },
-                success: function(response) {
-                            // console.log('Truncate Response', response)
+    function deleteStatement(id) {
+        //alert(id);
+        Swal.fire({
+            title: "Do you want to delete statement & it's invoice data if any?",
+            showCancelButton: true,
+            confirmButtonText: "Delete",
+            confirmButtonColor: "#ff3333",
+        }).then((result) => {
+
+            console.log(result);
+
+            if (result.isConfirmed) {
+
+                $('.loader').fadeIn();
+                $('.loader-mask').fadeIn();
+                var apiURL = 'deleteStatement/' + id;
+                // console.log('Truncate API URL : ', apiURL);
+
+                $.ajax({
+                    url: apiURL,
+                    method: 'GET',
+                    headers: {
+                        "X-Requested-With": "XMLHttpRequest"
+                    },
+                    success: function(response) {
+                        // console.log('Truncate Response', response)
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(10).fadeOut('slow');
-                    if (response.code === 200 && response.dataStatus === true) {
-                        Swal.fire({
-                            title: "Deleted!",
-                            icon: "success"
-                        });
-                       window.location.reload(true);
-                    }  else {
-                        Swal.fire({
-                            title: "Failed!",
-                            text: 'Something went wrong! Try later',
-                            icon: "error"
-                        });
+                        if (response.code === 200 && response.dataStatus === true) {
+                            Swal.fire({
+                                title: "Deleted!",
+                                icon: "success"
+                            });
+                            window.location.reload(true);
+                        } else {
+                            Swal.fire({
+                                title: "Failed!",
+                                text: 'Something went wrong! Try later',
+                                icon: "error"
+                            });
 
+                            window.location.reload(true);
+                        }
+                    },
+                    error: function(xhr, status, error) {
+
+                        console.error(xhr.responseText);
+                        console.error(status, error);
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(10).fadeOut('slow');
+                        console.error('Error fetching data from API:', error);
+                        toastr.error('Something went wrong! Try later', 'Error');
                         window.location.reload(true);
                     }
-                },
-                error: function(xhr, status, error) {
+                });
+            }
 
-                    console.error(xhr.responseText);
-                    console.error(status, error);
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(10).fadeOut('slow');
-                    console.error('Error fetching data from API:', error);
-                    toastr.error('Something went wrong! Try later', 'Error');
-                    window.location.reload(true);
-                }
-            });
-        }
+        });
 
-    });
+    }
+    // $(document).ready(function() {
+    //     $('#failedSwitch').change(function() {
+    //         if ($(this).prop('checked')) {
+    //             getFailedStatementList();
+    //         } else {
+    //             console.log("Inside Reload Function");
+    //         fetch(window.location.href) // Fetch the current page's content
+    //             .then(response => response.text())
+    //             .then(html => {
+    //             const parser = new DOMParser();
+    //             const doc = parser.parseFromString(html, 'text/html');
+    //             document.body.innerHTML = doc.body.innerHTML; // Replace the body content
+    //             $('.loader').fadeOut();
+    //             $('.loader-mask').delay(100).fadeOut('slow');
+    //             })
+    //             .catch(error => console.error('Error reloading body:', error));
+    //                 }
+    //     });
+    // });
 
-}
-// $(document).ready(function() {
-//     $('#failedSwitch').change(function() {
-//         if ($(this).prop('checked')) {
-//             getFailedStatementList();
-//         } else {
-//             console.log("Inside Reload Function");
-//         fetch(window.location.href) // Fetch the current page's content
-//             .then(response => response.text())
-//             .then(html => {
-//             const parser = new DOMParser();
-//             const doc = parser.parseFromString(html, 'text/html');
-//             document.body.innerHTML = doc.body.innerHTML; // Replace the body content
-//             $('.loader').fadeOut();
-//             $('.loader-mask').delay(100).fadeOut('slow');
-//             })
-//             .catch(error => console.error('Error reloading body:', error));
-//                 }
-//     });
-// });
-
-// function checkSwitchStatus(){
-//     $('#failedSwitch').change(function() {
-//     if ($(this).prop('checked')) {
-//             getFailedStatementList();
-//         } else {
-//             console.log("Inside Reload Function");
-//         fetch(window.location.href) // Fetch the current page's content
-//             .then(response => response.text())
-//             .then(html => {
-//             const parser = new DOMParser();
-//             const doc = parser.parseFromString(html, 'text/html');
-//             document.body.innerHTML = doc.body.innerHTML; // Replace the body content
-//             $('.loader').fadeOut();
-//             $('.loader-mask').delay(250).fadeOut('slow');
-//             })
-//             .catch(error => console.error('Error reloading body:', error));
-//                 }
-//             });
-// }
+    // function checkSwitchStatus(){
+    //     $('#failedSwitch').change(function() {
+    //     if ($(this).prop('checked')) {
+    //             getFailedStatementList();
+    //         } else {
+    //             console.log("Inside Reload Function");
+    //         fetch(window.location.href) // Fetch the current page's content
+    //             .then(response => response.text())
+    //             .then(html => {
+    //             const parser = new DOMParser();
+    //             const doc = parser.parseFromString(html, 'text/html');
+    //             document.body.innerHTML = doc.body.innerHTML; // Replace the body content
+    //             $('.loader').fadeOut();
+    //             $('.loader-mask').delay(250).fadeOut('slow');
+    //             })
+    //             .catch(error => console.error('Error reloading body:', error));
+    //                 }
+    //             });
+    // }
 
 
-// function getFailedStatementList(){
-//     $('.loader').fadeIn();
-//     $('.loader-mask').fadeIn();
-//     $.ajax({
-//         url:'<?= base_url("policy_tranction/statement/failedStatement")?>',
-//         type:'POST',
-//         success:function(response){
-//             console.log(response);
-//             var table = $('#tickets-table').DataTable();
-//             table.clear();
-//             $('#tickets-table').addClass('table-fixed');
-//             var failedList = response.data.insurer_statement_list;
-//             console.log('failed list'+failedList);
-//             failedList.forEach(function(row) {
-//                 var newRow = [
-//                                 '<input type="hidden" class="row-select" data-id="' + row.id + '">',
-//                                 row.short_name + '-' + row.branch_code,
-//                                 formatDate(row.month),
-//                                 row.stmt_sno,
-//                                 row.file_name,
-//                                 row.line_items,
-//                                 row.file_status +
-//                                     (row.file_status == 'failed' ? ' <span class="col-xl-3 col-lg-4 col-sm-6"><i class="fe-alert-circle" data-toggle="modal" data-target="#file-err-modal" data-err="' + row.id + '"></i></span>' : ''),
-//                                 (row.invoice_status ? row.invoice_status : ' - ') +
-//                                     (row.file_status == 'success' ? ' <span class="col-xl-3 col-lg-4 col-sm-6"><i class="fe-alert-circle" data-toggle="tooltip" title="Invoice Amt: ' + (row.invoice_amount || '0.00') + ' Received Amt: ' + (row.received_inv_amt || '0.00') + '"></i></span>' : ''),
-//                                 formatDate(row.created_at) + ' by <br>' + row.first_name,
-//                                 (row.file_status != 'failed' ?
-//                                     '<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>' +
-//                                         '<div class="dropdown-menu dropdown-menu-right">' +
-//                                             '<a class="dropdown-item btnEdit" data-id="' + row.id + '" data-exp-amt="' + row.exp_inv_amt + '" data-received-amt="' + row.received_inv_amt + '" onclick="showInvoiceStatusModal(event)">' +
-//                                                 '<i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Invoice status' +
-//                                             '</a>' +
-//                                             '<a class="dropdown-item btnEdit" data-id="' + row.id + '" onclick="deleteStatement(' + row.id + ')">' +
-//                                                 '<i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete' +
-//                                             '</a>' +
-//                                         '</div>' +
-//                                     '</div>' : '...')
-//                             ];
-
-//                             // Append the new row to the table body
-//                             table.row.add(newRow);
-//                         });
-//                         table.draw();
-//                         table.columns.adjust().draw(); // Ensures correct alignment
-//                         $('.loader').fadeOut();
-//                         $('.loader-mask').delay(250).fadeOut('slow');
-//         },
-//         error: function(xhr, status, error) {
-//                         let message = 'Failed to load Data ';
-//                         toastr.error(response.message, 'Failed');
-//                         $('.loader').fadeOut();
-//             $('.loader-mask').delay(250).fadeOut('slow');
-//         }
-
-//     })
-// }
-// $(document).ready(function() {
-//     var table = $('#tickets-table').DataTable({
-//         // responsive: true, // Ensures table adjusts to smaller screens
-//         stateSave: true, // Saves the table's state
-//     });
-// });
+    // function getFailedStatementList(){
+    //     $('.loader').fadeIn();
+    //     $('.loader-mask').fadeIn();
+    //     $.ajax({
+    //         url:'<?= base_url("policy_tranction/statement/failedStatement") ?>',
+    //         type:'POST',
+    //         success:function(response){
+    //             console.log(response);
+    //             var table = $('#tickets-table').DataTable();
+    //             table.clear();
+    //             $('#tickets-table').addClass('table-fixed');
+    //             var failedList = response.data.insurer_statement_list;
+    //             console.log('failed list'+failedList);
+    //             failedList.forEach(function(row) {
+    //                 var newRow = [
+    //                                 '<input type="hidden" class="row-select" data-id="' + row.id + '">',
+    //                                 row.short_name + '-' + row.branch_code,
+    //                                 formatDate(row.month),
+    //                                 row.stmt_sno,
+    //                                 row.file_name,
+    //                                 row.line_items,
+    //                                 row.file_status +
+    //                                     (row.file_status == 'failed' ? ' <span class="col-xl-3 col-lg-4 col-sm-6"><i class="fe-alert-circle" data-toggle="modal" data-target="#file-err-modal" data-err="' + row.id + '"></i></span>' : ''),
+    //                                 (row.invoice_status ? row.invoice_status : ' - ') +
+    //                                     (row.file_status == 'success' ? ' <span class="col-xl-3 col-lg-4 col-sm-6"><i class="fe-alert-circle" data-toggle="tooltip" title="Invoice Amt: ' + (row.invoice_amount || '0.00') + ' Received Amt: ' + (row.received_inv_amt || '0.00') + '"></i></span>' : ''),
+    //                                 formatDate(row.created_at) + ' by <br>' + row.first_name,
+    //                                 (row.file_status != 'failed' ?
+    //                                     '<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>' +
+    //                                         '<div class="dropdown-menu dropdown-menu-right">' +
+    //                                             '<a class="dropdown-item btnEdit" data-id="' + row.id + '" data-exp-amt="' + row.exp_inv_amt + '" data-received-amt="' + row.received_inv_amt + '" onclick="showInvoiceStatusModal(event)">' +
+    //                                                 '<i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Invoice status' +
+    //                                             '</a>' +
+    //                                             '<a class="dropdown-item btnEdit" data-id="' + row.id + '" onclick="deleteStatement(' + row.id + ')">' +
+    //                                                 '<i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete' +
+    //                                             '</a>' +
+    //                                         '</div>' +
+    //                                     '</div>' : '...')
+    //                             ];
 
+    //                             // Append the new row to the table body
+    //                             table.row.add(newRow);
+    //                         });
+    //                         table.draw();
+    //                         table.columns.adjust().draw(); // Ensures correct alignment
+    //                         $('.loader').fadeOut();
+    //                         $('.loader-mask').delay(250).fadeOut('slow');
+    //         },
+    //         error: function(xhr, status, error) {
+    //                         let message = 'Failed to load Data ';
+    //                         toastr.error(response.message, 'Failed');
+    //                         $('.loader').fadeOut();
+    //             $('.loader-mask').delay(250).fadeOut('slow');
+    //         }
 
+    //     })
+    // }
+    // $(document).ready(function() {
+    //     var table = $('#tickets-table').DataTable({
+    //         // responsive: true, // Ensures table adjusts to smaller screens
+    //         stateSave: true, // Saves the table's state
+    //     });
+    // });
 </script>
 
 <script>
-$(document).ready(function() {
-    // Add custom filter function to DataTables
-    $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
-        const showFailedStatus = $('#statusSwitch').is(':checked');
-        const status = data[6].toLowerCase().trim(); // Index 6 is the file_status column
-        
-        if (showFailedStatus) {
-            return status.includes('failed');
-        } else {
-            return status.includes('success');
-        }
-    });
+    $(document).ready(function() {
+        // Add custom filter function to DataTables
+        $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
+            const showFailedStatus = $('#statusSwitch').is(':checked');
+            const status = data[6].toLowerCase().trim(); // Index 6 is the file_status column
 
-    // Initialize DataTable
-    const table = $('#tickets-table').DataTable({
-        // Your existing DataTable options here
-        "order": [], // Disable initial sorting if needed
-        "pageLength": 10,
-        // "dom": '<"top"lf>rt<"bottom"ip><"clear">', // This places length and filter controls at top
-        "language": {
-            "lengthMenu": "Show _MENU_ entries",
-            "search": "Search:"
-        }
-    });
+            if (showFailedStatus) {
+                return status.includes('failed');
+            } else {
+                return status.includes('success');
+            }
+        });
 
-    // Add event listener for switch changes
-    $('#statusSwitch').on('change', function() {
-        table.draw(); // Redraw the table to apply the filter
-    });
+        // Initialize DataTable
+        const table = $('#tickets-table').DataTable({
+            // Your existing DataTable options here
+            "order": [], // Disable initial sorting if needed
+            "pageLength": 10,
+            // "dom": '<"top"lf>rt<"bottom"ip><"clear">', // This places length and filter controls at top
+            "language": {
+                "lengthMenu": "Show _MENU_ entries",
+                "search": "Search:"
+            }
+        });
 
-    // Trigger initial filter to show only success status
-    table.draw();
-});
+        // Add event listener for switch changes
+        $('#statusSwitch').on('change', function() {
+            table.draw(); // Redraw the table to apply the filter
+        });
+
+        // Trigger initial filter to show only success status
+        table.draw();
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/irba_report.php b/app/Views/irba_report.php
index bb4d0427..56f41f07 100644
--- a/app/Views/irba_report.php
+++ b/app/Views/irba_report.php
@@ -1,68 +1,74 @@
-<div class="row">
-    <div class="col-xl-12">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <!-- <div class="text-center"> -->
-                        <div class="form-row">
-                            <div class="form-group col-md-4" id="date_div">
-                                <label>Date<span class="text-danger"></span></label>
-                                <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                    <span></span> <i class="mdi mdi-menu-down"></i>
+
+
+<div class="container-fluid-min">
+    <div class="col-xl-12" id="outstanding_filter">
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                    <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <!-- <div class="text-center"> -->
+                            <div class="form-row">
+                                <div class="form-group col-md-4" id="date_div">
+                                    <label>Date<span class="text-danger"></span></label>
+                                    <div class="input-icon">
+                                        <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                                    </div>
+                                    <input type="hidden" id="startDate" value=<?= $default_start ?>>
+                                    <input type="hidden" id="endDate" value=<?= $default_end ?>>
                                 </div>
-                                <input type="hidden" id="startDate" value=<?= $default_start ?>>
-                                <input type="hidden" id="endDate" value=<?= $default_end ?>>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Category<span class="text-danger"> *</span></label> <br />
+                                    <select name="category" class="form-control" id="category" required>
+                                        <option value="">Select</option>
+                                        <?php foreach ($categories as $category => $key) : ?>
+                                            <option value="<?= $key ?>"><?= $category ?></option>
+                                        <?php endforeach ?>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-4">
+                                    <label>Report Type<span class="text-danger"> *</span></label> <br />
+                                    <select class="form-control" id="report_type" required>
+                                        <option value="0">Select</option>
+                                        <?php foreach ($report_type as $reports => $key) : ?>
+                                            <option value="<?= $key ?>"><?= $reports ?></option>
+                                        <?php endforeach ?>
+                                    </select>
+                                </div>
+
+
                             </div>
+                            <div class="row justify-content-end">
 
-
-                            <div class="form-group col-md-4">
-                                <label>Category<span class="text-danger"> *</span></label> <br />
-                                <select name="category" class="form-control" id="category" required>
-                                    <option value="">Select</option>
-                                    <?php foreach ($categories as $category => $key) : ?>
-                                        <option value="<?= $key ?>"><?= $category ?></option>
-                                    <?php endforeach ?>
-                                </select>
+                                <div class="col-auto">
+                                    <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page" onclick="fetchReportPage(event);">Submit</a>
+                                </div>
                             </div>
-
-
-                            <div class="form-group col-md-4">
-                                <label>Report Type<span class="text-danger"> *</span></label> <br />
-                                <select class="form-control" id="report_type" required>
-                                    <option value="0">Select</option>
-                                    <?php foreach ($report_type as $reports => $key) : ?>
-                                        <option value="<?= $key ?>"><?= $reports ?></option>
-                                    <?php endforeach ?>
-                                </select>
-                            </div>
-
-
+                            <!-- </div> -->
                         </div>
-                        <div class="row justify-content-end">
-
-                            <div class="col-auto">
-                                <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page" onclick="fetchReportPage(event);">Submit</a>
-                            </div>
-                        </div>
-                        <!-- </div> -->
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-</div>
-<div class="card mb-1">
 
+    </div>
     <div id="report"></div>
 </div>
+
+
+
 <script>
     $(function() {
 
@@ -73,7 +79,7 @@
         var end = moment(end, 'DD/MM/YYYY');
 
         function cb(start, end) {
-            $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
             $('#startDate').val(start.format('DD-MM-YYYY'));
             $('#endDate').val(end.format('DD-MM-YYYY'));
         }
@@ -81,6 +87,9 @@
         $('#reportrange').daterangepicker({
             startDate: start,
             endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
             ranges: {
                 'Today': [moment(), moment()],
                 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
@@ -96,16 +105,16 @@
     });
 </script>
 <script>
-    $('#category').on('click', function(){
+    $('#category').on('click', function() {
 
         var choosed_option = $('#category').val();
         $("#report_type").val('0');
-        if (choosed_option == 'life' ){
-            $("#report_type option[value='insurer']").show();  
-            $("#report_type option[value='bap']").hide();  
-            $("#report_type option[value='bapClient']").hide();  
-            $("#report_type option[value='bapInsurer']").hide();  
-            $("#report_type option[value='client']").show();  
+        if (choosed_option == 'life') {
+            $("#report_type option[value='insurer']").show();
+            $("#report_type option[value='bap']").hide();
+            $("#report_type option[value='bapClient']").hide();
+            $("#report_type option[value='bapInsurer']").hide();
+            $("#report_type option[value='client']").show();
 
         } else if (choosed_option == 'nonLife') {
             $("#report_type option[value='insurer']").show();
@@ -138,11 +147,11 @@
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
 
-            }else{
+            } else {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
                 let message = response.message;
-                toastr.error(message,'ERROR');
+                toastr.error(message, 'ERROR');
             }
 
 
diff --git a/app/Views/irda_bap_client_report_list.php b/app/Views/irda_bap_client_report_list.php
index 69414819..20d18f17 100644
--- a/app/Views/irda_bap_client_report_list.php
+++ b/app/Views/irda_bap_client_report_list.php
@@ -205,24 +205,37 @@ $(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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'IRDA-BAP-CLIENT-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'IRDA-BAP-CLIENT-List',
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                }
-
-            ],
+            buttons: [
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'IRDA-BAP-CLIENT-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        title: 'IRDA-BAP-CLIENT-List',
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        className: 'app-btn-primary ',
+                                    }
+                        ]
+                    }
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
             pageLength: 20, // Set default number of rows per page (optional)
diff --git a/app/Views/irda_bap_insurer_report_list.php b/app/Views/irda_bap_insurer_report_list.php
index 7d9e9773..6d213238 100644
--- a/app/Views/irda_bap_insurer_report_list.php
+++ b/app/Views/irda_bap_insurer_report_list.php
@@ -238,62 +238,128 @@ $(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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'IRDA-BAP-INSURER-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'IRDA-BAP-INSURER-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+            // buttons: [{
+            //         extend: 'csv',
+            //         text: 'CSV',
+            //         title: 'IRDA-BAP-INSURER-List',
+            //     },
+            //     {
+            //         extend: 'excel',
+            //         text: 'Excel',
+            //         title: 'IRDA-BAP-INSURER-List',
+            //         customize: function(xlsx) {
+            //             var sheet = xlsx.xl.worksheets['sheet1.xml'];
+            //             var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                        .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
-                            }
-                        });
+            //             // Find cells in column AB (28th column in Excel)
+            //             $('row c[r^="AB"]', sheet).each(function() {
+            //                 var value = parseFloat($('v', this)
+            //             .text()); // Get the value inside the cell
+            //                 if (!isNaN(value)) {
+            //                     total += value;
+            //                 }
+            //             });
 
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                        2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
+            //             // Get the last row index and append the total row
+            //             var lastRow = $('row:last', sheet);
+            //             var rowIndex = parseInt(lastRow.attr('r')) +
+            //             2; // Find the next row index
+            //             var totalRow = '<row r="' + rowIndex + '">' +
+            //                 '<c t="inlineStr" r="AA' + rowIndex +
+            //                 '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+            //                 '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+            //                 '</v></c>' + // Insert sum in AB
+            //                 '</row>';
 
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    },
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                    customizeData: function(data) {
-                        for (var i = 0; i < data.body.length; i++) {
-                            for (var j = 0; j < data.body[i].length; j++) {
-                                // Check if the column is the 9th index (10th column)
-                                if (j === 9) {
-                                    data.body[i][j] = '\u200C' + data.body[i][j];
-                                }
-                            }
-                        }
+            //             // Append the new total row to the sheet
+            //             $(sheet).find('sheetData').append(totalRow);
+            //         },
+            //         exportOptions: {
+            //             orthogonal: 'sort'
+            //         },
+            //         customizeData: function(data) {
+            //             for (var i = 0; i < data.body.length; i++) {
+            //                 for (var j = 0; j < data.body[i].length; j++) {
+            //                     // Check if the column is the 9th index (10th column)
+            //                     if (j === 9) {
+            //                         data.body[i][j] = '\u200C' + data.body[i][j];
+            //                     }
+            //                 }
+            //             }
+            //         }
+
+            //     }
+
+            // ],
+            buttons: [
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                         title: 'IRDA-BAP-INSURER-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        className: 'app-btn-primary ',
+                                         title: 'IRDA-BAP-INSURER-List',
+                                        customize: function(xlsx) {
+                                            var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                            var total = 0;
+
+                                            // Find cells in column AB (28th column in Excel)
+                                            $('row c[r^="AB"]', sheet).each(function() {
+                                                var value = parseFloat($('v', this)
+                                            .text()); // Get the value inside the cell
+                                                if (!isNaN(value)) {
+                                                    total += value;
+                                                }
+                                            });
+
+                                            // Get the last row index and append the total row
+                                            var lastRow = $('row:last', sheet);
+                                            var rowIndex = parseInt(lastRow.attr('r')) +
+                                            2; // Find the next row index
+                                            var totalRow = '<row r="' + rowIndex + '">' +
+                                                '<c t="inlineStr" r="AA' + rowIndex +
+                                                '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+                                                '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+                                                '</v></c>' + // Insert sum in AB
+                                                '</row>';
+
+                                            // Append the new total row to the sheet
+                                            $(sheet).find('sheetData').append(totalRow);
+                                        },
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        customizeData: function(data) {
+                                            for (var i = 0; i < data.body.length; i++) {
+                                                for (var j = 0; j < data.body[i].length; j++) {
+                                                    // Check if the column is the 9th index (10th column)
+                                                    if (j === 9) {
+                                                        data.body[i][j] = '\u200C' + data.body[i][j];
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                    }
+                        ]
                     }
-
-                }
-
-            ],
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
             pageLength: 20, // Set default number of rows per page (optional)
diff --git a/app/Views/irda_client_report_list.php b/app/Views/irda_client_report_list.php
index e3006e95..d3f7993f 100644
--- a/app/Views/irda_client_report_list.php
+++ b/app/Views/irda_client_report_list.php
@@ -78,62 +78,128 @@ $(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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'IRDA-BAP-CLIENT-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'IRDA-BAP-CLIENT-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+            // buttons: [{
+            //         extend: 'csv',
+            //         text: 'CSV',
+            //         title: 'IRDA-BAP-CLIENT-List',
+            //     },
+            //     {
+            //         extend: 'excel',
+            //         text: 'Excel',
+            //         title: 'IRDA-BAP-CLIENT-List',
+            //         customize: function(xlsx) {
+            //             var sheet = xlsx.xl.worksheets['sheet1.xml'];
+            //             var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                        .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
-                            }
-                        });
+            //             // Find cells in column AB (28th column in Excel)
+            //             $('row c[r^="AB"]', sheet).each(function() {
+            //                 var value = parseFloat($('v', this)
+            //             .text()); // Get the value inside the cell
+            //                 if (!isNaN(value)) {
+            //                     total += value;
+            //                 }
+            //             });
 
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                        2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
+            //             // Get the last row index and append the total row
+            //             var lastRow = $('row:last', sheet);
+            //             var rowIndex = parseInt(lastRow.attr('r')) +
+            //             2; // Find the next row index
+            //             var totalRow = '<row r="' + rowIndex + '">' +
+            //                 '<c t="inlineStr" r="AA' + rowIndex +
+            //                 '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+            //                 '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+            //                 '</v></c>' + // Insert sum in AB
+            //                 '</row>';
 
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    },
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                    customizeData: function(data) {
-                        for (var i = 0; i < data.body.length; i++) {
-                            for (var j = 0; j < data.body[i].length; j++) {
-                                // Check if the column is the 9th index (10th column)
-                                if (j === 9) {
-                                    data.body[i][j] = '\u200C' + data.body[i][j];
-                                }
-                            }
-                        }
+            //             // Append the new total row to the sheet
+            //             $(sheet).find('sheetData').append(totalRow);
+            //         },
+            //         exportOptions: {
+            //             orthogonal: 'sort'
+            //         },
+            //         customizeData: function(data) {
+            //             for (var i = 0; i < data.body.length; i++) {
+            //                 for (var j = 0; j < data.body[i].length; j++) {
+            //                     // Check if the column is the 9th index (10th column)
+            //                     if (j === 9) {
+            //                         data.body[i][j] = '\u200C' + data.body[i][j];
+            //                     }
+            //                 }
+            //             }
+            //         }
+
+            //     }
+
+            // ],
+            buttons: [
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'IRDA-BAP-CLIENT-List',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        title: 'IRDA-BAP-CLIENT-List',
+                                        className: 'app-btn-primary ',
+                                        customize: function(xlsx) {
+                                            var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                            var total = 0;
+
+                                            // Find cells in column AB (28th column in Excel)
+                                            $('row c[r^="AB"]', sheet).each(function() {
+                                                var value = parseFloat($('v', this)
+                                            .text()); // Get the value inside the cell
+                                                if (!isNaN(value)) {
+                                                    total += value;
+                                                }
+                                            });
+
+                                            // Get the last row index and append the total row
+                                            var lastRow = $('row:last', sheet);
+                                            var rowIndex = parseInt(lastRow.attr('r')) +
+                                            2; // Find the next row index
+                                            var totalRow = '<row r="' + rowIndex + '">' +
+                                                '<c t="inlineStr" r="AA' + rowIndex +
+                                                '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+                                                '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+                                                '</v></c>' + // Insert sum in AB
+                                                '</row>';
+
+                                            // Append the new total row to the sheet
+                                            $(sheet).find('sheetData').append(totalRow);
+                                        },
+                                        exportOptions: {
+                                            orthogonal: 'sort'
+                                        },
+                                        customizeData: function(data) {
+                                            for (var i = 0; i < data.body.length; i++) {
+                                                for (var j = 0; j < data.body[i].length; j++) {
+                                                    // Check if the column is the 9th index (10th column)
+                                                    if (j === 9) {
+                                                        data.body[i][j] = '\u200C' + data.body[i][j];
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                    }
+                        ]
                     }
-
-                }
-
-            ],
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
             pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index c1b10112..54339201 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -44,11 +44,11 @@
     <div class="col-12">
         <div class="card">
             <div class="card-body maincard">
-                    <div class="row" style="margin-bottom:1rem;">
+                    <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">KYC</h4>
                         </div>
-                    </div>
+                    </div> -->
                 <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
                     id="tickets-table">
                     <thead class="bg-light">
@@ -175,31 +175,44 @@
  $(document).ready(function(){
 
   $('#tickets-table').DataTable({
-        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-7'p>>" ,
+
+        
         buttons: [
-            {
-                extend: 'csv',
-                text: 'CSV', 
-                title: 'KYCList', 
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                }
-            },
-            {
-                text: 'ADD',
-                className: 'btn btn-color',
-                action: function () {
-                    window.location.href = "<?= base_url("master/kyc/create"); ?>";
-                }
-            }
-        ],
-
-
+                    {
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function(e, dt, node, config) { 
+                            window.location.href = "<?= base_url("master/kyc/create"); ?>";
+                        }
+                    },
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'KYCList', 
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        }
+                                    }
+                        ]
+                    }
+                ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
         },
         paging: true ,
     });
diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php
index d13612f1..eec84a12 100755
--- a/app/Views/kyc_onboarding.php
+++ b/app/Views/kyc_onboarding.php
@@ -1,33 +1,32 @@
 <style>
+    body {
+        .multiselect-native-select {
+            position: relative;
+
+            /* bottom: 32px; */
+            select {
+                border: 0 !important;
+                clip: rect(0 0 0 0) !important;
+                height: 1px !important;
+                margin: -1px -1px -1px -3px !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                position: absolute !important;
+                width: 1px !important;
+                left: 50%;
+                top: 30px;
+            }
+        }
+
+        .multiselect-container {
+            width: 100% !important;
+        }
+
+        .multiselect-selected-text {
+            float: left !important;
+        }
 
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
     }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
 </style>
 
 <div class="row" id="insurer_add">
@@ -50,21 +49,31 @@ body {
                         <a href="<?= base_url("master/kyc/list"); ?>" ><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div>
                 </div> -->
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active-tab active">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="kyc_docs_id">
-                            <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
-                            <span class="d-none d-sm-inline-block">KYC Docs</span>
-                        </a>
-                    </li>
-                </ul>
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active-tab active">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="kyc_docs_id">
+                                <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
+                                <span class="d-none d-sm-inline-block">KYC Docs</span>
+                            </a>
+                        </li>
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
+
                 <div class="tab-content">
                     <?php include('kyc_entity_type_basic_info.php'); ?>
                     <?php include('kyc_docs.php'); ?>
@@ -79,21 +88,23 @@ body {
 <script>
     function policy_type_branch_contact() {
         var check_policy_type_id = $('#kyc_General_PrimaryKey');
-        
+
         console.log(check_policy_type_id.val());
-        if(check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0){
+        if (check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the KYC Entity Type!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('First Add the KYC Entity Type!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
             }
         }
-        
+
     }
 
     document.getElementById("kyc_docs_id").addEventListener("click", function(event) {
         event.preventDefault();
         policy_type_branch_contact();
     });
-</script>
+</script>
\ No newline at end of file
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 3ccd15c4..cf7417e3 100755
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -4,37 +4,35 @@
 
 <?php include(__DIR__ . '/../ticket_type_modal.php'); ?>
 
-
-<!-- Footer Start -->
- <div style="display: block;">
-    <footer class="footer">
-        <div class="container-fluid">
-            <div class="row">
-                <div class="col-md-6">
-                    <script>
-                        document.write(new Date().getFullYear())
-                    </script> &copy; NHANCE
-                </div>
-                <!-- <div class="col-md-6">
-                    <div class="text-md-right footer-links d-none d-sm-block">
-                        <a href="javascript:void(0);">About Us</a>
-                        <a href="javascript:void(0);">Help</a>
-                        <a href="javascript:void(0);">Contact Us</a>
-                    </div>
-                </div> -->
-            </div>
-        </div>
-    </footer>
- </div>
-
-<!-- end Footer -->
-
 </div>
 
 <!-- ============================================================== -->
 <!-- End Page content -->
 <!-- ============================================================== -->
 
+    <!-- Footer Start -->
+    <div style="background-color: white !important;">
+        <footer class="footer" style="background-color: white !important;">
+            <div class="">
+                <div class="row">
+                    <div class="col-md-6">
+                        <script>
+                            document.write(new Date().getFullYear())
+                        </script> &copy; NHANCE
+                    </div>
+                    <!-- <div class="col-md-6">
+                        <div class="text-md-right footer-links d-none d-sm-block">
+                            <a href="javascript:void(0);">About Us</a>
+                            <a href="javascript:void(0);">Help</a>
+                            <a href="javascript:void(0);">Contact Us</a>
+                        </div>
+                    </div> -->
+                </div>
+            </div>
+        </footer>
+    </div>
+    <!-- end Footer -->
+
 
 </div>
 <!-- END wrapper -->
@@ -157,8 +155,43 @@
         "closeButton": true,
     };
 </script>
+<script>
+    $(document).ready(function() {
 
 
+        var pageName = "<?= esc($page_name ?? '') ?>";
+
+        var titleHtml = (pageName && pageName !== "Dashboard") ?
+            `<h3 style="margin-right:5px !important;">${pageName}</h3>` :
+            " ";
+
+        if (pageName && pageName == "Dashboard") {
+            titleHtml = `<h6 style="margin-right:5px !important;">Welcome <?= esc(get_session_userdata()->first_name ?? 'NOT SET') ?></h6>
+                     <h3>Dashboard</h3>`;
+        }
+
+
+        $(".top-navbar-title").html(titleHtml);
+
+
+        $('#collapseOne').on('show.bs.collapse', function() {
+            // When open
+            $('#icon').removeClass('mdi-chevron-down').addClass('mdi-chevron-up');
+            // $('#filterAccordion').removeAttr("style"); // remove bg/border when open
+        });
+
+        $('#collapseOne').on('hide.bs.collapse', function() {
+            // When closed
+            $('#icon').removeClass('mdi-chevron-up').addClass('mdi-chevron-down');
+            // $('#filterAccordion').css({
+            //     "background-color": "#F5FFFF",
+            //     "border": "2px solid #F5FFFF",
+            //     "border-radius": "10px",
+            //     "box-shadow": "0px 4px 4px 0px #00000040"
+            // });
+        });
+    });
+</script>
 <script>
     var pullNotificationCount = 0;
     var pendingActionCount = 0;
@@ -175,7 +208,7 @@
 
                     // console.log('responce', response)
 
-                    if(response.status == false){
+                    if (response.status == false) {
                         $('#notification_count').html('0')
                         console.log('The session is not set correctly. ')
                         return;
@@ -188,7 +221,7 @@
 
                     pullNotificationCount = response.message.length
 
-                    
+
 
                     localStorage.setItem('pullNotificationCount', pullNotificationCount)
 
@@ -332,8 +365,7 @@
                         // console.log(response[key].length)
                         // console.log('type', typeof response[key].length)
                         // console.log('key', response[key])
-                        if(response[key].length != 'undefined' && response[key].length != undefined)
-                        {
+                        if (response[key].length != 'undefined' && response[key].length != undefined) {
                             pendingActionCount = pendingActionCount + response[key].length;
                         }
                     }
@@ -342,7 +374,7 @@
 
                     let messagesList = $('#messages-list-2');
                     messagesList.empty();
-                 
+
 
                     if (response.inception) {
                         $.each(response.inception, function(index, item) {
@@ -405,7 +437,7 @@
                     } else {
                         console.log('response.inception is undefined or null');
                     }
-                    
+
                     if (response.correction) {
                         $.each(response.correction, function(index, item) {
                             if (item.batch_export_count == 0 || item.batch_import_count == 0) {
@@ -476,7 +508,7 @@
 
                             }
                         });
-                    }else{
+                    } else {
                         console.log('response.correction is undefined or null');
                     }
 
@@ -554,7 +586,7 @@
                             }
 
                         });
-                    }else{
+                    } else {
                         console.log('response.deletion is undefined or null');
 
                     }
@@ -564,46 +596,46 @@
                             if (item.batch_export_count == 0 || item.batch_import_count == 0) {
 
 
-                                    var queryParams = {
-                                        client_id: item.client_id,
-                                        client_policy_id: item.client_policy_id,
-                                        client_branch_id: item.branch_id,
-                                        event: 'si_enhancement',
-                                        actions: 'export',
-                                        insurer_or_tpa: 'tpa',
-                                    };
+                                var queryParams = {
+                                    client_id: item.client_id,
+                                    client_policy_id: item.client_policy_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'si_enhancement',
+                                    actions: 'export',
+                                    insurer_or_tpa: 'tpa',
+                                };
 
-                                    const queryString = objectToQueryString(queryParams);
+                                const queryString = objectToQueryString(queryParams);
 
-                                    var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                                    ////console.log(url)
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                ////console.log(url)
 
 
-                                    var toast_body_css = 'background : #bfd7eb !important;';
-                                    var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
-                                    var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
-                                    var toast_status_word = 'Info';
-                                    var title = 'SI Enhancement Pending';
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+                                var title = 'SI Enhancement Pending';
 
 
-                                    if (!item.branch_name.toLowerCase().includes('branch')) {
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
 
-                                        //console.log(item.branch_name)
-                                        item.branch_name += ' branch';
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
 
-                                    }
+                                }
 
-                                    ////console.log(item.branch_name);
+                                ////console.log(item.branch_name);
 
-                                    // if (item.batch_export_count > 0) {
+                                // if (item.batch_export_count > 0) {
 
-                                    //     title = 'SI Enhancement Import Pending';
-                                    // }
+                                //     title = 'SI Enhancement Import Pending';
+                                // }
 
-                                    var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
-                                    ////console.log(toast_body_data);
+                                var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                                ////console.log(toast_body_data);
 
-                                    var html = ` <li data-id="" data-url="${url}">
+                                var html = ` <li data-id="" data-url="${url}">
                                                 <div class="p-3">
                                                     <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
                                                         <div class="toast-header " style="${toast_head_css}" >
@@ -625,12 +657,12 @@
                                             </li>`
 
 
-                                    messagesList.append(html);
+                                messagesList.append(html);
 
-                                }
+                            }
 
-                            });
-                    }else{
+                        });
+                    } else {
                         console.log('response.si_enhancement is undefined or null');
 
                     }
@@ -665,7 +697,7 @@
 
                                     //console.log(item.branch_name)
                                     item.branch_name += ' branch';
-                                    
+
                                 }
 
                                 ////console.log(item.branch_name);
@@ -704,7 +736,7 @@
 
                             }
                         });
-                    }else{
+                    } else {
                         console.log('response.tpa is undefined or null');
 
                     }
@@ -713,46 +745,46 @@
                         $.each(response.uhid, function(index, item) {
                             if (item.batch_export_count == 0 || item.batch_import_count == 0) {
 
-                                    var queryParams = {
+                                var queryParams = {
 
-                                        client_id: item.client_id,
-                                        client_policy_id: item.client_policy_id,
-                                        client_branch_id: item.branch_id,
-                                        event: 'inception',
-                                        insurer_or_tpa: 'insurer',
-                                        actions: 'export',
-                                    };
+                                    client_id: item.client_id,
+                                    client_policy_id: item.client_policy_id,
+                                    client_branch_id: item.branch_id,
+                                    event: 'inception',
+                                    insurer_or_tpa: 'insurer',
+                                    actions: 'export',
+                                };
 
-                                    const queryString = objectToQueryString(queryParams);
+                                const queryString = objectToQueryString(queryParams);
 
-                                    var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
-                                    //console.log(url)
+                                var url = 'employee/upload?' + queryString + '#KYC-DOC-tab'
+                                //console.log(url)
 
-                                    var toast_body_css = 'background : #bfd7eb !important;';
-                                    var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
-                                    var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
-                                    var toast_status_word = 'Info';
-                                    var title = 'Insurer Pending';
+                                var toast_body_css = 'background : #bfd7eb !important;';
+                                var toast_head_css = 'background-color : rgb(2, 168, 181) !important; color :#000; border-bottom: 0;';
+                                var toast_icon = 'mdi mdi-checkbox-marked-circle mr-auto';
+                                var toast_status_word = 'Info';
+                                var title = 'Insurer Pending';
 
 
-                                    if (!item.branch_name.toLowerCase().includes('branch')) {
+                                if (!item.branch_name.toLowerCase().includes('branch')) {
 
-                                        //console.log(item.branch_name)
-                                        item.branch_name += ' branch';
+                                    //console.log(item.branch_name)
+                                    item.branch_name += ' branch';
 
-                                    }
+                                }
 
-                                    ////console.log(item.branch_name);
+                                ////console.log(item.branch_name);
 
-                                    // if (item.batch_export_count > 0) {
+                                // if (item.batch_export_count > 0) {
 
-                                    //     title = 'Insurer Import Pending';
-                                    // }
+                                //     title = 'Insurer Import Pending';
+                                // }
 
-                                    var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
-                                    ////console.log(toast_body_data);
+                                var toast_body_data = item.client_name + '( ' + item.branch_name + ' ) ' + ' - ' + item.policy_name;
+                                ////console.log(toast_body_data);
 
-                                    var html = ` <li data-id="" data-url="${url}">
+                                var html = ` <li data-id="" data-url="${url}">
                                                 <div class="p-3">
                                                     <div class="toast fade show" role="alert" aria-live="assertive" aria-atomic="true" data-toggle="toast">
                                                         <div class="toast-header " style="${toast_head_css}" >
@@ -774,11 +806,11 @@
                                             </li>`
 
 
-                                    messagesList.append(html);
+                                messagesList.append(html);
 
                             }
                         });
-                    }else{
+                    } else {
                         console.log('response.uhid is undefined or null');
                     }
                     localStorage.setItem('pendingActionCount', pendingActionCount)
@@ -826,9 +858,7 @@
 
 
 <script>
-
-    function formatDate(dateString) 
-    {
+    function formatDate(dateString) {
         // Parse the input date string
         let date = new Date(dateString);
 
@@ -856,8 +886,7 @@
         return formattedDate;
     }
 
-    function printCurrentTime() 
-    {
+    function printCurrentTime() {
         var now = new Date();
         var hours = now.getHours().toString().padStart(2, '0');
         var minutes = now.getMinutes().toString().padStart(2, '0');
@@ -867,163 +896,256 @@
 
         return currentTime;
     }
-
 </script>
 
 <script>
-
-function checkDuplicateTableFieldValue(tableName, fieldName, value, callback) {
-    $.ajax({
-        url: '<?= base_url('util/checkDuplicateTableFieldValue') ?>', // Adjust this to your endpoint in CodeIgniter
-        type: 'POST',
-        data: {
-            table: tableName,
-            field: fieldName,
-            value: value
-        },
-        dataType: 'json',
-        success: function(response) {
-            if (typeof callback === 'function') {
-                callback(response.isDuplicate); // Pass the result to the callback
-            }
-        },
-        error: function(xhr, status, error) {
-            console.error('AJAX Error:', error);
-        }
-    });
-}
-
-function sendAjaxRequestForGlobal(url, method, data = {}, successCallback = null, errorCallback = null) {
-    $.ajax({
-        url: url,
-        method: method,
-        data: data,
-        dataType: 'json', // Expected response type
-        success: function(response) {
-            // If a success callback is provided, call it with the response
-            if (successCallback) {
-                successCallback(response);
-            }
-        },
-        error: function(xhr, status, error) {
-            // Handle errors if provided error callback
-            if (errorCallback) {
-                errorCallback(xhr, status, error);
-            } else {
+    function checkDuplicateTableFieldValue(tableName, fieldName, value, callback) {
+        $.ajax({
+            url: '<?= base_url('util/checkDuplicateTableFieldValue') ?>', // Adjust this to your endpoint in CodeIgniter
+            type: 'POST',
+            data: {
+                table: tableName,
+                field: fieldName,
+                value: value
+            },
+            dataType: 'json',
+            success: function(response) {
+                if (typeof callback === 'function') {
+                    callback(response.isDuplicate); // Pass the result to the callback
+                }
+            },
+            error: function(xhr, status, error) {
                 console.error('AJAX Error:', error);
             }
-        }
-    });
-}
-
-function confirmActionSweertAlert(message = "Are you sure?", confirmText = "Yes, Proceed!", cancelText = "Cancel", icon = "warning") {
-    return Swal.fire({
-        title: message,
-        icon: icon,
-        showCancelButton: true,
-        confirmButtonColor: "#3085d6",
-        cancelButtonColor: "#d33",
-        confirmButtonText: confirmText,
-        cancelButtonText: cancelText
-    }).then((result) => {
-        return result.isConfirmed; // Returns true if confirmed, false otherwise
-    });
-}
+        });
+    }
 
+    function sendAjaxRequestForGlobal(url, method, data = {}, successCallback = null, errorCallback = null) {
+        $.ajax({
+            url: url,
+            method: method,
+            data: data,
+            dataType: 'json', // Expected response type
+            success: function(response) {
+                // If a success callback is provided, call it with the response
+                if (successCallback) {
+                    successCallback(response);
+                }
+            },
+            error: function(xhr, status, error) {
+                // Handle errors if provided error callback
+                if (errorCallback) {
+                    errorCallback(xhr, status, error);
+                } else {
+                    console.error('AJAX Error:', error);
+                }
+            }
+        });
+    }
 
+    function confirmActionSweertAlert(message = "Are you sure?", confirmText = "Yes, Proceed!", cancelText = "Cancel", icon = "warning") {
+        return Swal.fire({
+            title: message,
+            icon: icon,
+            showCancelButton: true,
+            confirmButtonColor: "#3085d6",
+            cancelButtonColor: "#d33",
+            confirmButtonText: confirmText,
+            cancelButtonText: cancelText
+        }).then((result) => {
+            return result.isConfirmed; // Returns true if confirmed, false otherwise
+        });
+    }
 </script>
 
 <script>
-        function restoreDashboardHistoryIfNeeded() {
+    function restoreDashboardHistoryIfNeeded() {
 
-            const dashboardHistoryString = localStorage.getItem('dashboardHistory');
+        const dashboardHistoryString = localStorage.getItem('dashboardHistory');
 
-            if (!dashboardHistoryString) {
-                console.log("dashboardHistory not found");
-                return;
-            }
-
-            const dashboardHistory = JSON.parse(dashboardHistoryString);
-
-            if (window.location.href === dashboardHistory.dashboard_url) {
-                const tabSelector = dashboardHistory.tab;
-                if (tabSelector) {
-                    const tabElement = document.querySelector(`a[href="${tabSelector}"]`);
-                    if (tabElement) {
-                        tabElement.click();
-                    }
-                }
-
-                const functionName = dashboardHistory.function_name;
-                const params = dashboardHistory.tile_params;
-
-                if (functionName && typeof window[functionName] === 'function') {
-                    if(params.majorType == 0 && params.minorType == 0){
-                        window[functionName]();
-                    }else{
-                        window[functionName](params.majorType, params.minorType);
-                    }
-                    
-                }
-
-                console.log("inside location match");
-            }
+        if (!dashboardHistoryString) {
+            console.log("dashboardHistory not found");
+            return;
         }
 
-        // Run on popstate (back/forward buttons)
-        window.addEventListener('popstate', restoreDashboardHistoryIfNeeded);
+        const dashboardHistory = JSON.parse(dashboardHistoryString);
 
-        // Run on page load (refresh)
-        window.addEventListener('DOMContentLoaded', () => {
-            // slight delay ensures DOM/tab loads completely
-            setTimeout(restoreDashboardHistoryIfNeeded, 100);
-        });
+        if (window.location.href === dashboardHistory.dashboard_url) {
+            const tabSelector = dashboardHistory.tab;
+            if (tabSelector) {
+                const tabElement = document.querySelector(`a[href="${tabSelector}"]`);
+                if (tabElement) {
+                    tabElement.click();
+                }
+            }
 
+            const functionName = dashboardHistory.function_name;
+            const params = dashboardHistory.tile_params;
+
+            if (functionName && typeof window[functionName] === 'function') {
+                if (params.majorType == 0 && params.minorType == 0) {
+                    window[functionName]();
+                } else {
+                    window[functionName](params.majorType, params.minorType);
+                }
+
+            }
+
+            console.log("inside location match");
+        }
+    }
+
+    // Run on popstate (back/forward buttons)
+    window.addEventListener('popstate', restoreDashboardHistoryIfNeeded);
+
+    // Run on page load (refresh)
+    window.addEventListener('DOMContentLoaded', () => {
+        // slight delay ensures DOM/tab loads completely
+        setTimeout(restoreDashboardHistoryIfNeeded, 100);
+    });
 </script>
 
 <script>
     $(document).ready(function() {
-        $('.img-inactive').on('click', function() {
+        const activeItem = localStorage.getItem("activeLi");
+        if (activeItem) {
+            $('.li-seperate a').removeClass('img-active').addClass('img-inactive');
+            $('#' + activeItem).children('a').first().removeClass('img-inactive').addClass('img-active');
+        }
+
+        $('.li-seperate').on('click', function() {
+            // reset all anchors
+            $('.li-seperate a').removeClass('img-active').addClass('img-inactive');
+
+            // only the immediate <a> inside this <li>
+            $(this).children('a').first().removeClass('img-inactive').addClass('img-active');
+
+            localStorage.setItem("activeLi", $(this).attr("id"));
+        });
+    });
+</script>
+
+
+<script>
+    $(document).ready(function() {
+        $('.nav-link').click(function() {
+
+            // change bg color of tab
+            $('.nav-link').removeClass('active-tab');
+            $(this).addClass('active-tab');
+
+
+
+        });
+    });
+
+    $(document).ready(function() {
+        // find all nav anchors
+        let $nav = $("ul.nav.nav-pills.navtab-bg");
+
+        // check if no anchor has active classes
+        if ($nav.find("a.active.active-tab").length === 0) {
+            // add classes to the first anchor
+            $nav.find("li:first-child a").addClass("active active-tab");
+
+            // also need to find the tab name and show only active image
+            let tab_name = $nav.find("li:first-child a").attr('href').split('-')[0];
+            tab_name = tab_name.replace('#', '');
+
+
+            switch (tab_name) {
+                case "leads":
+                    $('.active_leads').show();
+                    $('.inactive_leads').hide();
+                    break;
+                case "bds":
+                    $('.active_bds').show();
+                    $('.inactive_bds').hide();
+                    break;
+                case "claims":
+                    $('.active_claims').show();
+                    $('.inactive_claims').hide();
+                    break;
+                case "pending":
+                    $('.active_pending').show();
+                    $('.inactive_pending').hide();
+                    break;
+                default:
+                    break;
+            }
+
+        }
+    });
+
+$(function(){
+    let $nav = $("#myTab");
+
+    $(".left-btn").on("click", function(){
+        $nav.stop().animate({ scrollLeft: $nav.scrollLeft() - 150 }, 200);
+    });
+
+    $(".right-btn").on("click", function(){
+        $nav.stop().animate({ scrollLeft: $nav.scrollLeft() + 150 }, 200);
+    });
+});
+
+
+    // function openModal(modalId) {
+    //     console.log('openModal called with ID:', modalId);
+    //     var modalEl = document.getElementById(modalId);
+
+    //     if (typeof bootstrap !== "undefined" && bootstrap.Modal && typeof bootstrap.Modal.getOrCreateInstance === "function") {
+    //         // ✅ Bootstrap 5
+    //         var modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+    //         modal.show();
+    //     } else if (typeof $ !== "undefined" && typeof $.fn.modal === "function") {
+    //         // ✅ Bootstrap 4
+    //         $('#' + modalId).modal('show');
+    //     } else {
+    //         console.error("No compatible Bootstrap modal found.");
+    //     }
+    // }
+</script>
+
+
+<script>
+        $(document).ready(function(){
+        $('.nav-link').click(function(){
+
+        // change bg color of tab
+            $('.nav-link').removeClass('active-tab');
+            $(this).addClass('active-tab');
+        
+
 
-            $('.img-c').addClass('img-inactive');
-            $(this).removeClass('.img-inactive');
-            $(this).addClass('.img-active');
         });
     });
 </script>
 
 <script>
-$(document).ready(function(){
-    $('.nav-link').click(function(){
+    function closeModalById(modalId) {
+        // Get the modal element
+        var modal = document.getElementById(modalId);
+        if (!modal) return; // Exit if no modal found
 
-    // change bg color of tab
-        $('.nav-link').removeClass('active-tab');
-        $(this).addClass('active-tab');
-    
+        // Hide it by removing "show" or "in" classes and setting display:none
+        modal.style.display = 'none';
+        modal.classList.remove('in', 'show'); // 'in' for BS3, 'show' for BS4/5
+        modal.setAttribute('aria-hidden', 'true');
+        modal.removeAttribute('aria-modal'); // optional
+        modal.removeAttribute('role'); // optional
 
+        // Remove backdrop if present
+        var backdrop = document.querySelector('.modal-backdrop');
+        if (backdrop) backdrop.remove();
 
-    });
-});
-
-function openModal(modalId) {
-    var modalEl = document.getElementById(modalId);
-
-    if (typeof bootstrap !== "undefined" && bootstrap.Modal) {
-        // Bootstrap 5
-        var modal = bootstrap.Modal.getOrCreateInstance(modalEl);
-        modal.show();
-    } else if (typeof $ !== "undefined" && typeof $.fn.modal === "function") {
-        // Bootstrap 4
-        $('#' + modalId).modal('show');
-    } else {
-        console.error("No compatible Bootstrap modal found.");
+        // Allow page scrolling again
+        document.body.classList.remove('modal-open');
     }
-}
 
 </script>
 
 
 </body>
 
-</html>
-
+</html>
\ No newline at end of file
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 8857a211..ca5466ba 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -4,7 +4,7 @@
 <head>
 
     <meta charset="utf-8" />
-    <title><?= isset($page_name) ? $page_name : 'NHance'; ?></title>
+    <title><?= isset($tab_name) ? $tab_name : 'NHance'; ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta content="" name="description" />
     <meta content="NHANCE" name="NHANCE" />
@@ -129,31 +129,51 @@
         }
 
         .container-fluid {
+            padding: 0px 20px 0px 20px !important;
+        }
+
+        .container-fluid-top {
             padding: 0px 40px 0px 40px !important;
         }
 
-        body[data-sidebar-size=condensed]:not([data-layout=compact]):not(.auth-fluid-pages)
-        {
-                min-height: 100vh !important;
-        }   
+        body[data-sidebar-size=condensed]:not([data-layout=compact]):not(.auth-fluid-pages) {
+            min-height: 100vh !important;
+        }
 
+        body .content-page {
+            margin-top: 90px !important;
+        }
     </style>
 
     <!-- navbar -->
     <style>
+        .nav-bar {
+            position: fixed !important;
+            z-index: 2;
+            width: 90%;
+            margin-left: 120px !important;
+            background: #fff;
+        }
+
+        .top-navbar-div {
+            display: flex;
+            flex-flow: row;
+            flex-shrink: 1 !important;
+            justify-content: space-between;
+            margin-top: 20px;
+            margin-left: 15px;
+        }
+
+
         .ul-flex {
             display: flex;
             flex-flow: column nowrap;
             justify-content: center;
             align-content: space-evenly;
+            flex-shrink: 1;
         }
 
-        .top-navbar-div {
-            display: flex;
-            flex-flow: row nowrap;
-            justify-content: space-between;
-            margin-top: 20px;
-        }
+
 
         .nav-flex {
             display: flex;
@@ -165,6 +185,60 @@
         }
     </style>
 
+    <!-- tab-switch -->
+    <style>
+        .nav-pills,
+        .nav-link {
+            background-color: #F5FFFF !important;
+            color: #00999E !important;
+            border-radius: 10px;
+
+        }
+
+        .nav-pills {
+            background-color: #F5FFFF !important;
+            color: #00999E !important;
+            box-shadow: 0px 2px 4px 0px #00000040;
+            padding-top: 5px;
+        }
+
+        .nav-pills.nav-dash {
+            background-color: white !important;
+            box-shadow: none !important;
+        }
+
+        .nav-pills .nav-dash {
+            background-color: #D4F5F6 !important;
+            border-radius: 10px;
+            color: black !important;
+        }
+
+
+        .nav-link.active-tab {
+            color: white !important;
+            background-color: #00999E !important;
+            font-size: small !important;
+            padding: 8px 16px;
+            border-radius: 10px !important;
+            box-shadow: 0px 2px 4px 0px #00000040;
+
+        }
+
+        .nav-link-btn {
+            color: white !important;
+            background-color: #00999E !important;
+            font-size: small !important;
+            padding: 8px 16px;
+            border-radius: 10px !important;
+        }
+
+        .navtab-bg .nav-link {
+            margin: 5px !important;
+        }
+    </style>
+
+
+
     <!-- sidebar -->
     <style>
         #side-menu .menu-logo a:hover {
@@ -187,8 +261,47 @@
             border-radius: 25px;
             background-color: #D4F5F6;
             z-index: 700;
-            padding: 0px !important;
+            padding: 0 !important;
             height: 90% !important;
+            display: flex;
+            flex-flow: column wrap;
+        }
+
+        /* every <li> inside should be allowed to shrink */
+        .left-side-menu li {
+            flex-shrink: 1 !important;
+            min-height: 0 !important;
+            /* prevents flex bugs */
+        }
+
+        .left-side-menu ul li:hover>ul {
+            position: relative;
+            z-index: 99999 !important;
+        }
+
+
+
+        .img-inactive {
+            background-color: white;
+            margin: 0px 12px;
+            border-radius: 5px;
+            border: 1px solid white;
+            padding: 8px !important;
+            min-height: 43px !important;
+        }
+
+
+        .li-seperate {
+            margin: 10px 0px;
+        }
+
+        .img-active {
+            background-color: #B7F0F2;
+            margin: 0px 12px;
+            border-radius: 5px;
+            border: 2px solid #00999E;
+            padding: 8px !important;
+            min-height: 43px !important;
         }
     </style>
 
@@ -228,36 +341,6 @@
             font-weight: 600 !important;
         }
 
-        .nav-link {
-            color: black !important;
-            background-color: #D4F5F6 !important;
-            font-size: small !important;
-            padding: 8px;
-            border-radius: 10px !important;
-            padding: 8px 16px;
-
-        }
-
-        .nav-link-btn {
-            color: white !important;
-            background-color: #00999E !important;
-            font-size: small !important;
-            padding: 8px 16px;
-            border-radius: 10px !important;
-        }
-
-        .nav-link.active-tab {
-            color: white !important;
-            background-color: #00999E !important;
-            font-size: small !important;
-            padding: 8px 16px;
-            border-radius: 10px !important;
-
-        }
-
-        .navtab-bg .nav-link {
-            margin: 0 5px 10px !important;
-        }
 
 
         .navbar-custom {
@@ -336,18 +419,7 @@
         /* end of loaders */
     </style>
 
-    <!-- parsley-examples section starts  -->
-    <style>
-        /* .parsley-examples 
-        {
-            background-color: #F5FFFF;
-            padding: 25px;
-            border: 2px solid #F5FFFF;
-            border-radius: 10px;
-            box-shadow: 0px 1px 1px 0px #00000040;
-        } 
-        */
-    </style>
+
 
     <!-- ticket list specific code -->
     <style>
@@ -386,49 +458,29 @@
             font-size: 12px;
         }
 
-
-        .title-text {
-            font-weight: 500;
-            font-style: normal;
-            font-size: 30px;
-            line-height: 1;
-            letter-spacing: 0;
-            color: black;
+        .secondary-title {
+            margin-left: 26px;
+            display: flex;
+            align-items: center;
         }
 
-        .sub-title-text {
-            font-weight: 500;
-            font-style: normal;
-            font-size: 18px;
-            line-height: 1;
-            letter-spacing: 0;
-            color: black;
+        .secondary-title i {
+            font-size: 43px;
+        }
+
+        .secondary-title span {
+            position: relative;
         }
 
         .font-color-black {
             color: black;
         }
 
-        .app-text-left {
-            text-align: left !important;
-        }
-
-        .app-text-right {
-            text-align: right !important;
-        }
-
-        .app-text-center {
-            text-align: center !important;
-        }
 
         .app-text-white {
             color: #ffffff !important;
         }
 
-        .app-text-black {
-            color: #000000 !important;
-        }
-
         .app-text-grey {
             color: #5D5D5D !important;
         }
@@ -672,30 +724,10 @@
         }
     </style>
 
-    <!-- img active inactive -->
-    <style>
-        .img-inactive {
-            background-color: white;
-            margin: 10px 12px;
-            border-radius: 5px;
-            border: 4px solid white;
-            padding: 8px !important;
-            min-height: 43px !important;
-        }
-
-        .img-active {
-            background-color: #B7F0F2;
-            margin: 10px 12px;
-            border-radius: 5px;
-            border: 4px solid #00999E;
-            padding: 8px !important;
-            min-height: 43px !important;
-        }
-    </style>
-
     <!-- table section starts -->
     <style>
-        table[data-custom-table-css="table"] thead th {
+        table[data-custom-table-css="table"] thead th,
+        table[data-custom-table-css="second-table"] thead th {
             background-color: #00999E;
             color: #fff !important;
             border-top: 0px solid #fff !important;
@@ -713,31 +745,37 @@
             font-weight: 400 !important;
         }
 
-        table[data-custom-table-css="table"] thead th:first-child {
+        table[data-custom-table-css="table"] thead th:first-child,
+        table[data-custom-table-css="second-table"] thead th:first-child {
             border-top-left-radius: 15px !important;
             border-bottom-left-radius: 15px !important;
         }
 
-        table[data-custom-table-css="table"] thead th:last-child {
+        table[data-custom-table-css="table"] thead th:last-child,
+        table[data-custom-table-css="second-table"] thead th:last-child {
             border-top-right-radius: 15px !important;
             border-bottom-right-radius: 15px !important;
         }
 
-        table[data-custom-table-css="table"] tbody tr td:first-child {
+        table[data-custom-table-css="table"] tbody tr td:first-child,
+        table[data-custom-table-css="second-table"] tbody tr td:first-child {
             border-top-left-radius: 15px !important;
             border-bottom-left-radius: 15px !important;
         }
 
-        table[data-custom-table-css="table"] tbody tr td:last-child {
+        table[data-custom-table-css="table"] tbody tr td:last-child,
+        table[data-custom-table-css="second-table"] tbody tr td:last-child {
             border-top-right-radius: 15px !important;
             border-bottom-right-radius: 15px !important;
         }
 
-        table[data-custom-table-css="table"] tbody tr:hover td {
+        table[data-custom-table-css="table"] tbody tr:hover td,
+        table[data-custom-table-css="second-table"] tbody tr:hover td {
             background-color: #e0e0e0;
         }
 
-        table[data-custom-table-css="table"] {
+        table[data-custom-table-css="table"],
+        table[data-custom-table-css="second-table"] {
             border-collapse: separate !important;
             border-spacing: 0 8px !important;
             width: 100% !important;
@@ -746,6 +784,20 @@
         table[data-custom-table-css="table"].dataTable thead th {
             padding: 15px !important;
         }
+
+        table[data-custom-table-css="table"] thead.bg-light {
+            background-color: transparent !important;
+        }
+
+
+        /* ========== SECOND TABLE (white rows) ========== */
+        table[data-custom-table-css="second-table"] tbody td {
+            background: #FFFFFF !important;
+            padding: 12px;
+            border-top: 0px solid #fff !important;
+            border-bottom: 2px solid #F0F0F0 !important;
+            font-weight: 400 !important;
+        }
     </style>
 
     <!-- Datatable section starts  -->
@@ -824,6 +876,87 @@
         .buttons-html5 {
             margin-right: 10px !important;
         }
+
+        .dataTables_scrollBody thead.bg-light tr,
+        .dataTables_scrollBody thead tr {
+            visibility: collapse !important;
+            /* hides + removes row space */
+            height: 0 !important;
+        }
+
+        .dataTables_scrollBody thead.bg-light th {
+            padding: 0 !important;
+            margin: 0 !important;
+            border: none !important;
+            height: 0 !important;
+            line-height: 0 !important;
+            overflow: hidden !important;
+        }
+
+
+
+        /* Wrapper around the search input */
+        .datatable-search-wrapper {
+            position: relative;
+            display: inline-block;
+            width: 100%;
+        }
+
+        /* The search input itself */
+        .dataTables_filter input {
+            background: #F0F0F0 !important;
+            color: #707070 !important;
+            font-weight: 400 !important;
+            box-shadow: 0px 2px 4px 0px #00000024 !important;
+            border-color: #F0F0F0 !important;
+            margin-left: 1px !important;
+        }
+
+        /* Placeholder styling */
+        .dataTables_filter input::placeholder {
+            color: #707070 !important;
+            font-weight: 400 !important;
+        }
+
+        /* The magnify icon */
+        .datatable-search-icon {
+            position: absolute !important;
+            right: 12px !important;
+            top: 50% !important;
+            transform: translateY(-50%) !important;
+            color: #707070 !important;
+            font-size: 18px !important;
+            pointer-events: none;
+            /* prevents blocking typing */
+        }
+
+        .datatable-search {
+            margin-right: auto;
+        }
+
+        .datatable-buttons {
+            margin-left: auto;
+        }
+
+        /* Fix DataTables buttons alignment inside card-body */
+        .card-body .card-body .dt-buttons,
+        .card-body .card-body .datatable-buttons {
+            margin-right: 0 !important;
+            padding-right: 2.25rem !important;
+            /* match card-body padding */
+        }
+
+        /* Applies only to tables with data-custom-table-css="table" */
+        table[data-custom-table-css="table"] tbody tr td {
+            padding: 8px 10px !important;
+            /* spacing */
+            line-height: 20px;
+            /* consistent spacing for text */
+            min-height: 40px;
+            /* makes sense here if you use display:block */
+            vertical-align: middle;
+            /* aligns text properly */
+        }
     </style>
 
 
@@ -981,10 +1114,84 @@
 
     <!-- jodit section -->
     <style>
-        /********************************************************************* jodit section starts ***********************************************************************************************************/
+        /* ✅ Whole editor box */
+        .jodit {
+            border-radius: 10px;
+            box-shadow: 0px 2px 2px 0px #00000040;
+            overflow: hidden;
+            background-color: #F5FFFF !important;
+            /* fallback */
+        }
 
-        .jodit-wysiwyg {
-            color: black;
+        /* ✅ Toolbar (header) */
+        .jodit .jodit-toolbar__box,
+        .jodit .jodit-toolbar-editor-collection {
+            background-color: #F5FFFF !important;
+            border: none !important;
+        }
+
+        /* ✅ Footer / status bar */
+        .jodit .jodit-status-bar {
+            background-color: #F5FFFF !important;
+            border-top: 1px solid #ddd;
+            /* optional: keep a light separator */
+        }
+
+        /* ✅ Editable content (div mode) */
+        .jodit .jodit-wysiwyg {
+            background-color: #F5FFFF !important;
+            color: black !important;
+            padding: 10px;
+        }
+
+        /* ✅ Editable content (iframe mode) */
+        .jodit iframe {
+            background-color: #F5FFFF !important;
+            border-radius: 0 0 10px 10px;
+        }
+    </style>
+
+    <!-- jodit section inside modal -->
+    <style>
+        /* ✅ Whole editor box */
+        .modal .jodit {
+            border-radius: 10px;
+            box-shadow: 0px 2px 2px 0px #00000040;
+            overflow: hidden;
+            background-color: #ECECEC !important;
+            /* fallback */
+        }
+
+        .modal .jodit p {
+            background-color: #ECECEC !important;
+            /* fallback */
+        }
+
+        /* ✅ Toolbar (header) */
+        .modal .jodit .jodit-toolbar__box,
+        .modal .jodit .jodit-toolbar-editor-collection {
+            background-color: #ECECEC !important;
+            border: none !important;
+        }
+
+        /* ✅ Footer / status bar */
+        .modal .jodit .jodit-status-bar {
+            background-color: #ECECEC !important;
+            border-top: 1px solid #ddd;
+            /* optional: keep a light separator */
+        }
+
+        /* ✅ Editable content (div mode) */
+        .modal .jodit .jodit-wysiwyg {
+            background-color: #ECECEC !important;
+            color: black !important;
+            padding: 10px;
+        }
+
+        /* ✅ Editable content (iframe mode) */
+        .modal .jodit iframe {
+            background-color: #ECECEC !important;
+            border-radius: 0 0 10px 10px;
         }
     </style>
 
@@ -1023,6 +1230,10 @@
             border-color: #F5FFFF !important;
         }
 
+        .select2 textarea {
+            box-shadow: none !important;
+        }
+
 
 
         /* Chrome, Edge, Safari */
@@ -1044,10 +1255,14 @@
 
         /* Cancel Bootstrap's .form-control for file inputs */
         input[type="file"].form-control {
-            height: auto !important;         /* remove forced height */
-            padding: initial !important;     /* reset padding */
-            font-size: inherit !important;   /* reset font size */
-            line-height: normal !important;  /* reset line height */
+            height: auto !important;
+            /* remove forced height */
+            padding: initial !important;
+            /* reset padding */
+            font-size: inherit !important;
+            /* reset font size */
+            line-height: normal !important;
+            /* reset line height */
         }
 
 
@@ -1084,7 +1299,8 @@
         button[type="submit"],
         .buttons-collection,
         input[type="submit"],
-        #get-emp-list {
+        #get-emp-list,
+        .submit-btn {
             color: #fff !important;
             background-color: #E26728 !important;
             border-color: #E26728 !important;
@@ -1098,13 +1314,22 @@
             cursor: pointer;
             /* optional */
         }
+
+        .cancel-btn,
+        .modal-footer .cancel-btn {
+            color: #000000 !important;
+            background-color: #ffffff !important;
+            border-color: #E26728 !important;
+        }
     </style>
 
     <!-- accordian -->
     <style>
         .card #collapseOne .card-body,
+              #collapseOne .card-body,
         .card #collapseTwo .card-body,
-        .card #collapseThree .card-body {
+        .card #collapseThree .card-body,
+        .card #collapseFour .card-body {
             background-color: #F5FFFF !important;
             border: 2px solid #F5FFFF;
             border-radius: 10px;
@@ -1122,7 +1347,11 @@
 
         .card #collapseThree .card-body input,
         .card #collapseThree .card-body select,
-        .card #collapseThree .card-body textarea {
+        .card #collapseThree .card-body textarea,
+
+        .card #collapseFour .card-body input,
+        .card #collapseFour .card-body select,
+        .card #collapseFour .card-body textarea {
             background-color: #ffff !important;
             border-radius: 10px !important;
             box-shadow: 0px 2px 4px 0px #00000024 !important;
@@ -1131,7 +1360,8 @@
 
         .card #collapseOne .card-body input[type='file'],
         .card #collapseTwo .card-body input[type='file'],
-        .card #collapseThree .card-body input[type='file'] {
+        .card #collapseThree .card-body input[type='file'],
+        .card #collapseFour .card-body input[type='file'] {
             padding: 10px !important;
             background-color: white !important;
             color: black !important;
@@ -1140,7 +1370,8 @@
         /* Apply to Select2 (single select) */
         .card #collapseOne .card-body .select2-container .select2-selection--single,
         .card #collapseTwo .card-body .select2-container .select2-selection--single,
-        .card #collapseThree .card-body .select2-container .select2-selection--single {
+        .card #collapseThree .card-body .select2-container .select2-selection--single,
+        .card #collapseFour .card-body .select2-container .select2-selection--single {
             background-color: #ffff !important;
             border-radius: 10px !important;
             box-shadow: 0px 2px 4px 0px #00000024 !important;
@@ -1154,7 +1385,8 @@
         /* Apply to Select2 (multiple select) */
         .card #collapseOne .card-body .select2-container .select2-selection--multiple,
         .card #collapseTwo .card-body .select2-container .select2-selection--multiple,
-        .card #collapseThree .card-body .select2-container .select2-selection--multiple {
+        .card #collapseThree .card-body .select2-container .select2-selection--multiple,
+        .card #collapseFour .card-body .select2-container .select2-selection--multiple {
             background-color: #ffff !important;
             border-radius: 10px !important;
             box-shadow: 0px 2px 4px 0px #00000024 !important;
@@ -1195,7 +1427,6 @@
         .fixed-header {
             position: relative;
             top: 0;
-            z-index: 1000;
             background-color: #f8f9fa !important;
         }
 
@@ -1267,7 +1498,6 @@
     </style>
 
 
-
     <style>
         .custom-form .parsley-examples {
             background-color: transparent !important;
@@ -1327,6 +1557,7 @@
             text-align: center;
         }
     </style>
+
     <style>
         /* Common wrapper (works for text/file inputs) */
         .input-icon {
@@ -1372,6 +1603,67 @@
         }
     </style>
 
+    <!-- tab swich scrollable -->
+    <style>
+        .tab-wrapper {
+            display: flex;
+            align-items: center;
+            position: relative;
+        }
+
+        /* Make the UL a scrollable flex row */
+        #myTab {
+            display: flex;
+            white-space: nowrap;
+            flex-wrap: nowrap;
+            /* prevent wrapping */
+            overflow-x: auto;
+            /* enable horizontal scroll */
+            overflow-y: hidden;
+            white-space: nowrap;
+            /* keep items on one line */
+            margin: 0;
+            padding: 0 40px;
+            /* leave space for arrows */
+            flex-grow: 1;
+        }
+
+        /* Hide scrollbars */
+        #myTab::-webkit-scrollbar {
+            display: none;
+        }
+
+        #myTab {
+            -ms-overflow-style: none;
+            scrollbar-width: none;
+        }
+
+        .scroll-btn {
+            background-color: #F4FFFF;
+            height: 55px;
+            border: none;
+            cursor: pointer;
+            font-size: 18px;
+            padding: 5px 10px;
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            z-index: 1;
+            color: #00999E;
+        }
+
+        .left-btn {
+            left: 0;
+        }
+
+        .right-btn {
+            right: 0;
+        }
+    </style>
+
+
+
+
 </head>
 
 <body class="loading" data-layout-mode="" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "sidebar": { "color": "light", "size": "condensed", "showuser": false}, "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": false}'></body>
@@ -1392,7 +1684,7 @@
     <div class="left-side-menu">
 
 
-        <div class="h-100" data-simplebar>
+        <div data-simplebar>
             <!--- Sidemenu -->
             <div id="sidebar-menu">
 
@@ -1400,23 +1692,23 @@
 
                     <li class="menu-logo">
                         <a href="<?= base_url('/dashboard/view') ?>">
-                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo" height="24">
+                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo">
                         </a>
                     </li>
 
 
 
-                    <li>
-                        <a href="<?= base_url('/dashboard/view') ?>" class="img-inactive-not-working">
+                    <li class="li-seperate" id="dashboard-li">
+                        <a href="<?= base_url('/dashboard/view') ?>" class="img-inactive">
                             <i class="ri-dashboard-line" style="color:black;"></i>
-                            <span> Dashboard </span>
+                            <span style="color: #02a8b5;"> Dashboard </span>
                         </a>
                     </li>
 
                     <!-- client -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
-                        <li>
-                            <a href="<?= base_url('/client/list') ?>" class="img-inactive-not-working">
+                        <li class="li-seperate" id="clients-li">
+                            <a href="<?= base_url('/client/list') ?>" class="img-inactive">
                                 <img style="border-radius: 5px;"
                                     src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
                                 <span> Clients </span>
@@ -1425,79 +1717,79 @@
                     <?php } ?>
 
 
-                        <!-- Enrollment process -->
-                        <?php if (in_array(get_role_id(), [1,2,3,5]) || in_array(ENROLLMENT_TEAM_ID, user_team())) { ?>
-                            <li>
-                                <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect img-inactive-not-working" >
-                                    <img style="border-radius: 5px;"
+                    <!-- Enrollment process -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(ENROLLMENT_TEAM_ID, user_team())) { ?>
+                        <li class="li-seperate" id="action-on-policies-li">
+                            <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect img-inactive">
+                                <img style="border-radius: 5px;"
                                     src="<?= base_url() . "public"; ?>/assets/images/action_on_policies_sb.png" alt="Logo" height="20">
-                                    <span> Action on Policies </span>
-                                </a>
-                                <div class="collapse" id="sidebarDashboards">
-                                    <ul class="nav-second-level">
+                                <span> Action on Policies </span>
+                            </a>
+                            <div class="collapse" id="sidebarDashboards">
+                                <ul class="nav-second-level">
 
-                                        <li>
-                                            <a href="<?= base_url('/employee/upload') ?>">View Inception</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/list') ?>">View Members</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/endorsement-list') ?>">View Endorsement</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/enrollment-list') ?>">View Enrolment</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/test_members_list') ?>">Test Members List</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/employee/retail-endorsement-list') ?>">Retail Endorsement</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </li>
-                        <?php } ?>
+                                    <li>
+                                        <a href="<?= base_url('/employee/upload') ?>">View Inception</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/list') ?>">View Members</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/endorsement-list') ?>">View Endorsement</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/enrollment-list') ?>">View Enrolment</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/test_members_list') ?>">Test Members List</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/employee/retail-endorsement-list') ?>">Retail Endorsement</a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </li>
+                    <?php } ?>
 
-                        <!-- Masters -->
-                        <?php if (get_role_id() == 1 || get_role_id() == 5) { ?>
+                    <!-- Masters -->
+                    <?php if (get_role_id() == 1 || get_role_id() == 5) { ?>
 
-                            <li>
-                                <a href="#sidebarDashboards" data-toggle="collapse" class=" img-inactive-not-working">
-                                    <img 
+                        <li class="li-seperate" id="masters-li">
+                            <a href="#sidebarPolicies" data-toggle="collapse" class=" img-inactive">
+                                <img
                                     src="<?= base_url() . "public"; ?>/assets/images/masters_sb.png" alt="Logo" height="20">
-                                    <span> Masters </span>
-                                </a>
-                                <div class="collapse" id="sidebarDashboards">
-                                    <ul class="nav-second-level">
-                                        <li>
-                                            <a href="<?= base_url('/master/insurer/list') ?>">Insurer</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/tpa/list') ?>">TPA</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/kyc/list') ?>">KYC</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/policy/list') ?>">Policy</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/cash_deposite/list') ?>">CD Master</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/master/vehicle/list') ?>">Vehicle Master</a>
-                                        </li>
-                                        <li>
-                                            <a href="<?= base_url('/user/list') ?>"> Users </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </li>
+                                <span> Masters </span>
+                            </a>
+                            <div class="collapse" id="sidebarPolicies">
+                                <ul class="nav-second-level">
+                                    <li>
+                                        <a href="<?= base_url('/master/insurer/list') ?>">Insurer</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/master/tpa/list') ?>">TPA</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/master/kyc/list') ?>">KYC</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/master/policy/list') ?>">Policy</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/master/cash_deposite/list') ?>">CD Master</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/master/vehicle/list') ?>">Vehicle Master</a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/user/list') ?>"> Users </a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </li>
 
-                        <?php } ?>
+                    <?php } ?>
 
-                        <!-- <li>
+                    <!-- <li>
                             <?php
                             $sessionData = get_session_userdata();
                             $currentUrl = base_url();
@@ -1514,8 +1806,8 @@
 
                     <!-- Claims -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a href="#sidebarDashboardsTicket" data-toggle="collapse" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="claims-li">
+                            <a href="#sidebarDashboardsTicket" data-toggle="collapse" class="waves-effect img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/claims_sb.png" alt="Logo" height="20">
                                 <span> Claims </span>
@@ -1550,8 +1842,8 @@
 
                     <!-- leads -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive-not-working">
+                        <li class="li-seperate" id="leads-li">
+                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/leads_sb.png" alt="Logo" height="20">
                                 <span> Leads </span>
@@ -1560,8 +1852,8 @@
                     <?php } ?>
                     <!-- Tickets -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 4, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="tickets-li">
+                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/ticket.png" alt="Logo" height="20">
                                 <span>Tickets</span>
                             </a>
@@ -1569,8 +1861,8 @@
                     <?php } ?>
                     <!-- BDS -->
                     <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
-                        <li>
-                            <a href="#policyTransactions" data-toggle="collapse" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="policy-transactions-li">
+                            <a href="#policyTransactions" data-toggle="collapse" class="waves-effect img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/policy_transactions_sb.png" alt="Logo" height="20">
                                 <span> Policy Transactions </span>
@@ -1718,11 +2010,11 @@
 
                     <!-- Ad -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
-                        <li>
-                            <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect img-inactive-not-working" style="color: grey;">
+                        <li class="li-seperate" id="app-content-mng-li">
+                            <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect img-inactive" style="color: grey;">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/app_content_mng_sb.png" alt="Logo" height="20">
-                                <span>App Content Mgmt</span>
+                                <span style="color: #02a8b5;">App Content Mgmt</span>
                             </a>
                             <div class="collapse" id="sidebarDashboardsmenu">
                                 <ul class="nav-second-level">
@@ -1736,8 +2028,8 @@
                             </div>
                         </li>
                     <?php } ?>
-                    <li>
-                        <a id="user_manual" href="<?= base_url("autobookstackLogin") ?>" class="waves-effect img-inactive-not-working" target="_blank" rel="noopener noreferrer">
+                    <li class="li-seperate" id="user-manual-li">
+                        <a id="user_manual" href="<?= base_url("autobookstackLogin") ?>" class="waves-effect img-inactive" target="_blank" rel="noopener noreferrer">
                             <img
                                 src="<?= base_url() . "public"; ?>/assets/images/user_manual_sb.png" alt="Logo" height="20">
                             <span>User Manual</span>
@@ -1752,58 +2044,60 @@
     </div>
     <!-- Left Sidebar End -->
 
-
-
-
-    <!-- Top Bar -->
-    <div class="top-navbar-div" style="margin-left:130px;">
-        <div>
-            <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>
-        </div>
-        <div class="nav-flex">
-
-            <!-- user pic -->
-            <div class="dropdown notification-list topbar-dropdown">
-                <a class=" dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
-
-                    <?php
-                    $profile = get_userProfile();
-                    $default = base_url('public/assets/images/avatar_2x.png');
-                    ?>
-
-                    <img
-                        src="<?= (!empty($profile)) ? $profile : $default; ?>"
-                        onerror="this.onerror=null;this.src='<?= $default ?>';"
-                        alt="user-image"
-                        height="40" width="40"
-                        class="rounded-circle">
-                </a>
+    <!-- ========== Top Bar Start ========== -->
+    <div class="nav-bar">
+        <div class="top-navbar-div">
+            <div class="top-navbar-title">
+                <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>
             </div>
+            <div class="nav-flex">
 
-            <!-- Notification -->
-            <div class="dropdown notification-list topbar-dropdown">
-                <a class="dropdown-toggle right-bar-toggle waves-effect waves-light"
-                    style="font-size: 14px; color:#000;background-color:#D4F5F6 !important;
-                                border-radius:25px!important;padding:7px; position: relative;">
+                <!-- user pic -->
+                <div class="dropdown notification-list topbar-dropdown">
+                    <a class=" dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
 
-                    <i class="fe-bell noti-icon"></i>
+                        <?php
+                        $profile = get_userProfile();
+                        $default = base_url('public/assets/images/avatar_2x.png');
+                        ?>
 
-                    <span class="notification-dot"></span>
-                </a>
+                        <img
+                            src="<?= (!empty($profile)) ? $profile : $default; ?>"
+                            onerror="this.onerror=null;this.src='<?= $default ?>';"
+                            alt="user-image"
+                            height="40" width="40"
+                            class="rounded-circle">
+                    </a>
+                </div>
 
-            </div>
-            &nbsp;&nbsp;
-            <!-- Logout -->
-            <div class="dropdown notification-list">
-                <a href="<?= base_url('/logout'); ?>" style="font-size: 18px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;margin-top:0px;">
-                    <i class="ri-logout-box-r-line" style=" color:#000;padding:0px;"></i>
-                </a>
+                <!-- Notification -->
+                <div class="dropdown notification-list topbar-dropdown">
+                    <a class="dropdown-toggle right-bar-toggle waves-effect waves-light"
+                        style="font-size: 14px; color:#000;background-color:#D4F5F6 !important;
+                                    border-radius:25px!important;padding:7px; position: relative;">
+
+                        <i class="fe-bell noti-icon"></i>
+
+                        <span class="notification-dot"></span>
+                    </a>
+
+                </div>
+                &nbsp;&nbsp;
+                <!-- Logout -->
+                <div class="dropdown notification-list">
+                    <a href="<?= base_url('/logout'); ?>" style="font-size: 18px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;margin-top:0px;">
+                        <i class="ri-logout-box-r-line" style=" color:#000;padding:0px;"></i>
+                    </a>
+                </div>
             </div>
         </div>
     </div>
+
+
+
     <!-- End of Top Bar -->
 
-    <br>
+    <!-- <br> -->
 
 
     <!-- ============================================================== -->
@@ -1814,4 +2108,4 @@
         <div class="content">
 
             <!-- Start Content-->
-            <div class="container-fluid">
\ No newline at end of file
+            <div class="container-fluid-top">
\ No newline at end of file
diff --git a/app/Views/lead_filter.php b/app/Views/lead_filter.php
index 86938097..75cebd29 100644
--- a/app/Views/lead_filter.php
+++ b/app/Views/lead_filter.php
@@ -1,369 +1,368 @@
 <style>
-.col-12 {
-    max-width: 98% !important;
-}
+    .col-12 {
+        max-width: 98% !important;
+    }
 </style>
 
-<div class="row" id="lead_filter_div">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <div class="row">
-                        <div class="col-md-6" style="position: relative;left: 17px;">
-                            <h4 style="text-align: left; margin-left:30px;">Lead Filter</h4>
-                        </div>
-                        <div class="col-md-6">
-                            <a style="text-align: right;" id="toggleIcon" class="text-dark float-right"
-                                data-toggle="collapse" href="#collapseOne" aria-expanded="true">
-                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary"
-                                    style="font-size: 28px;"></i>
+<div class="container-fluid-min">
+    <div class="row" id="lead_filter_div">
+        <div class="col-12" style="margin-top: -12px;">
+            <div class="card-body">
+                <div id="accordion" class="mb-3">
+                    <div class="card mb-1">
+                        <h4 class="m-1">
+                            <span>Filter</span>
+                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                aria-expanded="true">
+                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
                             </a>
-                        </div>
-                    </div>
-                </h5>
-                <div id="collapseOne" class="collapse hide" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <div class="form-row">
+                        </h4>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_issuer_type"> Issuer Type <span
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_issuer_type" name="filter_issuer_type">
-                                        <option value="0">Select</option>
-                                        <?php
-                                            if (isset($issuer) && count($issuer)) {
-                                                foreach ($issuer as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                        <div id="collapseOne" class="collapse hide" aria-labelledby="headingOne" data-parent="#accordion">
+                            <div class="card-body">
+                                <div class="form-group">
+                                    <div class="form-row">
+
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_issuer_type"> Issuer Type <span
+                                                    class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_issuer_type" name="filter_issuer_type">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($issuer) && count($issuer)) {
+                                                    foreach ($issuer as $key => $value) {
+                                                        echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_lead_type"> Lead Type <span class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_lead_type" name="filter_lead_type">
-                                        <option value="0">Select</option>
-                                        <?php
-                                            if (isset($lead_type) && count($lead_type)) {
-                                                foreach ($lead_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_lead_type"> Lead Type <span class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_lead_type" name="filter_lead_type">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($lead_type) && count($lead_type)) {
+                                                    foreach ($lead_type as $key => $value) {
+                                                        echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_client_type"> Client Type <span
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_client_type" name="filter_client_type">
-                                        <option value="0">Select</option>
-                                        <?php
-                                            if (isset($client_type) && count($client_type)) {
-                                                foreach ($client_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_client_type"> Client Type <span
+                                                    class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_client_type" name="filter_client_type">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($client_type) && count($client_type)) {
+                                                    foreach ($client_type as $key => $value) {
+                                                        echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_policy_type"> Policy Type <span
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_policy_type" name="filter_policy_type">
-                                        <option value="0">Select</option>
-                                        <?php
-                                            if (isset($policy_type) && count($policy_type)) {
-                                                foreach ($policy_type as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_policy_type"> Policy Type <span
+                                                    class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_policy_type" name="filter_policy_type">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($policy_type) && count($policy_type)) {
+                                                    foreach ($policy_type as $key => $value) {
+                                                        echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label for="filter_client_id">Client<span class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_client_id" name="filter_client_id">
-                                        <option value="0">Select</option>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_client_id">Client<span class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_client_id" name="filter_client_id">
+                                                <option value="0">Select</option>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_client_branch_id">Client Branch<span
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_client_branch_id"
-                                        name="filter_client_branch_id">
-                                        <option value="0">Select</option>
-                                    </select>
-                                </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_client_branch_id">Client Branch<span
+                                                    class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_client_branch_id"
+                                                name="filter_client_branch_id">
+                                                <option value="0">Select</option>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="filter_lead_status">Status<span class="text-danger"></span></label>
-                                    <select class="form-control" id="filter_lead_status" name="filter_lead_status">
-                                        <option value="0">Select</option>
-                                        <?php 
-                                            if (isset($lead_status) && count($lead_status)) {
-                                                foreach ($lead_status as $key => $value) {
-                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="filter_lead_status">Status<span class="text-danger"></span></label>
+                                            <select class="form-control" id="filter_lead_status" name="filter_lead_status">
+                                                <option value="0">Select</option>
+                                                <?php
+                                                if (isset($lead_status) && count($lead_status)) {
+                                                    foreach ($lead_status as $key => $value) {
+                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                       ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-12 text-right m-b-0" style="margin-bottom: -15px;">
-                                    <a href="<?= base_url("/leads/list"); ?>" class="btn btn-secondary"
-                                        id="clear-filters">Clear</a>
-                                    <a class="btn btn-primary" id="get-emp-list"
-                                        onclick="fetchTicketListData();">Submit</a>
-                                </div>
+                                        <div class="form-group col-md-12 text-right m-b-0" style="margin-bottom: -15px;">
+                                            <a href="<?= base_url("/leads/list"); ?>" class="btn btn-secondary"
+                                                id="clear-filters">Clear</a>
+                                            <a class="btn btn-primary" id="get-emp-list"
+                                                onclick="fetchTicketListData();">Submit</a>
+                                        </div>
 
+                                    </div>
+
+                                </div>
                             </div>
-
                         </div>
                     </div>
+
                 </div>
             </div>
 
         </div>
     </div>
+
+    <!-- end page title -->
+    <div id="lead_list_div">
+        <?php include('leads_list.php'); ?>
+    </div>
 </div>
 
-<!-- end page title -->
-<div id="lead_list_div">
-    <?php include('leads_list.php'); ?>
-</div>
 
 
 <script>
-var filter_client_list = [];
-var filter_branch_list = [];
+    var filter_client_list = [];
+    var filter_branch_list = [];
 
-$(document).ready(function() {
-    $('#filter_client_id').select2();
-    $('#filter_client_branch_id').select2();
-    $('#filter_policy_type').select2();
+    $(document).ready(function() {
+        $('#filter_client_id').select2();
+        $('#filter_client_branch_id').select2();
+        $('#filter_policy_type').select2();
 
-    getfilterClientAndBranch()
-});
-
-$(document).ready(function() {
-    $('#filter_client_id').change(function() {
-
-        let client_id = $(this).val();
-        if (filter_branch_list != '') {
-            // console.log(branch_list[client_id]);
-            let data = filter_branch_list[client_id];
-            appendfilterBranch(data);
-        }
-
-    })
-});
-
-//----- AJAX FUNCTIONS --------------------------------------------------------------------------------
-
-function fetchTicketListData() {
-
-    var issuer_type = $('#filter_issuer_type').val();
-    var lead_type = $('#filter_lead_type').val();
-    var policy_type = $('#filter_policy_type').val();
-    var client_type = $('#filter_client_type').val();
-    var status = $('#filter_lead_status').val();
-    var client_id = $('#filter_client_id').val();
-    var client_branch_id = $('#filter_client_branch_id').val();
-
-    var requestData = {
-        issuer: issuer_type,
-        lead_type: lead_type,
-        policy_type_id: policy_type,
-        client_type: client_type,
-        status: status,
-        client_id: client_id,
-        client_branch_id: client_branch_id,
-    };
-
-    console.log("requestData", requestData);
-
-    var url = '<?= base_url('/leads/list') ?>';
-
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
-
-        console.log('Filter Responce', response);
-
-        if (response.status == true) {
-
-            $('#lead_list_div').empty();
-            $('#lead_list_div').html(response.html);
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-
-            setTimeout(function(){
-                additionalDropdown();
-            }, 1000);
-
-        } else {
-
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-            let message = response.message;
-            toastr.error(message, 'ERROR');
-        }
-
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the data.', 'ERROR');
-
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
+        getfilterClientAndBranch()
     });
-}
 
-//function for fetch client, branch
-function getfilterClientAndBranch() {
-    $.ajax({
-        url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
-        type: "GET",
-        dataType: 'json',
-        success: function(res) {
+    $(document).ready(function() {
+        $('#filter_client_id').change(function() {
 
-            console.log('getClientAndBranchAndPolicy', res);
-            if (res.status == true) {
-                filter_client_list = res.client_data;
-                filter_branch_list = res.branch_data;
-                appendfilterClients(res.client_data);
-            } else {
-                console.log('No data found');
+            let client_id = $(this).val();
+            if (filter_branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = filter_branch_list[client_id];
+                appendfilterBranch(data);
             }
 
-        },
-        error: function(xhr, status, error) {
+        })
+    });
+
+    //----- AJAX FUNCTIONS --------------------------------------------------------------------------------
+
+    function fetchTicketListData() {
+
+        var issuer_type = $('#filter_issuer_type').val();
+        var lead_type = $('#filter_lead_type').val();
+        var policy_type = $('#filter_policy_type').val();
+        var client_type = $('#filter_client_type').val();
+        var status = $('#filter_lead_status').val();
+        var client_id = $('#filter_client_id').val();
+        var client_branch_id = $('#filter_client_branch_id').val();
+
+        var requestData = {
+            issuer: issuer_type,
+            lead_type: lead_type,
+            policy_type_id: policy_type,
+            client_type: client_type,
+            status: status,
+            client_id: client_id,
+            client_branch_id: client_branch_id,
+        };
+
+        console.log("requestData", requestData);
+
+        var url = '<?= base_url('/leads/list') ?>';
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+
+            console.log('Filter Responce', response);
+
+            if (response.status == true) {
+
+                $('#lead_list_div').empty();
+                $('#lead_list_div').html(response.html);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                setTimeout(function() {
+                    additionalDropdown();
+                }, 1000);
+
+            } else {
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
+            }
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            console.error(status, error);
-        }
-    });
-}
+            toastr.error('An error occurred while fetching the data.', 'ERROR');
 
-//----- END AJAX FUNCTIONS --------------------------------------------------------------------------------
-
-
-function appendfilterClients(data) {
-
-    $('#filter_client_id').empty();
-
-    $('#filter_client_id').append($('<option>', {
-        value: 0,
-        text: 'Select'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name,
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
         });
-
-        $('#filter_client_id').append(option);
-    });
-
-}
-
-function appendfilterBranch(data) {
-
-    $('#filter_client_branch_id').empty();
-
-    $('#filter_client_branch_id').append($('<option>', {
-        value: '',
-        text: 'Select'
-    }));
-
-    $.each(data, function(index, item) {
-
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name
-        });
-        $('#filter_client_branch_id').append(option);
-    });
-}
-
-// -----------------------------------------------------------------------------------------------------------
-
-function additionalDropdown() {
-    const table = document.getElementById("tickets-table");
-    if (!table) return; // Prevent errors if the table is not found
-    let activeDropdown = null;
-
-    function handleDropdownClick(row, event) {
-        // Hide any active dropdown
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-        }
-
-        let customDropdown = row.customDropdown;
-        if (!customDropdown) {
-            const originalDropdown = row.querySelector('.dropdown-menu');
-            if (!originalDropdown) return;
-
-            customDropdown = document.createElement('div');
-            customDropdown.className = 'custom-dropdown-menu';
-            customDropdown.innerHTML = originalDropdown.innerHTML;
-
-            document.body.appendChild(customDropdown);
-            row.customDropdown = customDropdown;
-
-            // Preserve click handlers and add auto-close
-            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-                item.addEventListener('click', function (e) {
-                    const onclickAttr = this.getAttribute('onclick');
-                    if (onclickAttr) eval(onclickAttr);
-
-                    const href = this.getAttribute('href');
-                    if (href && href !== '#') window.location.href = href;
-
-                    customDropdown.style.display = 'none';
-                    activeDropdown = null;
-
-                    e.stopPropagation();
-                });
-            });
-        }
-
-        // Get click position
-        const rect = event.target.getBoundingClientRect();
-
-        // Position the dropdown
-        customDropdown.style.display = 'block';
-        customDropdown.style.position = 'fixed';
-        customDropdown.style.left = `${rect.left}px`;
-        customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-
-        activeDropdown = customDropdown;
-        event.stopPropagation();
     }
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        row.addEventListener("click", function (event) {
-            if (!event.target.closest('td:last-child')) {
-                handleDropdownClick(row, event);
+    //function for fetch client, branch
+    function getfilterClientAndBranch() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+                if (res.status == true) {
+                    filter_client_list = res.client_data;
+                    filter_branch_list = res.branch_data;
+                    appendfilterClients(res.client_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
             }
         });
-    });
+    }
 
-    // Close dropdown when clicking outside
-    document.addEventListener("click", function () {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
+    //----- END AJAX FUNCTIONS --------------------------------------------------------------------------------
+
+
+    function appendfilterClients(data) {
+
+        $('#filter_client_id').empty();
+
+        $('#filter_client_id').append($('<option>', {
+            value: 0,
+            text: 'Select'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name,
+            });
+
+            $('#filter_client_id').append(option);
+        });
+
+    }
+
+    function appendfilterBranch(data) {
+
+        $('#filter_client_branch_id').empty();
+
+        $('#filter_client_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#filter_client_branch_id').append(option);
+        });
+    }
+
+    // -----------------------------------------------------------------------------------------------------------
+
+    function additionalDropdown() {
+        const table = document.getElementById("tickets-table");
+        if (!table) return; // Prevent errors if the table is not found
+        let activeDropdown = null;
+
+        function handleDropdownClick(row, event) {
+            // Hide any active dropdown
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+            }
+
+            let customDropdown = row.customDropdown;
+            if (!customDropdown) {
+                const originalDropdown = row.querySelector('.dropdown-menu');
+                if (!originalDropdown) return;
+
+                customDropdown = document.createElement('div');
+                customDropdown.className = 'custom-dropdown-menu';
+                customDropdown.innerHTML = originalDropdown.innerHTML;
+
+                document.body.appendChild(customDropdown);
+                row.customDropdown = customDropdown;
+
+                // Preserve click handlers and add auto-close
+                customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                    item.addEventListener('click', function(e) {
+                        const onclickAttr = this.getAttribute('onclick');
+                        if (onclickAttr) eval(onclickAttr);
+
+                        const href = this.getAttribute('href');
+                        if (href && href !== '#') window.location.href = href;
+
+                        customDropdown.style.display = 'none';
+                        activeDropdown = null;
+
+                        e.stopPropagation();
+                    });
+                });
+            }
+
+            // Get click position
+            const rect = event.target.getBoundingClientRect();
+
+            // Position the dropdown
+            customDropdown.style.display = 'block';
+            customDropdown.style.position = 'fixed';
+            customDropdown.style.left = `${rect.left}px`;
+            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+            activeDropdown = customDropdown;
+            event.stopPropagation();
         }
-    });
-}
 
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            row.addEventListener("click", function(event) {
+                if (!event.target.closest('td:last-child')) {
+                    handleDropdownClick(row, event);
+                }
+            });
+        });
+
+        // Close dropdown when clicking outside
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/leads_dash.php b/app/Views/leads_dash.php
index c8a0beba..1d8974cd 100644
--- a/app/Views/leads_dash.php
+++ b/app/Views/leads_dash.php
@@ -193,7 +193,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
 
     <div class="row d-flex  align-items-center">
         <div class="status_tile" style="padding-left: 25px;">
-            <a href="#" onclick="hide_and_show_tile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
+            <a href="#" onclick="hide_and_show_tile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px chevron-left-dash"></i></b> </a>
         </div>
         <div class="status_tile" style="padding-left: 15px;">
             <a href="#" id="main_tile">Current Tile : </a>
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index aa40bc28..12ef9a30 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -34,6 +34,10 @@
         color: white !important;
         margin-right: 5px;
     }
+
+    hr {
+        display: none !important;
+    }
 </style>
 
 <style>
@@ -58,7 +62,8 @@
         border-radius: 6px;
         position: absolute;
         z-index: 999;
-        bottom: 125%; /* Show above icon */
+        bottom: 125%;
+        /* Show above icon */
         left: 50%;
         transform: translateX(-50%);
         font-size: 12px;
@@ -69,7 +74,8 @@
     .info-tooltip::after {
         content: "";
         position: absolute;
-        top: 100%; /* Arrow below tooltip */
+        top: 100%;
+        /* Arrow below tooltip */
         left: 50%;
         margin-left: -5px;
         border-width: 5px;
@@ -81,292 +87,342 @@
         visibility: visible;
         opacity: 1;
     }
+
+    /* dont forgot it keep it safe card and card body space remover */
+    /* bcoz in design */
+    .card-body {
+        margin-top: 0px !important;
+    }
+
+    /* this css as per design so not declare in golbal */
+    /* bcoz in design */
+    #collapseOne {
+        border: 1px solid #BFF3F5 !important;
+        border-radius: 10px !important;
+        border-width: 1px !important;
+    }
 </style>
 
-<div class="row" id="leads_form">
-    <div class="col-12">
-        <div class="card">
-            <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
+<div class="container-fluid-min">
+    <div class="row" id="leads_form">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-body">
+                    <div class="row" style="margin-bottom:1rem;">
 
-                    <div class="col-6" style="align-self: center;">
+                        <!-- <div class="col-6" style="align-self: center;">
                         <h4 id="page_title" style="position: relative;">Add Lead</h4>
                     </div>
                     <div class="col-3" style="text-align: right; position: relative; left: 211px;">
-                        <!-- <button class="btn btn-primary waves-effect waves-light" onclick="fileupload(this)">file upload</button> -->
+                        <!-- <button class="btn btn-primary waves-effect waves-light" onclick="fileupload(this)">file upload</button> ->
                     </div>
                     <div class="col-1" style="text-align: right; position: relative; left: 193px;">
                         <a href="<?= base_url('leads/list') ?>" type="button" id="btnAdd"
                             class="btn btn-primary waves-effect waves-light">Back</a>
+                    </div> -->
+                        <h4 class="d-flex align-items-center" style="gap: 8px;">
+                            <a href="<?= base_url('leads/list') ?>" style="cursor: pointer;">
+                                <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                            </a>
+                            <span class="title-text" id="page_title" style="position: relative;">Add Lead</span>
+                        </h4>
                     </div>
+                    <form role="form" class="parsley-examples" method="post" id="leads_form_id"
+                        enctype="multipart/form-data">
+
+                        <input type="hidden" name="id" id="leads_primarykey">
+
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="lead_type" name="lead_type" required>
+                                            <option value="">Select Lead Type</option>
+                                            <?php
+                                            if (isset($lead_type) && count($lead_type)) {
+                                                foreach ($lead_type as $key => $value) {
+                                                    if ($key == 1) {
+                                                        echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                    } else {
+                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                    }
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="issuer">Issuer<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="issuer" name="issuer" required>
+                                            <option value="">Select Issuer</option>
+                                            <?php
+                                            if (isset($issuer) && count($issuer)) {
+                                                foreach ($issuer as $key => $value) {
+                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- <hr> --> <!-- bcoz removed in design -->
+
+                        <!-- client row -->
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div class="form-row">
+
+                                    <div class="form-group offset-md-10 col-md-2 freshFields" style="float:right;">
+                                        <label class="switch">
+                                            <input id="exixting_client" type="checkbox" name="exixting_client">
+                                            <span class="slider round" style="height: 27px;"></span>
+                                        </label>
+
+                                        <label for="exixting_client" style="position: relative;top: 2px;">Existing Client</label>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                        <label for="client_id">Client<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="client_id" name="client_id">
+                                            <option value="">Select Client</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                        <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="client_branch_id" name="client_branch_id"
+                                            onchange="getBranchData(this,1)">
+                                            <option value="">Select Branch</option>
+                                        </select>
+                                    </div>
+
+                                    <!-- <div class="form-group col-md-3 freshFields">
+                                    <label for="client_type">Client Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_type" name="client_type" required>
+                                        <option value="">Select Client type</option>
+                                        <?php
+                                        if (isset($client_type) && count($client_type)) {
+                                            foreach ($client_type as $key => $value) {
+                                                echo "<option value='" . $key . "' >" . $value . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div> -->
+
+                                    <div class="form-group col-md-4 freshFields">
+                                        <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="entity_type_id" name="entity_type_id" required>
+                                            <option value="" selected>Select Entity</option>
+                                            <?php
+                                            if (isset($entity) && count($entity)) {
+                                                foreach ($entity as $key => $value) {
+                                                    echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4 freshFields">
+                                        <label for="client_name">Client Name<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="client_name" name="client_name"
+                                            placeholder="Enter Client Name" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4 freshFields">
+                                        <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="client_short_name" name="client_short_name"
+                                            placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
+                                    </div>
+
+                                    <!-- <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_id"> Source Policy <span id="base_danger"
+                                            class="text-danger">*</span></label>
+                                    <select class="form-control" id="source_policy_id" name="source_policy_id">
+                                        <option value="" selected>Select Source Policy</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
+                                </div>
+
+                                <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
+                                </div> -->
+
+                                    <!-- <div class="form-group col-md-3">
+                                    <label for="pan">PAN<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
+                                        data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
+                                        data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
+                                </div> -->
+
+                                </div>
+                            </div>
+                        </div>
+                        <!-- end client row -->
+
+                        <!-- <hr> --> <!-- bcoz removed in design -->
+
+                        <!-- branch row-->
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <label for="gst">GST<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
+                                            data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
+                                            data-parsley-trigger="change"
+                                            data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="branch_name" name="branch_name"
+                                            placeholder="Enter Branch Name" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="branch_code" name="branch_code"
+                                            placeholder="Enter Branch Code" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4 renewalFields">
+                                        <label for="contact_person_summary">Contact Person</label>
+                                        <select class="form-control" name="contact_person_summary" id="contact_person_summary">
+                                            <option value="">Select a Contact</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4 freshFields">
+                                        <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
+                                            placeholder="Enter Contact Name" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="contact_person_mobile">Contact Person Mobile<span
+                                                class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="contact_person_mobile"
+                                            name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="contact_person_email">Contact Person Email<span
+                                                class="text-danger">*</span></label>
+                                        <input type="text" class="form-control" id="contact_person_email"
+                                            name="contact_person_email" placeholder="Enter Contact Email" required>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- policy row -->
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div id="dynamic-form-container"></div>
+                            </div>
+                        </div>
+                        <!-- <hr> --> <!-- bcoz removed in design -->
+
+                        <!-- other row -->
+                        <div class="card" id="collapseOne">
+                            <div class="card-body">
+                                <div class="form-row">
+
+                                    <div class="form-group offset-md-9 col-md-3" style="float:right;">
+                                        <label class="switch">
+                                            <input id="is_insurer_auto_mail" type="checkbox" name="is_insurer_auto_mail">
+                                            <span class="slider round" style="height: 27px;"></span>
+                                        </label>
+                                        <label for="is_insurer_auto_mail" style="position: relative;top: 2px;">Insurer Auto Mail</label>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
+                                            <option value="">Select Sales Person</option>
+                                            <?php if (isset($salse_team)) { ?>
+                                                <?php foreach ($salse_team as $value) { ?>
+                                                    <option value="<?= $value['id']; ?>">
+                                                        <?= $value['first_name']; ?>
+                                                    </option>
+                                                <?php } ?>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
+                                        <select class="form-control" id="lead_status" name="status" required>
+                                            <option value="" selected>Select Status</option>
+                                            <?php
+                                            if (isset($lead_status) && count($lead_status)) {
+                                                foreach ($lead_status as $key => $value) {
+                                                    if ($key == 'queued') {
+                                                        echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                    } else {
+                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                    }
+                                                }
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <label for="">Next Reminder Date<span class="text-danger"></span></label>
+                                        <div class="input-icon">
+                                            <input type="text" class="form-control" id="next_reminder_date" name="next_reminder_date" placeholder="DD/MM/YYYY">
+                                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-12">
+                                        <label for="notes">Remarks</label>
+                                        <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="form-group text-right m-b-0" id="submitButton">
+                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
+                                id="lead_form_submit_btn">Submit</button>
+                        </div>
+
+                    </form>
                 </div>
-                <form role="form" class="parsley-examples" method="post" id="leads_form_id"
-                    enctype="multipart/form-data">
-
-                    <input type="hidden" name="id" id="leads_primarykey">
-
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3">
-                            <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_type" name="lead_type" required>
-                                <option value="">Select Lead Type</option>
-                                <?php
-                                if (isset($lead_type) && count($lead_type)) {
-                                    foreach ($lead_type as $key => $value) {
-                                        if ($key == 1) {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
-                                            echo "<option value=" . $key . ">" . $value . "</option>";
-                                        }
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="issuer">Issuer<span class="text-danger">*</span></label>
-                            <select class="form-control" id="issuer" name="issuer" required>
-                                <option value="">Select Issuer</option>
-                                <?php
-                                if (isset($issuer) && count($issuer)) {
-                                    foreach ($issuer as $key => $value) {
-                                        echo "<option value=" . $key . ">" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                    </div>
-
-                    <hr>
-
-                    <!-- client row -->
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="exixting_client" type="checkbox" name="exixting_client">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
-
-                            <label for="exixting_client" style="position: relative;top: 39px;left: 20px;">Existing Client</label>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_id">Client<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_id" name="client_id">
-                                <option value="">Select Client</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_branch_id" name="client_branch_id"
-                                onchange="getBranchData(this,1)">
-                                <option value="">Select Branch</option>
-                            </select>
-                        </div>
-
-                        <!-- <div class="form-group col-md-3 freshFields">
-                            <label for="client_type">Client Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_type" name="client_type" required>
-                                <option value="">Select Client type</option>
-                                <?php
-                                if (isset($client_type) && count($client_type)) {
-                                    foreach ($client_type as $key => $value) {
-                                        echo "<option value='" . $key . "' >" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div> -->
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="entity_type_id" name="entity_type_id" required>
-                                <option value="" selected>Select Entity</option>
-                                <?php
-                                if (isset($entity) && count($entity)) {
-                                    foreach ($entity as $key => $value) {
-                                        echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_name">Client Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_name" name="client_name"
-                                placeholder="Enter Client Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_short_name" name="client_short_name"
-                                placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
-                        </div>
-
-                        <!-- <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_id"> Source Policy <span id="base_danger"
-                                    class="text-danger">*</span></label>
-                            <select class="form-control" id="source_policy_id" name="source_policy_id">
-                                <option value="" selected>Select Source Policy</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
-                        </div> -->
-
-                        <!-- <div class="form-group col-md-3">
-                            <label for="pan">PAN<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
-                                data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
-                                data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
-                        </div> -->
-
-                    </div>
-                    <!-- end client row -->
-
-                    <hr>
-
-                    <!-- branch row-->
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3">
-                            <label for="gst">GST<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
-                                data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
-                                data-parsley-trigger="change"
-                                data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="branch_name" name="branch_name"
-                                placeholder="Enter Branch Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="branch_code" name="branch_code"
-                                placeholder="Enter Branch Code" required>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields">
-                            <label for="contact_person_summary">Contact Person</label>
-                            <select class="form-control" name="contact_person_summary" id="contact_person_summary">
-                                <option value="">Select a Contact</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
-                                placeholder="Enter Contact Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="contact_person_mobile">Contact Person Mobile<span
-                                    class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_mobile"
-                                name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="contact_person_email">Contact Person Email<span
-                                    class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_email"
-                                name="contact_person_email" placeholder="Enter Contact Email" required>
-                        </div>
-
-                    </div>
-
-                    <!-- policy row -->
-                    <div id="dynamic-form-container"></div>
-
-                    <hr>
-
-                    <!-- other row -->
-                    <div class="form-row">
-
-                        <div class="form-group col-md-3">
-                            <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
-                            <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
-                                <option value="">Select Sales Person</option>
-                                <?php if (isset($salse_team)) { ?>
-                                    <?php foreach ($salse_team as $value) { ?>
-                                        <option value="<?= $value['id']; ?>">
-                                            <?= $value['first_name']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_status" name="status" required>
-                                <option value="" selected>Select Status</option>
-                                <?php
-                                if (isset($lead_status) && count($lead_status)) {
-                                    foreach ($lead_status as $key => $value) {
-                                        if ($key == 'queued') {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
-                                            echo "<option value=" . $key . ">" . $value . "</option>";
-                                        }
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="">Next Reminder Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="next_reminder_date" name="next_reminder_date" placeholder="DD/MM/YYYY">
-                        </div>
-
-                         <div class="form-group col-md-3">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="is_insurer_auto_mail" type="checkbox" name="is_insurer_auto_mail">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
-
-                            <label for="is_insurer_auto_mail" style="position: relative;top: 35px;left: 20px;">Insurer Auto Mail</label>
-                        </div>
-
-                    </div>
-
-                    <div class="form-row">
-                        <div class="form-group col-md-12">
-                            <label for="notes">Remarks</label>
-                            <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
-                        </div>
-                    </div>
-
-                    <div class="form-group text-right m-b-0" id="submitButton">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
-                            id="lead_form_submit_btn" >Submit</button>
-                    </div>
-
-                </form>
             </div>
         </div>
-    </div>
-</div><!-- end form row -->
+    </div><!-- end form row -->
+
+    <?php include("newClientModal.php") ?>
+</div>
+
 
-<?php include("newClientModal.php") ?>
 
 
 <script>
@@ -452,8 +508,8 @@
                         // }
                     }
                 });
-            }else if (lead_type == 3) {
-                
+            } else if (lead_type == 3) {
+
                 if ($('#client_id option[value="add_client"]').length === 0) {
                     $('#client_id').prepend($('<option>', {
                         value: 'add_client',
@@ -461,43 +517,43 @@
                     }));
                 }
                 $("#source_policy_id").removeAttr("required");
-                $("#source_policy_id").closest("div") .find("label .text-danger").remove();
+                $("#source_policy_id").closest("div").find("label .text-danger").remove();
                 $("#source_policy_id").hide();
                 $('#source_policy_id').closest('.form-group').hide();
 
                 $("#source_policy_start_date").removeAttr("required");
-                $("#source_policy_start_date").closest("div") .find("label .text-danger").remove();
+                $("#source_policy_start_date").closest("div").find("label .text-danger").remove();
                 $("#source_policy_start_date").hide();
                 $('#source_policy_start_date').closest('.form-group').hide();
 
                 $("#source_policy_end_date").removeAttr("required");
-                $("#source_policy_end_date").closest("div") .find("label .text-danger").remove();
+                $("#source_policy_end_date").closest("div").find("label .text-danger").remove();
                 $("#source_policy_end_date").hide();
                 $('#source_policy_end_date').closest('.form-group').hide();
 
 
-                
+
             } else if (lead_type != 3) {
-                $("#source_policy_id").prop("required",true);
+                $("#source_policy_id").prop("required", true);
                 $("#source_policy_start_date").prop("required", true);
                 $("#source_policy_end_date").prop("required", true);
 
-                 $("#source_policy_id").show();
-                 $("#source_policy_start_date").show();
-                 $("#source_policy_start_date").show();
+                $("#source_policy_id").show();
+                $("#source_policy_start_date").show();
+                $("#source_policy_start_date").show();
 
-                  $('#source_policy_id').closest('.form-group').find('label').show();
-                  $('#source_policy_start_date').closest('.form-group').find('label').show();
-                  $('#source_policy_end_date').closest('.form-group').find('label').show();
+                $('#source_policy_id').closest('.form-group').find('label').show();
+                $('#source_policy_start_date').closest('.form-group').find('label').show();
+                $('#source_policy_end_date').closest('.form-group').find('label').show();
 
                 // Check if the asterisk doesn't already exist, then add it
-                let $label = $("#source_policy_id").closest("div") .find("label");
+                let $label = $("#source_policy_id").closest("div").find("label");
 
                 if ($label.find(".text-danger").length === 0) {
                     $label.append(' <span class="text-danger">*</span>');
                 }
 
-                let $label2 = $("#source_policy_start_date").closest("div") .find("label");
+                let $label2 = $("#source_policy_start_date").closest("div").find("label");
 
                 if ($label2.find(".text-danger").length === 0) {
                     $label2.append(' <span class="text-danger">*</span>');
@@ -516,7 +572,7 @@
 
             }
 
-            if(lead_type != 1){
+            if (lead_type != 1) {
                 dataIncrement = 1;
                 // updateRenewalFields(dataIncrement);
 
@@ -576,8 +632,8 @@
             maxDate: "today"
         });
 
-       
-    })       
+
+    })
     //------------------------------ GET DATA ( EDIT, BRANCH, POLICY ) ---------------------------------------------------------------------------
 
     //view and edit Lead data function ( NOT IN USE DON'T DELETE )
@@ -653,7 +709,7 @@
 
                                     let lead_type = $('#lead_type').val();
                                     var policyStartDate = $("#source_policy_start_date");
-                                    if(lead_type == 3){
+                                    if (lead_type == 3) {
                                         policyStartDate = $("#policy_start_date");
                                     }
                                     console.log('Selected Dates:', selectedDates);
@@ -754,7 +810,7 @@
     //client branch data
     function getBranchData(input, inputType) {
 
-        if (inputType == 1 ) {
+        if (inputType == 1) {
             var client_branch_id = $(input).val();
         } else {
             client_branch_id = input;
@@ -779,11 +835,11 @@
                         $('#pan').val(res.data.pan);
                         $('#branch_name').val(res.data.branch_name);
                         $('#branch_code').val(res.data.branch_code);
-                        allContacts = res.contact;  
+                        allContacts = res.contact;
                         $('#contact_person_summary').empty();
                         $('#contact_person_summary').append($('<option>', {
-                                value: "", 
-                                text: "Select a Contact"
+                            value: "",
+                            text: "Select a Contact"
                         }));
 
                         res.contact.forEach((value, key) => {
@@ -798,8 +854,8 @@
                                     text: display_value
                                 }));
                             }
-                            
-                        });                    
+
+                        });
                         // $('#contact_person_name').val(res?.contact?.name || '');
                         // $('#contact_person_mobile').val(res?.contact?.mobile || '');
                         // $('#contact_person_email').val(res?.contact?.email || '');
@@ -864,7 +920,7 @@
 
                         console.log("res.data.source_policy_start_date", res.data.source_policy_start_date)
                         console.log("res.data.source_policy_end_date", res.data.source_policy_end_date)
-                        
+
                         $('#source_policy_start_date').val(res.data.source_policy_start_date);
                         $('#source_policy_end_date').val(res.data.source_policy_end_date);
 
@@ -977,7 +1033,7 @@
                 console.log(response.message, 'SUCCESS');
                 $('#appendArea_' + dataIncrement).append(response.data);
 
-                console.log("Policy Type ID : ",policy_type_id);
+                console.log("Policy Type ID : ", policy_type_id);
                 if (policy_type_id == 1 || policy_type_id == 6 || policy_type_id == 7) {
 
                     let newId = 'appendAreaForClaim_' + dataIncrement;
@@ -1005,10 +1061,10 @@
                         $('.lifeClaimFields').show();
                     } else {
 
-                        if(lead_type == 1){
+                        if (lead_type == 1) {
                             updateRenewalFields(dataIncrement);
                         }
-                        
+
                         // let incurred_claim_date_id = 'incurred_claim_date_' + dataIncrement;
                         let incurred_claim_date_id = 'incurred_claim_date';
                         var incurred_claim_datepicker = flatpickr("#" + incurred_claim_date_id, {
@@ -1023,10 +1079,10 @@
                                 console.log('Extracted increment:', increment);
 
                                 var policyStartDate = $("#source_policy_start_date");
-                                if(lead_type == 3){
+                                if (lead_type == 3) {
                                     policyStartDate = $("#policy_start_date");
                                 }
-                                
+
                                 console.log('Selected Dates:', selectedDates);
                                 console.log('policy start date instance', policyStartDate)
                                 console.log('Policy Start Date:', policyStartDate.val());
@@ -1073,31 +1129,32 @@
         const newRow = document.createElement('div');
         newRow.className = 'form-row dynamic-form-row';
 
-        const hrElement = document.createElement('hr');
-        container.appendChild(hrElement);
+        if (increment > 1) {
+            const hrElement = document.createElement('hr');
+            container.appendChild(hrElement);
+        }
 
         // Main div
         newRow.innerHTML += `
-
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_id"> Source Policy <span id="base_danger"
-                        class="text-danger">*</span></label>
+                        class="text-danger">* </span></label>
                 <select class="form-control" id="source_policy_id" name="source_policy_id">
                     <option value="" selected>Select Source Policy</option>
                 </select>
             </div>
 
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
                 <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
             </div>
 
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
                 <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
             </div>
 
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="policy_type_id">Policy Type <span class="text-danger">*</span></label>
                 <select class="form-control" id="policy_type_id_${increment}" name="policy_type_id[]" onchange="getCustomFields(this, ${increment})" required>
                     <option value="">Select Policy Type</option>
@@ -1113,7 +1170,7 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3 proposed_div">
+            <div class="form-group col-md-4 proposed_div">
                 <label for="insurer">Insurer <span class="text-danger"></span></label>
                 <select class="form-control" id="insurer_${increment}" name="insurer[]" onchange="insurerChange(this, ${increment})">
                     <option value="">Select Insurer</option>
@@ -1127,7 +1184,7 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3 proposed_div">
+            <div class="form-group col-md-4 proposed_div">
                 <label for="tpa">TPA <span class="text-danger"></span></label>
                 <select class="form-control" id="tpa_${increment}" name="tpa[]" onchange="tpaChange(this, ${increment})">
                     <option value="">Select TPA</option>
@@ -1141,19 +1198,31 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="">Date of Commencement <span class="text-danger"></span></label>
-                <input type="text" class="form-control policy_start_date" id="policy_start_date_${increment}" name="policy_start_date[]" placeholder="Enter DOC" onchange="calculatePolicyMetrics(this)">
+                <div class="input-icon">
+                        <input type="text" class="form-control policy_start_date" id="policy_start_date_${increment}" name="policy_start_date[]" placeholder="Enter DOC" onchange="calculatePolicyMetrics(this)">
+                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                </div>
+                
             </div>
 
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="">Date of Expiry <span class="text-danger"></span></label>
-                <input type="text" class="form-control policy_end_date" id="policy_end_date_${increment}" name="policy_end_date[]" placeholder="Enter DOE">
+                <div class="input-icon">
+                            <input type="text" class="form-control policy_end_date" id="policy_end_date_${increment}" name="policy_end_date[]" placeholder="Enter DOE">
+                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                </div>
             </div>
 
+            
             <div id="appendArea_${increment}" class = "form-group col-md-12 appendArea"></div>
 
-            <div id="multiFileAppendArea_${increment}"></div>
+            <div class="card" style="width:100%; background-color: transparent;">
+                <div class="card-body" style="background-color: #fff !important; border: 0px !important;">
+                    <div id="multiFileAppendArea_${increment}"></div>
+                </div>
+            </div>
                 
              <div class="form-group col-md-12 btnDiv" style="position: relative;top: 28px;float: right;text-align: end;">
                 <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)">x</a>
@@ -1398,8 +1467,8 @@
         console.log('Lead Type:', lead_type);
 
         let increment = input.id.split('_').pop(); // Extract increment
-        if(lead_type == 1){
-             return;
+        if (lead_type == 1) {
+            return;
         }
 
         let input_id = input.id;
@@ -1416,9 +1485,9 @@
             policyStartDateInput = $('#source_policy_start_date');
             console.log('Using Source Policy Start Date:', sourcePolicyDateVal);
         } else if (policyStartDateVal) {
-            if(input_id == "policy_start_date_1"){
+            if (input_id == "policy_start_date_1") {
                 policyStartDateInput = $('#policy_start_date_1');
-            }else{
+            } else {
                 policyStartDateInput = $('#policy_start_date');
             }
             console.log('Using Policy Start Date:', policyStartDateVal);
@@ -1462,7 +1531,7 @@
 
         let annualised_claims = policy_run_days > 0 ? (incurred_claims / policy_run_days) * 365 : 0;
         // let annualised_claims_roundoff = annualised_claims.toFixed(2);
-        let annualised_claims_roundoff =  Math.trunc(annualised_claims);
+        let annualised_claims_roundoff = Math.trunc(annualised_claims);
 
         console.log('Annualised Claims:', annualised_claims);
         console.log('Annualised Claims (Rounded):', annualised_claims_roundoff);
@@ -1471,9 +1540,9 @@
         let premium_as_on_date = Number($('#premium_date').val()) || 0;
         console.log('Premium as on Date:', premium_as_on_date);
 
-        let incurred_claim_ratio = (incurred_claims > 0 && premium_as_on_date > 0)
-            ? (incurred_claims / premium_as_on_date) * 100
-            : 0;
+        let incurred_claim_ratio = (incurred_claims > 0 && premium_as_on_date > 0) ?
+            (incurred_claims / premium_as_on_date) * 100 :
+            0;
         let incurred_claim_ratio_roundoff = isFinite(incurred_claim_ratio) ? incurred_claim_ratio.toFixed(2) : 0;
         console.log('Incurred Claim Ratio:', incurred_claim_ratio);
         console.log('Incurred Claim Ratio (Rounded):', incurred_claim_ratio_roundoff);
@@ -1481,8 +1550,8 @@
 
         let earned_premium = premium_as_on_date > 0 ? (premium_as_on_date / 365) * policy_run_days : 0;
         // let earned_premium_roundoff = earned_premium.toFixed(2);
-        let earned_premium_roundoff =  Math.trunc(earned_premium);
-       
+        let earned_premium_roundoff = Math.trunc(earned_premium);
+
         console.log('Earned Premium:', earned_premium);
         console.log('Earned Premium (Rounded):', earned_premium_roundoff);
         $('#earned_premium').val(earned_premium_roundoff);
@@ -1649,8 +1718,8 @@
 
         $('#contact_person_summary').empty();
         $('#contact_person_summary').append($('<option>', {
-                value: "", 
-                text: "Select a Contact"
+            value: "",
+            text: "Select a Contact"
         }));
 
         $("#gst").val("");
@@ -1677,8 +1746,8 @@
         $("#client_branch_id").prop("selectedIndex", 0);
         $("#source_policy_id").empty();
         $('#source_policy_id').append($('<option>', {
-                value: "", 
-                text: "Select a Policy"
+            value: "",
+            text: "Select a Policy"
         }));
         $("#pan").val("");
 
@@ -1708,7 +1777,7 @@
             flatpickr("#" + incurred_claim_date_id, {
                 dateFormat: "d/m/Y",
                 allowInput: false,
-                onChange: function (selectedDates) {
+                onChange: function(selectedDates) {
                     try {
                         let increment = this.input.id.split('_').pop();
                         let policyStartDate = $("#source_policy_start_date");
@@ -1993,7 +2062,7 @@
                 $('#source_policy_start_date').closest('.form-group').show();
                 $('#source_policy_end_date').closest('.form-group').show();
 
-            }else{
+            } else {
 
                 $('#source_policy_id').hide();
                 $('#source_policy_start_date').hide();
@@ -2064,12 +2133,12 @@
         });
     }
 
-    $('#exixting_client').change(function () {
+    $('#exixting_client').change(function() {
 
         $('#contact_person_summary').empty();
         $('#contact_person_summary').append($('<option>', {
-                value: "", 
-                text: "Select a Contact"
+            value: "",
+            text: "Select a Contact"
         }));
 
         $("#gst").val("");
@@ -2142,6 +2211,4 @@
 
 
     //-----------------------------------------------------------------------------------------------------------
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 2367957c..0235dccf 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -474,7 +474,7 @@ if (isset($selected_lead_type)) {
 
     // --------------------------------------------------------------------------------------------------------
 
-    function addFileField(increment) {
+    function addFileFieldold(increment) {
 
         console.log('addFileField function called');
 
@@ -519,6 +519,80 @@ if (isset($selected_lead_type)) {
         fileIndex++;
     }
 
+    function addFileField(increment) {
+
+        console.log('addFileField function called');
+
+        const container = document.getElementById(`multiFileAppendArea_${increment}`);
+        if (!container) return;
+
+        // Remove previous "+" buttons if any
+        // const prevAddBtns = container.querySelectorAll('.add-file-btn');
+        // prevAddBtns.forEach(btn => btn.remove());
+
+
+        const div = document.createElement("div");
+        div.className = "form-row d-flex align-items-end";
+        div.setAttribute("id", `fileField_${fileIndex}`);
+
+        let isFirstField = container.childElementCount === 0; // Check if it's the first field
+        let placeholder = isFirstField ? 'First file must be Demography.' : '';
+        let accept = isFirstField ? '.xls,.xlsx' : '';
+
+        
+        if(selected_lead_form_type != 1){
+            placeholder =  '';
+            accept = '';
+        }
+
+        let sample_dwn_btn = "";
+        if(selected_lead_form_type == 1 && isFirstField == 1){
+            sample_dwn_btn = `<button type="button" 
+                                        class="btn app-btn-secondary float-end" 
+                                        id="excel_download" 
+                                        data-toggle="tooltip" 
+                                        data-placement="top" 
+                                        title="Download Sample Excel"
+                                        onclick="window.location.href='<?= base_url("util/download-excel/member_data"); ?>'">
+                                        Sample Excel
+                                    </button>`;
+
+        }
+
+        let add_btn = `<button type="button" class="btn app-btn-secondary mr-1 add-file-btn" onclick="addFileField(${increment})">+</button>`;
+
+        div.innerHTML = `
+            <div class="form-group row" id="fileField_${fileIndex}" style="width: 100%;">
+                
+                <div class="col-auto" style="align-content: center;">
+                    <label class="col-form-label">Document Name</label>
+                </div>
+                <div class="col-md-3">
+                    <input type="text" class="form-control" name="docs_name_${increment}[]" placeholder="${placeholder}" style="background: #F5FFFF !important;">
+                </div>
+
+                <div class="col-auto" style="align-content: center;">
+                    <label>File Upload </label>
+                </div>
+                <div class="col-md-3">
+                    <div class="input-icon">
+                        <input type="file" class="form-control" id="file_name_${fileIndex}" name="file_name_${increment}[]" accept="${accept}" style="background: #F5FFFF !important;">
+                        <i class="mdi mdi-upload additional-icon"></i>
+                    </div>
+                </div>
+
+                <div class="col-auto">
+                    <button type="button" class="btn btn-danger mr-1" onclick="removeFileField(${fileIndex})"><span class="mdi mdi-trash-can"></span></button>
+                    ${add_btn}
+                    ${sample_dwn_btn}
+                </div>
+
+            </div>`;
+        
+        container.appendChild(div);
+        fileIndex++;
+    }
+
     function removeFileField(index, lead_file_id = null) {
 
         if(index  == 1){
diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php
index 8cc249c7..cab5f02b 100644
--- a/app/Views/leads_list.php
+++ b/app/Views/leads_list.php
@@ -160,23 +160,23 @@ table.dataTable tbody td {
                 </div>
                 <div>
                     <div class="table-responsive">
-                        <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                        <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
 
                             <thead class="bg-light">
                                 <tr>
-                                    <th><div class="column-header">S.No.</div></th>
-                                    <th><div class="column-header">Lead Type</div></th>
-                                    <th><div class="column-header">Issuer</div></th>
-                                    <th><div class="column-header">Client Type</div></th>
-                                    <th><div class="column-header">Client / Branch</div></th>
-                                    <th><div class="column-header">Entity Type</div></th>
-                                    <th><div class="column-header">Branch Name</div></th>
-                                    <th><div class="column-header">Branch Code</div></th>
-                                    <th><div class="column-header">Contact Person Name</div></th>
-                                    <th><div class="column-header">Contact Person Mobile</div></th>
-                                    <th><div class="column-header">Policy Type</div></th>
-                                    <th><div class="column-header">Status</div></th>
-                                    <th><div class="column-header">Action</div></th>
+                                    <th><div class="column-header">S.No&nbsp;</div></th>
+                                    <th><div class="column-header">Lead Type &nbsp;</div></th>
+                                    <th><div class="column-header">Issuer &nbsp;</div></th>
+                                    <th><div class="column-header">Client Type &nbsp;</div></th>
+                                    <th><div class="column-header">Client / Branch &nbsp;</div></th>
+                                    <th><div class="column-header">Entity Type &nbsp;</div></th>
+                                    <th><div class="column-header">Branch Name &nbsp;</div></th>
+                                    <th><div class="column-header">Branch Code &nbsp;</div></th>
+                                    <th><div class="column-header">Contact Person Name &nbsp;</div></th>
+                                    <th><div class="column-header">Contact Person Mobile &nbsp;</div></th>
+                                    <th><div class="column-header">Policy Type &nbsp;</div></th>
+                                    <th><div class="column-header">Status &nbsp;</div></th>
+                                    <th><div class="column-header">Action &nbsp;</div></th>
                                 </tr>
                             </thead>
 
@@ -184,7 +184,7 @@ table.dataTable tbody td {
                                 <?php if(isset($lead_data_list)) { ?>
                                     <?php foreach($lead_data_list as $index => $row){ ?>
                                     <tr>
-                                        <td><?php echo $index + 1; ?></td>
+                                        <td class="text-center"><?php echo $index + 1; ?></td>
                                         <td><?php echo $lead_type[$row['lead_type']] ?? '-'; ?></td>
                                         <td><?php echo $issuer[$row['issuer']] ?? '-'; ?></td>
                                         <td><?php echo $client_type[$row['client_type']] ?? '-'; ?></td>
@@ -215,7 +215,7 @@ table.dataTable tbody td {
                                                             </a>
                                                         <?php } ?>
                                                     <?php } ?>
-                                                    <a class="dropdown-item btnHistory app-text-black"
+                                                    <a class="dropdown-item btnHistory font-color-black"
                                                         data-id="<?= $row['id']; ?>"
                                                         title="Click to view Mail History">
                                                         <i class="mdi mdi-history mr-2 text-muted font-18 vertical-middle"></i>Email History
@@ -244,7 +244,7 @@ table.dataTable tbody td {
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel">Select Leaad Type</h4>
+                <h4 class="modal-title" id="myCenterModalLabel">Select Lead Type</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
@@ -420,29 +420,41 @@ document.addEventListener("DOMContentLoaded", function () {
                 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-7'p>>", // Pagination at the bottom, without page length selector
-                buttons: [
+                buttons: [            
                     {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'Policy-Tranction-Inception-List',
-                        exportOptions: {
-                            columns: ':not(:last-child)'
-                        },
-                    },                
+                            text: 'Add',
+                            className: 'btn app-btn-primary  mr-2',
+                            action: function(e, dt, node, config) { 
+                                openLeadTypeAskModal();
+                            }
+                    },
                     {
-                        text: 'Add',
-                        className: 'buttons-html5 addbtnStyle',
-                        action: function (e, dt, node, config) {
-                            openLeadTypeAskModal();
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Policy-Tranction-Inception-List',
+                                        className: 'app-btn-primary ',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
                     }
-                } 
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
-                pageLength: 25, // Set default number of rows per page (optional)
+                pageLength: 10, // Set default number of rows per page (optional)
                 // ordering: false,
             });
         } else {
@@ -501,14 +513,14 @@ document.addEventListener("DOMContentLoaded", function () {
 
                                             <thead class="bg-light">
                                                 <tr>
-                                                    <th><div class="column-header">S.No.</div></th>
-                                                    <th><div class="column-header">From Mail</div></th>
-                                                    <th><div class="column-header">To Mail</div></th>
-                                                    <th><div class="column-header">BCC</div></th>
-                                                    <th><div class="column-header">CC</div></th>
-                                                    <th><div class="column-header">Type</div></th>
-                                                    <th><div class="column-header">Status</div></th>
-                                                    <th><div class="column-header">Date/Time</div></th>
+                                                    <th><div class="column-header">S.No&nbsp;</div></th>
+                                                    <th><div class="column-header">From Mail&nbsp;</div></th>
+                                                    <th><div class="column-header">To Mail&nbsp;</div></th>
+                                                    <th><div class="column-header">BCC&nbsp;</div></th>
+                                                    <th><div class="column-header">CC&nbsp;</div></th>
+                                                    <th><div class="column-header">Type&nbsp;</div></th>
+                                                    <th><div class="column-header">Status&nbsp;</div></th>
+                                                    <th><div class="column-header">Date/Time&nbsp;</div></th>
                                             </tr>
                                         </thead>
                                         <tbody>
diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php
index 04e0a15d..df5d5a9a 100644
--- a/app/Views/leads_non_eb.php
+++ b/app/Views/leads_non_eb.php
@@ -36,6 +36,16 @@
         color: white !important;
         margin-right: 5px;
     }
+
+    /* dont forgot it keep it safe card and card body space remover */ /* bcoz in design */ 
+    .card-body{ margin-top: 0px !important; } 
+
+    /* this css as per design so not declare in golbal */ /* bcoz in design */ 
+    #collapseOne{
+        border: 1px solid #BFF3F5 !important;
+        border-radius: 10px !important;
+        border-width: 1px !important;
+    }
 </style>
 
 
@@ -45,13 +55,19 @@
             <div class="card-body">
                 <div class="row" style="margin-bottom:1rem;">
 
-                    <div class="col-6" style="align-self: center;">
+                    <!-- <div class="col-6" style="align-self: center;">
                         <h4 id="page_title" style="position: relative;">Add Lead</h4>
                     </div>
                     <div class="col-6" style="text-align: right; position: relative;">
                         <a href="<?= base_url('leads/list') ?>" type="button" id="btnAdd"
                             class="btn btn-primary waves-effect waves-light">Back</a>
-                    </div>
+                    </div> -->
+                    <h4 class="d-flex align-items-center" style="gap: 8px;">
+                        <a href="<?= base_url('leads/list') ?>" style="cursor: pointer;" type="button" id="btnAdd">
+                            <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                        </a>
+                        <span class="title-text" id="page_title" style="position: relative;">Add Lead</span>
+                    </h4>
                 </div>
                 <form role="form" class="parsley-examples" method="post" id="leads_non_eb_form_id"
                     enctype="multipart/form-data">
@@ -59,135 +75,147 @@
                     <input type="hidden" name="id" id="leads_primarykey">
                     <input type="hidden" name="lead_form_type" id="lead_form_type_id" value="2">
 
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                     <div class="card-body">
+                        <div class="form-row">
 
-                        <div class="form-group col-md-3">
-                            <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_type" name="lead_type" required>
-                                <option value="">Select Lead Type</option>
-                                <?php
-                                if (isset($lead_type) && count($lead_type)) {
-                                    foreach ($lead_type as $key => $value) {
-                                        if ($key == 1) {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
+                            <div class="form-group col-md-4">
+                                <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
+                                <select class="form-control" id="lead_type" name="lead_type" required>
+                                    <option value="">Select Lead Type</option>
+                                    <?php
+                                    if (isset($lead_type) && count($lead_type)) {
+                                        foreach ($lead_type as $key => $value) {
+                                            if ($key == 1) {
+                                                echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                            } else {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
+                                            }
+                                        }
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label for="issuer">Issuer<span class="text-danger">*</span></label>
+                                <select class="form-control" id="issuer" name="issuer" required>
+                                    <option value="">Select Issuer</option>
+                                    <?php
+                                    if (isset($issuer) && count($issuer)) {
+                                        foreach ($issuer as $key => $value) {
                                             echo "<option value=" . $key . ">" . $value . "</option>";
                                         }
                                     }
-                                }
-                                ?>
-                            </select>
-                        </div>
+                                    ?>
+                                </select>
+                            </div>
 
-                        <div class="form-group col-md-3">
-                            <label for="issuer">Issuer<span class="text-danger">*</span></label>
-                            <select class="form-control" id="issuer" name="issuer" required>
-                                <option value="">Select Issuer</option>
-                                <?php
-                                if (isset($issuer) && count($issuer)) {
-                                    foreach ($issuer as $key => $value) {
-                                        echo "<option value=" . $key . ">" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
                         </div>
-
+                      </div>
                     </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- client row -->
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
 
-                        <div class="form-group col-md-3 freshFields">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="exixting_client" type="checkbox" name="exixting_client">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
+                                <div class="form-group offset-md-10 col-md-2 freshFields" style="float:right;">
+                                    <label class="switch">
+                                        <input id="exixting_client" type="checkbox" name="exixting_client">
+                                        <span class="slider round" style="height: 27px;"></span>
+                                    </label>
 
-                            <label for="exixting_client" style="position: relative;top: 39px;left: 20px;">Existing Client</label>
+                                    <label for="exixting_client" style="position: relative;top: 2px;">Existing Client</label>
+                                </div>
+
+                            </div>
+                            <div class="form-row">
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="client_id">Client<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_id" name="client_id">
+                                        <option value="">Select Client</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_branch_id" name="client_branch_id"
+                                        onchange="getBranchData(this,1)">
+                                        <option value="">Select Branch</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_type">Client Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_type" name="client_type" required>
+                                        <option value="">Select Client type</option>
+                                        <?php
+                                        if (isset($client_type) && count($client_type)) {
+                                            foreach ($client_type as $key => $value) {
+                                                echo "<option value='" . $key . "' >" . $value . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="entity_type_id" name="entity_type_id" required>
+                                        <option value="" selected>Select Entity</option>
+                                        <?php
+                                        if (isset($entity) && count($entity)) {
+                                            foreach ($entity as $key => $value) {
+                                                echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_name">Client Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="client_name" name="client_name"
+                                        placeholder="Enter Client Name" required>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="client_short_name" name="client_short_name"
+                                        placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
+                                </div>
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="source_policy_id"> Source Policy <span id="base_danger"
+                                            class="text-danger">*</span></label>
+                                    <select class="form-control" id="source_policy_id" name="source_policy_id" onchange="getPolicyData(this)">
+                                        <option value="" selected>Select Source Policy</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="pan">PAN<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
+                                        data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
+                                        data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
+                                </div>
+
+                            </div>
                         </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_id">Client<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_id" name="client_id">
-                                <option value="">Select Client</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_branch_id" name="client_branch_id"
-                                onchange="getBranchData(this,1)">
-                                <option value="">Select Branch</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_type">Client Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_type" name="client_type" required>
-                                <option value="">Select Client type</option>
-                                <?php
-                                if (isset($client_type) && count($client_type)) {
-                                    foreach ($client_type as $key => $value) {
-                                        echo "<option value='" . $key . "' >" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="entity_type_id" name="entity_type_id" required>
-                                <option value="" selected>Select Entity</option>
-                                <?php
-                                if (isset($entity) && count($entity)) {
-                                    foreach ($entity as $key => $value) {
-                                        echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_name">Client Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_name" name="client_name"
-                                placeholder="Enter Client Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_short_name" name="client_short_name"
-                                placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_id"> Source Policy <span id="base_danger"
-                                    class="text-danger">*</span></label>
-                            <select class="form-control" id="source_policy_id" name="source_policy_id" onchange="getPolicyData(this)">
-                                <option value="" selected>Select Source Policy</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="pan">PAN<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
-                                data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
-                                data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
-                        </div>
-
                     </div>
                     <!-- end client row -->
-
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- branch row-->
+                    <div class="card" id="collapseOne">
+                    <div class="card-body">
                     <div class="form-row">
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="gst">GST<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
                                 data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
@@ -195,19 +223,19 @@
                                 data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="branch_name" name="branch_name"
                                 placeholder="Enter Branch Name" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="branch_code" name="branch_code"
                                 placeholder="Enter Branch Code" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_summary">Contact Person's</label>
                             <select class="form-control" name="contact_person_summary" id="contact_person_summary">
                                 <option value="">Select a Person</option>
@@ -215,20 +243,20 @@
                         
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
                                 placeholder="Enter Contact Name" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_mobile">Contact Person Mobile<span
                                     class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_mobile"
                                 name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_email">Contact Person Email<span
                                     class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_email"
@@ -236,13 +264,17 @@
                         </div>
 
                     </div>
+                    </div>
+                    </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- policy row -->
+                    <div class="card" id="collapseOne">
+                    <div class="card-body">
                     <div class="form-row" id="dynamic-form-container">
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="policy_type_id">Policy Type <span class="text-danger">*</span></label>
                             <select class="form-control" id="policy_type_id" name="policy_type_id"
                                 onchange="getPolicyTypeFields(this)" required>
@@ -259,7 +291,7 @@
                             </select>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="insurer">Insurer <span class="text-danger"></span></label>
                             <select class="form-control" id="insurer" name="insurer">
                                 <option value="">Select Insurer</option>
@@ -293,78 +325,96 @@
                             </select>
                         </div> -->
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="">Date of Commencement <span class="text-danger">*</span></label>
-                            <input type="text" class="form-control policy_start_date" id="policy_start_date" name="policy_start_date"
-                                placeholder="Enter DOC" required>
+                            <div class="input-icon">
+                                        <input type="text" class="form-control policy_start_date" id="policy_start_date" name="policy_start_date"
+                                        placeholder="Enter DOC" required>
+                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                            </div>
+                            
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="">Date of Expiry <span class="text-danger">*</span></label>
-                            <input type="text" class="form-control policy_end_date" id="policy_end_date" name="policy_end_date"
-                                placeholder="Enter DOE" required>
+                            <div class="input-icon">      
+                                    <input type="text" class="form-control policy_end_date" id="policy_end_date" name="policy_end_date"
+                                    placeholder="Enter DOE" required>
+                                    <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                            </div>
                         </div>
 
                     </div>
+                    
 
                     <div id="appendArea"></div>
 
                     <div id="appendAreaForClaim">
                     </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
-                    <div id="multiFileAppendArea_1"></div>
-
-                    <hr>
-
-                    <!-- other row -->
-                    <div class="form-row">
-
-                        <!-- <div class="form-group col-md-3">
-                            <label for="file_upload">File Upload<span class="text-danger"></span></label>
-                            <input type="file" class="form-control" id="file_name" name="file_name" accept=".xls,.xlsx">
-                            <span class="text-danger" id="file_name_display"></span>
-                        </div> -->
-
-                        <div class="form-group col-md-3">
-                            <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
-                            <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
-                                <option value="">Select Sales Person</option>
-                                <?php if (isset($salse_team)) { ?>
-                                    <?php foreach ($salse_team as $value) { ?>
-                                        <option value="<?= $value['id']; ?>">
-                                            <?= $value['first_name']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
-                            </select>
+                    <div class="card" style="width:100%; background-color: transparent;">
+                        <div class="card-body" style="background-color: #fff !important; border: 0px !important;">
+                            <div id="multiFileAppendArea_1"></div>
                         </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_status" name="status" required>
-                                <option value="" selected>Select Status</option>
-                                <?php
-                                if (isset($lead_status) && count($lead_status)) {
-                                    foreach ($lead_status as $key => $value) {
-                                        if ($key == 'queued') {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
-                                            echo "<option value=" . $key . ">" . $value . "</option>";
-                                        }
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
                     </div>
 
-                    <div class="form-row">
-                        <div class="form-group col-md-12">
-                            <label for="notes">Remarks</label>
-                            <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                    </div>
+                    </div>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
+
+                    <!-- other row -->
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
+
+                                <!-- <div class="form-group col-md-3">
+                                    <label for="file_upload">File Upload<span class="text-danger"></span></label>
+                                    <input type="file" class="form-control" id="file_name" name="file_name" accept=".xls,.xlsx">
+                                    <span class="text-danger" id="file_name_display"></span>
+                                </div> -->
+
+                                <div class="form-group col-md-4">
+                                    <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
+                                        <option value="">Select Sales Person</option>
+                                        <?php if (isset($salse_team)) { ?>
+                                            <?php foreach ($salse_team as $value) { ?>
+                                                <option value="<?= $value['id']; ?>">
+                                                    <?= $value['first_name']; ?>
+                                                </option>
+                                            <?php } ?>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
+                                    <select class="form-control" id="lead_status" name="status" required>
+                                        <option value="" selected>Select Status</option>
+                                        <?php
+                                        if (isset($lead_status) && count($lead_status)) {
+                                            foreach ($lead_status as $key => $value) {
+                                                if ($key == 'queued') {
+                                                    echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                } else {
+                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                }
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                            </div>
+
+                            <div class="form-row">
+                                <div class="form-group col-md-12">
+                                    <label for="notes">Remarks</label>
+                                    <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                                </div>
+                            </div>
                         </div>
                     </div>
 
diff --git a/app/Views/log_view.php b/app/Views/log_view.php
index ebb77fc0..1af7ebde 100644
--- a/app/Views/log_view.php
+++ b/app/Views/log_view.php
@@ -23,16 +23,16 @@ table.dataTable tbody td {
 <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
     <thead class="bg-light">
         <tr>
-            <th>S.No.</th>
-            <th>Log File</th>
-            <th>Actions</th>
+            <th>S.No&nbsp;</th>
+            <th>Log File&nbsp;</th>
+            <th>Actions&nbsp;</th>
         </tr>
     </thead>
     <tbody>
         <?php if (!empty($logs)): ?>
             <?php foreach ($logs as $index => $log): ?>
                 <tr>
-                    <td><?= $index + 1 . '.' ?></td>
+                    <td class="text-center"><?= $index + 1 . '.' ?></td>
                     <td><?= esc($log) ?></td>
                     <td>
                         <a href="<?= base_url('util/view_log/' . urlencode($log)) ?>">View</a> |
diff --git a/app/Views/login.php b/app/Views/login.php
index 081c4ef1..a3b5bccb 100755
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -161,4 +161,28 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
+
+<script>
+document.addEventListener("DOMContentLoaded", function() {
+
+    <?php 
+        $isLoggedIn = check_session();
+        $hasCookie = check_cookie();
+    ?>
+
+    // Safely inject PHP boolean into JavaScript
+    let alreadyLogin = <?= ($isLoggedIn && $hasCookie) ? 'true' : 'false' ?>;
+
+        console.log(typeof alreadyLogin);
+        console.log(alreadyLogin);
+
+    if (!alreadyLogin) {
+        localStorage.clear();
+        console.log("Local storage cleared (no session/cookie).");
+    } else {
+        console.log("Session & cookie found, local storage kept.");
+    }
+
+});
+</script>
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index 25f89043..0242fbf4 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -1,443 +1,460 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.col-12 {
 
-    max-width: 98% !important;
-}
 
-.dataTables_filter {
-    position: absolute;
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.right-align-input {
-    text-align: right;
-}
+    .right-align-input {
+        text-align: right;
+    }
 
-.center-align-input {
-    text-align: center;
-}
+    .center-align-input {
+        text-align: center;
+    }
 </style>
 
-<div class="row" id="outstanding_filter">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <div class="form-row">
+<div class="container-fluid-min">
+    <div class="col-12" id="outstanding_filter">
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                    <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <div class="form-group">
+                                <div class="form-row">
 
-                               <!--  <div class="form-group col-md-3">
+                                    <!--  <div class="form-group col-md-3">
                                     <label for="client_branch">Client<span class="text-danger"></span></label>
                                     <select class="form-control" id="client_id" name="client_id">
                                         <option value="0">Select Client</option>
                                         <?php
-                                            if (isset($clients) && count($clients)) {
-                                                foreach ($clients as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
-                                                }
+                                        if (isset($clients) && count($clients)) {
+                                            foreach ($clients as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div> -->
 
-                                <div class="form-group col-md-3">
-                                    <label for="addon_policy"> Insurer <span id="base_danger"
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id">
-                                        <option value="0" selected>Select Insurer</option>
-                                        <?php if(isset($insurer) && count($insurer)){ ?>
-                                        <?php foreach ($insurer as $value) { ?>
-                                        <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-4">
+                                        <label for="addon_policy"> Insurer <span id="base_danger"
+                                                class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id" name="insurer_id">
+                                            <option value="0" selected>Select Insurer</option>
+                                            <?php if (isset($insurer) && count($insurer)) { ?>
+                                                <?php foreach ($insurer as $value) { ?>
+                                                    <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                                <?php } ?>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="addon_policy"> Insurer Branch<span id="base_danger"
-                                            class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id">
-                                        <option value="0" selected>Select Insurer</option>
-                                        <?php if(isset($insurer) && count($insurer)){ ?>
-                                        <?php foreach ($insurer as $value) { ?>
-                                        <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-4">
+                                        <label for="addon_policy"> Insurer Branch<span id="base_danger"
+                                                class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id" name="insurer_id">
+                                            <option value="0" selected>Select Insurer Branch</option>
+                                            <?php if (isset($insurer) && count($insurer)) { ?>
+                                                <?php foreach ($insurer as $value) { ?>
+                                                    <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                                <?php } ?>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <!-- <div class="form-group col-md-3">
+                                    <!-- <div class="form-group col-md-3">
                                     <label for="email"> Policy Type <span class="text-danger"></span></label>
                                     <select class="form-control" id="policy_type_id" name="policy_type_id">
                                         <option value="0">Select Policy Type</option>
                                         <?php
-                                            if (isset($policy_types) && count($policy_types)) {
-                                                foreach ($policy_types as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
-                                                }
+                                        if (isset($policy_types) && count($policy_types)) {
+                                            foreach ($policy_types as $key => $value) {
+                                                echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div> -->
 
-                               <!--  <div class="form-group col-md-3">
+                                    <!--  <div class="form-group col-md-3">
                                     <label for="client_branch">Issuer<span class="text-danger">*</span></label>
                                     <select class="form-control" id="issuer" name="issuer" required>
                                         <option value="0">Select Issure</option>
                                         <?php
-                                            if (isset($issuer) && count($issuer)) {
-                                                foreach ($issuer as $key => $value) {
-                                                    echo "<option value=" . $key . ">" . $value . "</option>";
-                                                }
+                                        if (isset($issuer) && count($issuer)) {
+                                            foreach ($issuer as $key => $value) {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div> -->
 
-                            <!-- </div>
+                                    <!-- </div>
 
                             <div class="form-row"> -->
 
-                                <!-- <div class="form-group col-md-3">
+                                    <!-- <div class="form-group col-md-3">
                                     <label>Date Type<span class="text-danger"></span></label>
                                     <select class="form-control" id="date_type" name="date_type"
                                         onchange="hideDateField()">
                                         <option value="0">Select Date Type</option>
                                         <?php
-                                            if (isset($date_type) && count($date_type)) {
-                                                foreach ($date_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
-                                                }
+                                        if (isset($date_type) && count($date_type)) {
+                                            foreach ($date_type as $key => $value) {
+                                                echo "<option value='" . $key . "'>" . $value . "</option>";
                                             }
+                                        }
                                         ?>
                                     </select>
                                 </div> -->
 
-                                <div class="form-group col-md-3" style="display: true;" id="date_div">
-                                    <label>Statement Month<span class="text-danger"></span></label>
+                                    <div class="form-group col-md-4" style="display: true;" id="date_div">
+                                        <label>Statement Month<span class="text-danger"></span></label>
+                                        <div class="input-icon">
+                                            <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                                        </div>
+                                        <!-- 
+                                    codeword : ***1***
+                                    if you cross check means also uncomment "star2star" (***2***) 
                                     <div id="reportrange" class="form-control"
                                         style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
                                         <i class="mdi mdi-calendar-blank"></i>&nbsp;
                                         <span></span> <i class="mdi mdi-menu-down"></i>
+                                    </div> -->
+                                        <input type="hidden" id="startDate">
+                                        <input type="hidden" id="endDate">
                                     </div>
-                                    <input type="hidden" id="startDate">
-                                    <input type="hidden" id="endDate">
+
                                 </div>
 
-                            </div>
-
-                            <div class="form-group text-right m-b-0">
-                                <a href="<?= base_url("/policy_tranction/report/report-outstanding-list"); ?>"
-                                    class="btn btn-secondary" id="clear-filters">Clear</a>
-                                <a href="<?= base_url("/policy_tranction/report/report-outstanding-list"); ?>"
-                                    class="btn btn-primary" id="get-emp-list"
-                                    onclick="fetchEmpolyeeList(event);">Submit</a>
+                                <div class="form-group text-right m-b-0">
+                                    <a href="<?= base_url("/policy_tranction/report/report-outstanding-list"); ?>"
+                                        class="btn btn-secondary" id="clear-filters">Clear</a>
+                                    <a href="<?= base_url("/policy_tranction/report/report-outstanding-list"); ?>"
+                                        class="btn btn-primary" id="get-emp-list"
+                                        onclick="fetchEmpolyeeList(event);">Submit</a>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
+        </div>
+    </div>
 
+    <div class="col-12" id="outstanding_list">
+        <div class="card">
+            <div class="card-body">
+                <div class="row" style="padding-bottom: 10px;">
+                    <div class="col-6" style="align-self: center;">
+                        <h4 style="position: relative;">Outstanding Report</h4>
+                    </div>
+
+                </div>
+
+                <div class="table-responsive">
+                    <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                        <thead class="bg-light">
+                            <tr>
+                                <th>S.No&nbsp;</th>
+                                <!-- <th>Client Name</th> -->
+                                <th>Insurer&nbsp;</th>
+                                <th>Insurer<br> Branch&nbsp;</th>
+                                <th>Statement<br> Month&nbsp;</th>
+                                <th>Statement<br> No&nbsp;</th>
+                                <th>Invoice No&nbsp;</th>
+                                <th>Invoice Status&nbsp;</th>
+                                <th>Invoice Date&nbsp;</th>
+                                <th>Invoice Amount&nbsp;</th>
+                                <th>Realization <br>Amount&nbsp;</th>
+                                <th>Outstanding <br>Amount&nbsp;</th>
+
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <?php
+
+                            // dd($outstanting_list);
+                            if (isset($outstanting_list)) { ?>
+                                <?php foreach ($outstanting_list as $index => $row) { ?>
+                                    <tr>
+                                        <td class="text-center"><?= $index + 1 ?></td>
+                                        <td><?php echo $row['short_name']; ?></td>
+                                        <td><?php echo $row['branch_name']; ?></td>
+                                        <td><?php echo change_date_format($row['month'],'Y-m-d','Y-m') ?></td>
+                                        <td><?php echo $row['stmt_sno']; ?></td>
+                                        <td><?php echo $row['invoice_no']; ?></td>
+                                        <td class="center-align-input"><?php echo isset($row['invoice_status']) ? $row['invoice_status'] : ' - '; ?></td>
+                                        <td><?php echo change_date_format($row['invoice_date'],'Y-m-d','d-M-Y'); ?></td>
+                                        <td class="right-align-input"><?php echo isset($row['invoice_amount']) ? $row['invoice_amount'] : '0.00'; ?></td>
+                                        <td class="right-align-input"><?php echo isset($row['total_paid']) ? $row['total_paid'] : '0.00'; ?></td>
+                                        <td class="right-align-input"><?php echo isset($row['outstanding_amount']) ? $row['outstanding_amount'] : '0.00'; ?></td>
+                                    </tr>
+                                <?php } ?>
+                            <?php } ?>
+                        </tbody>
+                    </table>
+
+                    <div>
+                    </div>
+                </div>
+            </div><!-- end col -->
         </div>
     </div>
 </div>
 
-<div class="col-12" id="outstanding_list">
-    <div class="card">
-        <div class="card-body">
-            <div class="row" style="padding-bottom: 10px;">
-                <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Outstanding Report</h4>
-                </div>
-
-            </div>
-            <div class="table-responsive">
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
-                    <thead class="bg-light">
-                        <tr>
-                            <th>S.No</th>
-                            <!-- <th>Client Name</th> -->
-                            <th>Insurer</th>
-                            <th>Insurer<br> Branch</th>
-                            <th>Statement<br> Month</th>
-                            <th>Statement<br> No</th>
-                            <th>Invoice No</th>
-                            <th>Invoice Status</th>
-                            <th>Invoice Date</th>
-                            <th>Invoice Amount</th>
-                            <th>Realization <br>Amount</th>
-                            <th>Outstanding <br>Amount</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <?php 
-
-                        // dd($outstanting_list);
-                        if (isset($outstanting_list)) { ?>
-                            <?php foreach($outstanting_list as $index => $row){ ?>
-                            <tr>
-                                <td><?= $index + 1 ?></td>
-                                <td><?php echo $row['short_name']; ?></td>
-                                <td><?php echo $row['branch_name']; ?></td>
-                                <td><?php echo change_date_format($row['month'],'Y-m-d','Y-m') ?></td>
-                                <td><?php echo $row['stmt_sno']; ?></td>
-                                <td><?php echo $row['invoice_no']; ?></td>
-                                <td class="center-align-input"><?php echo isset($row['invoice_status']) ? $row['invoice_status'] : ' - '; ?></td>
-                                <td><?php echo change_date_format($row['invoice_date'],'Y-m-d','d-M-Y'); ?></td>
-                                <td class="right-align-input"><?php echo isset($row['invoice_amount']) ? $row['invoice_amount'] : '0.00'; ?></td>
-                                <td class="right-align-input"><?php echo isset($row['total_paid']) ? $row['total_paid'] : '0.00'; ?></td>
-                                <td class="right-align-input"><?php echo isset($row['outstanding_amount']) ? $row['outstanding_amount'] : '0.00'; ?></td>
-                            </tr>
-                            <?php } ?>
-                        <?php } ?>
-                    </tbody>
-                </table>
-
-                <div>
-                </div>
-            </div>
-        </div><!-- end col -->
-    </div>
-</div>
 
 <script>
-// Datatable document ready
-$(document).ready(function() {
+    $(document).ready(function() {
 
-    var ticketsTable = $('#scroll-horizontal-datatable');
+        var ticketsTable = $('#scroll-horizontal-datatable');
 
-    if (ticketsTable.length) {
-        ticketsTable.DataTable({
-            scrollX: true,
-            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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-BDS-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Policy-Tranction-BDS-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                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-7'p>>", // Pagination at the bottom, without page length selector
+                buttons: [{
+                    extend: 'collection',
+                    text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                    className: 'btn app-btn-secondary ',
+                    buttons: [{
+                            extend: 'csv',
+                            text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                            customize: function(xlsx) {
+                                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                var total = 0;
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                        .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
+                                // Find cells in column AB (28th column in Excel)
+                                $('row c[r^="AB"]', sheet).each(function() {
+                                    var value = parseFloat($('v', this)
+                                        .text()); // Get the value inside the cell
+                                    if (!isNaN(value)) {
+                                        total += value;
+                                    }
+                                });
+
+                                // Get the last row index and append the total row
+                                var lastRow = $('row:last', sheet);
+                                var rowIndex = parseInt(lastRow.attr('r')) +
+                                    2; // Find the next row index
+                                var totalRow = '<row r="' + rowIndex + '">' +
+                                    '<c t="inlineStr" r="AA' + rowIndex +
+                                    '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+                                    '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+                                    '</v></c>' + // Insert sum in AB
+                                    '</row>';
+
+                                // Append the new total row to the sheet
+                                $(sheet).find('sheetData').append(totalRow);
                             }
-                        });
-
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                        2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
-
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    }
-                }
-
-            ],
-            language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
-            paging: true, // Enable pagination
-            pageLength: 25 // Set default number of rows per page (optional)
-        });
-    } else {
-        console.error("Table not found.");
-    }
-});
-
-$(document).ready(function() {
-    getURLParams()
-    $('#client_id').select2();
-    $('#insurer_id').select2();
-    $('#policy_type_id').select2();
-})
-
-function fetchEmpolyeeList(event) {
-    event.preventDefault(); // Prevent default action
-
-    var start_date = $('#startDate').val();
-    var end_date = $('#endDate').val();
-    var client_id = $('#client_id').val();
-    var insurer_id = $('#insurer_id').val();
-    var policy_type_id = $('#policy_type_id').val();
-    var date_type = $('#date_type').val();
-    var issuer = $('#issuer').val();
-
-    console.log(start_date + '-' + end_date);
-
-    var queryParams = {
-        start_date: start_date,
-        end_date: end_date,
-        client_id: client_id,
-        insurer_id: insurer_id,
-        policy_type_id: policy_type_id,
-        date_type: date_type,
-        issuer: issuer,
-    };
-
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
-
-function objectToQueryString(obj) {
-    return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-}
-
-function getURLParams() {
-    const url = new URL(window.location.href);
-    const params = new URLSearchParams(url.search);
-
-    const startDate = params.get('start_date') || 0; // Default to 0 if not found
-    const endDate = params.get('end_date') || 0; // Default to 0 if not found
-    const client_id = params.get('client_id') || 0; // Default to 0 if not found
-    const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
-    const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
-    const date_type = params.get('date_type') || 0; // Default to 0 if not found
-    const issuer = params.get('issuer') || 0; // Default to 0 if not found
-
-    hideDateField(date_type)
-
-    console.log('startDate', startDate)
-    console.log('endDate', endDate)
-    console.log('client_id', client_id)
-    console.log('insurer_id', insurer_id)
-    console.log('policy_type_id', policy_type_id)
-    console.log('date_type', date_type)
-    console.log('issuer', issuer)
-
-    // Log the values or use them as needed
-    console.log('Start Date:', startDate);
-    console.log('End Date:', endDate);
-
-    if (startDate != 0 && endDate != 0) {
-        setTimeout(function() {
-            $('#start_date').val(startDate)
-            $('#end_date').val(endDate)
-            $('#client_id').val(client_id).change()
-            $('#insurer_id').val(insurer_id).change()
-            $('#policy_type_id').val(policy_type_id).change()
-            $('#date_type').val(date_type)
-            $('#issuer').val(issuer)
-        }, 1000)
-
-    }
-
-}
-
-$(function() {
-
-    const url = new URL(window.location.href);
-    const params = new URLSearchParams(url.search);
-
-    // Get start and end dates from URL parameters, or use default values
-    const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD-MM-YYYY');
-    const endDateParam = params.get('end_date') || moment().format('DD-MM-YYYY');
-
-    // Parse the dates to moment objects
-    var start = moment(startDateParam, 'DD-MM-YYYY');
-    var end = moment(endDateParam, 'DD-MM-YYYY');
-
-    // var start = moment().subtract(29, 'days');
-    // var end = moment();
-
-    function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
-        $('#startDate').val(start.format('DD-MM-YYYY'));
-        $('#endDate').val(end.format('DD-MM-YYYY'));
-    }
-
-    $('#reportrange').daterangepicker({
-        startDate: start,
-        endDate: end,
-        ranges: {
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
-            'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month')
-                .endOf('month')
-            ]
+                        }
+                    ]
+                }],
+                language: {
+                    search: "_INPUT_",
+                    searchPlaceholder: "Search..."
+                },
+                paging: true, // Enable pagination
+                pageLength: 25 // Set default number of rows per page (optional)
+            });
+        } else {
+            console.error("Table not found.");
         }
-    }, cb);
-
-    cb(start, end);
-
-    $('#clear-filters').on('click', function() {
-        // Reset all select dropdowns to the first option
-        $('#client_id').val('0').change();
-        $('#insurer_id').val('0').change();
-        $('#policy_type_id').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer').val('0');
-        $('#date_div').hide()
-
-        // Reset the date range picker to default
-        $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
-        $('#reportrange').data('daterangepicker').setEndDate(moment());
-        cb(start, end); // Update the displayed date range
     });
 
-});
+    $(document).ready(function() {
+        getURLParams()
+        $('#client_id').select2();
+        $('#insurer_id').select2();
+        $('#policy_type_id').select2();
+    })
 
-function hideDateField(input = null) {
-    let val = $('#date_type').val();
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-    if (input) {
-        val = input;
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').val();
+
+        console.log(start_date + '-' + end_date);
+
+        var queryParams = {
+            start_date: start_date,
+            end_date: end_date,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            policy_type_id: policy_type_id,
+            date_type: date_type,
+            issuer: issuer,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-    if (val != 0) {
-        $('#date_div').show()
-    } else {
-        $('#date_div').hide()
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
+
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        const startDate = params.get('start_date') || 0; // Default to 0 if not found
+        const endDate = params.get('end_date') || 0; // Default to 0 if not found
+        const client_id = params.get('client_id') || 0; // Default to 0 if not found
+        const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+        const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
+        const date_type = params.get('date_type') || 0; // Default to 0 if not found
+        const issuer = params.get('issuer') || 0; // Default to 0 if not found
+
+        hideDateField(date_type)
+
+        console.log('startDate', startDate)
+        console.log('endDate', endDate)
+        console.log('client_id', client_id)
+        console.log('insurer_id', insurer_id)
+        console.log('policy_type_id', policy_type_id)
+        console.log('date_type', date_type)
+        console.log('issuer', issuer)
+
+        // Log the values or use them as needed
+        console.log('Start Date:', startDate);
+        console.log('End Date:', endDate);
+
+        if (startDate != 0 && endDate != 0) {
+            setTimeout(function() {
+                $('#start_date').val(startDate)
+                $('#end_date').val(endDate)
+                $('#client_id').val(client_id).change()
+                $('#insurer_id').val(insurer_id).change()
+                $('#policy_type_id').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer').val(issuer)
+            }, 1000)
+
+        }
+
+    }
+
+    $(function() {
+
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        // Get start and end dates from URL parameters, or use default values
+        const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD-MM-YYYY');
+        const endDateParam = params.get('end_date') || moment().format('DD-MM-YYYY');
+
+        // Parse the dates to moment objects
+        var start = moment(startDateParam, 'DD-MM-YYYY');
+        var end = moment(endDateParam, 'DD-MM-YYYY');
+
+        // var start = moment().subtract(29, 'days');
+        // var end = moment();
+
+        function cb(start, end) {
+            // codeword : ***2***
+            // if you cross check means also uncomment "star1star" (***1***) 
+            // $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#startDate').val(start.format('DD-MM-YYYY'));
+            $('#endDate').val(end.format('DD-MM-YYYY'));
+        }
+
+        $('#reportrange').daterangepicker({
+            startDate: start,
+            endDate: end,
+            // autoUpdateInput: false,
+            locale: {
+                format: 'DD-MM-YYYY' // 👈 force input format
+            },
+            ranges: {
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+            }
+        }, cb);
+
+        cb(start, end);
+
+        $('#clear-filters').on('click', function() {
+            // Reset all select dropdowns to the first option
+            $('#client_id').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').val('0');
+            $('#date_div').hide()
+
+            // Reset the date range picker to default
+            $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
+            $('#reportrange').data('daterangepicker').setEndDate(moment());
+            cb(start, end); // Update the displayed date range
+        });
+
+    });
+
+    function hideDateField(input = null) {
+        let val = $('#date_type').val();
+
+        if (input) {
+            val = input;
+        }
+
+        if (val != 0) {
+            $('#date_div').show()
+        } else {
+            $('#date_div').hide()
+        }
     }
-}
 
 
-function sendPolicyTransactionID(event, pt_id) {
-    event.preventDefault(); // Prevent default action
+    function sendPolicyTransactionID(event, pt_id) {
+        event.preventDefault(); // Prevent default action
 
-    console.log(pt_id);
+        console.log(pt_id);
 
-    var queryParams = {
-        pt_id: pt_id,
-    };
+        var queryParams = {
+            pt_id: pt_id,
+        };
 
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index b15d5cc0..44482aab 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -98,6 +98,22 @@
     color: #000;
 }
 
+/** newly implemented */
+#insurerTable thead th:first-child {  
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+    background-color: transparent !important;
+}
+#insurerTable tbody td {  
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+    background-color: transparent !important;
+}
+#insurerTable th{
+    color: black !important;
+    background-color: transparent !important;
+}
+
 </style>
 
 <div class="row" id="endorsement_form" style="display: none;">
@@ -129,15 +145,18 @@
                         <div class="row">
                             <!-- Section 1 -->
                             <div class="col-md-12">
-                                <div class="form-section">
+                                <!-- <div class="form-section"> -->
                                     <div id="accordion_0" class="mb-0">
-                                        <div class="card mb-0">
-                                            <h4 class="m-1">Client Details
-                                                <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
-                                                    <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                </a>
-                                            </h4>
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                            <span class="font-color-black">Client Details</span>
+                                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                                aria-expanded="true">
+                                                <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                            </a>
+                                        </label>
+                                        <div class="card mb-1">
                                             <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_0">
+                                              <div class="card-body">
                                                 <div class="row">
 
                                                     <div class="form-group col-md-3">
@@ -172,10 +191,11 @@
                                                     </div>
 
                                                 </div>
+                                               </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                <!-- </div> -->
                             </div>
                         </div>
 
@@ -327,15 +347,167 @@
                                                 <!-- Premium Details -->
                                                 <div class="row">
                                                     <div class="col-md-12">
-                                                        <div class="form-section">
+                                                            <div id="accordion_2" class="mb-0">
+                                                                <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Endorsement</span>
+                                                                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseThree"
+                                                                        aria-expanded="true">
+                                                                        <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                                    </a>
+                                                                </label>
+                                                                <div class="card mb-1">
+                                                                    <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_2">
+                                                                    <div class="card-body">
+                                                                        <div class="row">
+                                                                            
+                                                                            <div class="form-group col-md-3" id="tpa_endorse_div">
+                                                                                <label for="tpa"> TPA <span id="tpa_danger"class="text-danger"></span></label>
+                                                                                <select class="form-control readonly-select" id="tpa" name="tpa" >
+                                                                                    <option value="" selected>Select TPA</option>
+                                                                                    <?php foreach ($tpa as $value) { ?>
+                                                                                    <option value="<?= $value['id'] . '-' . $value['tpa_id'] ?>">
+                                                                                        <?= $value['tpa_short_name'] . '-' . $value['branch_code'] ?>
+                                                                                    </option>
+                                                                                    <?php } ?>
+                                                                                </select>
+                                                                            </div>
+                                                                            
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="addon_policy">Policy No<span id="base_danger"class="text-danger"></span></label>
+                                                                                <input type="text" class="form-control" id="policy_no" name="policy_no"placeholder="Enter Policy No" readonly>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="bp_cgst">D.O.C <span id="base_danger" class="text-danger"></span></label>
+                                                                                <input id="policy_start_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="bp_igst">D.O.E <span id="base_danger" class="text-danger"></span></label>
+                                                                                <input id="policy_end_date" type="text" class="form-control" placeholder="DD/MM/YYYY" readonly>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="addon_policy">Policy Issue Month<span id="base_danger" class="text-danger">*</span></label>
+                                                                                <input type="text" class="form-control" id="month" name="month" placeholder="MM/YYYY" >
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="addon_policy"> Endorsement Type <span id="base_danger" class="text-danger">*</span></label>
+                                                                                <select class="form-control" id="action_type" name="action_type" required>
+                                                                                    <option value="" selected>Select Endorsement Type</option>
+                                                                                    <?php
+                                                                                        if (isset($action_type) && count($action_type)) {
+                                                                                            foreach ($action_type as $key => $value) {
+                                                                                                echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                                            }
+                                                                                        }
+                                                                                    ?>
+                                                                                </select>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="addon_policy">Endorsement No<span id="base_danger" class="text-danger"></span></label>
+                                                                                <input type="text" class="form-control" id="endorsement_no" name="endorsement_no" placeholder="Enter Endorsement No" onchange="validateInput(this, 'policy_transaction', 'endorsement_no')">
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="addon_policy">Data Received Date<span id="base_danger" class="text-danger">*</span></label>
+                                                                                <input type="text" class="form-control" id="data_received_date" name="data_received_date" placeholder="DD/MM/YYYY" required>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="policy_issue_date">Date of Issue<span id="base_danger" class="text-danger">*</span></label>
+                                                                                <input type="text" class="form-control" id="policy_issue_date" name="policy_issue_date" placeholder="DD/MM/YYYY" required>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="endorse_eff_date">Endorsement Effective Date<span id="base_danger" class="text-danger"></span></label>
+                                                                                <input type="text" class="form-control" id="endorse_eff_date" name="endorse_eff_date" placeholder="DD/MM/YYYY" >
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3" id="no_of_insured_endorse_div">
+                                                                                <label for="addon_policy">No of Insured<span id="base_danger"class="text-danger"></span></label>
+                                                                                <input type="text" class="form-control" id="emp_count" name="emp_count" placeholder="Enter Employeee" onkeypress="return onlyNumbers(event)">
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3" id="no_of_dependents_endorse_div">
+                                                                                <label for="addon_policy">No of Dependents<span id="base_danger" class="text-danger"></span></label>
+                                                                                <input type="text" class="form-control" id="dependent_count" name="dependent_count" placeholder="Enter Dependent" onkeypress="return onlyNumbers(event)">
+                                                                            </div>
+                                                                        </div>
+
+                                                                        <hr>
+
+                                                                        <div class="row">
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="addon_policy"> Status <span id="base_danger"class="text-danger">*</span></label>
+                                                                                <select class="form-control" id="policy_status" name="status" required>
+                                                                                    <option value="" selected>Select Status</option>
+                                                                                    <?php
+                                                                                            if (isset($policy_status) && count($policy_status)) {
+                                                                                                foreach ($policy_status as $key => $value) {
+                                                                                                    if($key == 'pending'){
+                                                                                                        echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                                                                    }else{
+                                                                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                                                    }
+                                                                                                }
+                                                                                            }
+                                                                                        ?>
+                                                                                </select>
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3">
+                                                                                <label for="last_action_date">Latest Action Date</label>
+                                                                                <input id="last_action_date" type="text" class="form-control" name="last_action_date" placeholder="DD/MM/YYYY">
+                                                                            </div>
+
+                                                                            <div class="form-group col-md-3 install_due_date_div" style="display: none;">
+                                                                                <label for="install_due_date">Installment due Date</label>
+                                                                                <input id="install_due_date" type="text" class="form-control" name="install_due_date" placeholder="DD/MM/YYYY">
+                                                                            </div>
+
+                                                                            <!-- <div class="form-group col-md-3">
+                                                                                <label class="switch" style="position: relative;top: 32px;left: 20px;">
+                                                                                    <input id="policy_with_corr" type="checkbox" name="policy_with_corr">
+                                                                                    <span class="slider round" style="height: 27px;"></span>
+                                                                                </label>
+
+                                                                                <label for="policy_with_corr" style="position: relative;top: 33px;left: 25px;"> Policy with Correction</label>
+                                                                            </div> -->
+
+                                                                            <!-- <div class="form-group col-md-3">
+                                                                                <label class="switch" style="position: relative;top: 32px;left: 20px;">
+                                                                                    <input id="is_cd_reduce_from_bds" type="checkbox" name="is_cd_reduce_from_bds">
+                                                                                    <span class="slider round" style="height: 27px;"></span>
+                                                                                </label>
+
+                                                                                <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;">Make Entry in CD &nbsp;&nbsp; <i class="mdi mdi-information-outline" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i></label>
+                                                                            </div> -->
+
+                                                                        </div>
+
+                                                                    </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                    </div>
+                                                    <!-- Premium Details -->
+                                                    <div class="col-md-12">
+                                                        <!-- <div class="form-section"> -->
                                                             <div id="accordion_3" class="mb-0">
+                                                                <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Premium Details</span>
+                                                                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
+                                                                        aria-expanded="true">
+                                                                        <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                                    </a>
+                                                                </label>
                                                                 <div class="card mb-0">
-                                                                    <h4 class="m-1">Premium Details
-                                                                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseFour" aria-expanded="true">
-                                                                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                                        </a>
-                                                                    </h4>
-                                                                    <div id="collapseFour" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                                  <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                                    <div class="card-body">
                                                                         <div class="row d-none" id="add_more_row">
                                                                             <div class="col-md-2">
                                                                                 <input type="number" id="setInsurerCount" class="form-control" placeholder="Enter count">
@@ -349,10 +521,10 @@
                                                                         </div>
 
                                                                         <div id="insurerTableContainer" style="overflow: auto;">
-                                                                            <table data-custom-table-css="table" class="table table-bordered co_share_table" id="insurerTable">
+                                                                            <table data-custom-table-css="table" class="table co_share_table" id="insurerTable">
                                                                                 <thead>
                                                                                     <tr>
-                                                                                        <th>Premium Details</th>
+                                                                                        <th><span class="font-color-black">Premium Details</span></th>
                                                                                     </tr>
                                                                                 </thead>
                                                                                 <tbody>
@@ -494,19 +666,16 @@
                                                                             </table>
                                                                         </div>
                                                                     </div>
+                                                                  </div>
                                                                 </div>
                                                             </div>
-                                                        </div>
+                                                        <!-- </div> -->
                                                     </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+                                                
+                        </div>                       
+                         
 
-                    <div class="form-group text-right m-b-0" id="submitButton">
+                    <div class="form-group text-right mt-3 m-b-0" id="submitButton">
                         <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
                     </div>
 
@@ -1713,8 +1882,10 @@ function addInsurerColumn() {
     // Update header
     $('#insurerTable thead tr').append(`
         <th>
+         <span style="display:flex; justify-content:space-between; align-items:center;">
             Insurer ${insurerCount}
             ${insurerCount > 1 ? `<a class="text-danger mdi mdi-delete delete-insurer" data-count="${insurerCount}" style="margin-left: 135px;"></a>` : ''}
+         </span>
         </th>
     `);
 
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index e15ccfd8..95485df5 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -1,310 +1,309 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
-/* 
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
+
+    /* 
 table.dataTable thead th {
     padding: 4px 4px !important;
 } */
 
-.col-12 {
 
-    max-width: 98% !important;
-}
 
-.dataTables_filter{
-    position: absolute;
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.column-header {
-    margin-right: 10px; /* Adjust this value as needed */
-}
+    .column-header {
+        margin-right: 10px;
+        /* Adjust this value as needed */
+    }
 
-.form-section {
-    border: 1px solid #ccc;
-    padding: 15px;
-    margin-bottom: 20px;
-}
+    .form-section {
+        border: 1px solid #ccc;
+        padding: 15px;
+        margin-bottom: 20px;
+    }
 
-.row-box {
-    border: 1px solid #ccc;
-    padding: 10px;
-    margin-bottom: 10px;
-}
-custom-dropdown-menu {
-    display: none;
-    position: fixed;
-    background-color: #ffffff !important;
-    border: 1px solid rgba(0,0,0,.15);
-    border-radius: 0.25rem;
-    padding: 0.5rem 0;
-    min-width: 10rem;
-    z-index: 9999;
-    box-shadow: 0 0 10px rgba(0,0,0,0.1);
-}
+    .row-box {
+        border: 1px solid #ccc;
+        padding: 10px;
+        margin-bottom: 10px;
+    }
 
-.custom-dropdown-menu .dropdown-item {
-    display: block !important;
-    width: 100% !important;
-    padding: 0.5rem 1rem !important;
-    clear: both !important;
-    font-weight: 400 !important;
-    color: #212529 !important;
-    text-align: inherit !important;
-    white-space: nowrap !important;
-    background-color: transparent !important;
-    border: 0 !important;
-    text-decoration: none !important;
-    position: relative !important;
-}
+    .custom-dropdown-menu {
+        display: none;
+        position: fixed;
+        background-color: #ffffff !important;
+        border: 1px solid rgba(0, 0, 0, .15);
+        border-radius: 0.25rem;
+        padding: 0.5rem 0;
+        min-width: 10rem;
+        z-index: 9999;
+        box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    }
 
-.custom-dropdown-menu .dropdown-item:hover {
-    background-color: #f8f9fa !important;
-    color: #16181b !important;
-    cursor: pointer !important;
-}
+    .custom-dropdown-menu .dropdown-item {
+        display: block !important;
+        width: 100% !important;
+        padding: 0.5rem 1rem !important;
+        clear: both !important;
+        font-weight: 400 !important;
+        color: #212529 !important;
+        text-align: inherit !important;
+        white-space: nowrap !important;
+        background-color: transparent !important;
+        border: 0 !important;
+        text-decoration: none !important;
+        position: relative !important;
+    }
 
-.custom-dropdown-menu .dropdown-item i {
-    margin-right: 8px !important;
-    vertical-align: middle !important;
-}
+    .custom-dropdown-menu .dropdown-item:hover {
+        background-color: #f8f9fa !important;
+        color: #16181b !important;
+        cursor: pointer !important;
+    }
 
-.table tbody tr {
-    cursor: pointer;
-}
+    .custom-dropdown-menu .dropdown-item i {
+        margin-right: 8px !important;
+        vertical-align: middle !important;
+    }
 
-/* Ensure the dropdown menu has a solid background */
-.custom-dropdown-menu::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: #ffffff;
-    z-index: -1;
-}
+    .table tbody tr {
+        cursor: pointer;
+    }
 
-/* Add a subtle backdrop effect */
-.custom-dropdown-menu::after {
-    content: '';
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0,0,0,0.05);
-    z-index: -2;
-    pointer-events: none;
-}
+    /* Ensure the dropdown menu has a solid background */
+    .custom-dropdown-menu::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: #ffffff;
+        z-index: -1;
+    }
 
+    /* Add a subtle backdrop effect */
+    .custom-dropdown-menu::after {
+        content: '';
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.05);
+        z-index: -2;
+        pointer-events: none;
+    }
 </style>
 
 <style>
     .switch {
-    position: relative;
-    display: inline-block;
-    width: 54px;
-    height: 34px;
+        position: relative;
+        display: inline-block;
+        width: 54px;
+        height: 34px;
     }
 
-    .switch input { 
-    opacity: 0;
-    width: 0;
-    height: 0;
+    .switch input {
+        opacity: 0;
+        width: 0;
+        height: 0;
     }
 
     .slider {
-    position: absolute;
-    cursor: pointer;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: #ccc;
-    -webkit-transition: .4s;
-    transition: .4s;
+        position: absolute;
+        cursor: pointer;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: #ccc;
+        -webkit-transition: .4s;
+        transition: .4s;
     }
 
     .slider:before {
-    position: absolute;
-    content: "";
-    height: 19px;
-    width: 19px;
-    left: 4px;
-    bottom: 4px;
-    background-color: white;
-    -webkit-transition: .4s;
-    transition: .4s;
+        position: absolute;
+        content: "";
+        height: 19px;
+        width: 19px;
+        left: 4px;
+        bottom: 4px;
+        background-color: white;
+        -webkit-transition: .4s;
+        transition: .4s;
     }
 
-    input:checked + .slider {
-    background-color: #2196F3;
+    input:checked+.slider {
+        background-color: #2196F3;
     }
 
-    input:focus + .slider {
-    box-shadow: 0 0 1px #2196F3;
+    input:focus+.slider {
+        box-shadow: 0 0 1px #2196F3;
     }
 
-    input:checked + .slider:before {
-    -webkit-transform: translateX(26px);
-    -ms-transform: translateX(26px);
-    transform: translateX(26px);
+    input:checked+.slider:before {
+        -webkit-transform: translateX(26px);
+        -ms-transform: translateX(26px);
+        transform: translateX(26px);
     }
 
     /* Rounded sliders */
     .slider.round {
-    border-radius: 34px;
+        border-radius: 34px;
     }
 
     .slider.round:before {
-    border-radius: 50%;
+        border-radius: 50%;
     }
 </style>
 
-<div class="row" id="endorsement_filter">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <div class="form-row">
+<div class="container-fluid-min">
+    <div class="col-12" id="endorsement_filter">
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                    <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <div class="form-group">
+                                <div class="form-row">
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Client<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_id_for_search" name="client_id" >
-                                        <option value="0">Select Client</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Client<span class="text-danger"></span></label>
+                                        <select class="form-control" id="client_id_for_search" name="client_id">
+                                            <option value="0">Select Client</option>
+                                            <?php
                                             if (isset($client) && count($client)) {
                                                 foreach ($client as $key => $value) {
                                                     echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="addon_policy"> Insurer <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id_for_search" name="insurer_id"  >
-                                        <option value="0" selected>Select Insurer</option>
-                                        <?php foreach ($insurer as $value) { ?>
-                                            <option value="<?= $value['id']?>"><?= $value['name']?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="addon_policy"> Insurer <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id_for_search" name="insurer_id">
+                                            <option value="0" selected>Select Insurer</option>
+                                            <?php foreach ($insurer as $value) { ?>
+                                                <option value="<?= $value['id'] ?>"><?= $value['name'] ?></option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="email"> Policy Type <span class="text-danger"></span></label>
-                                    <select class="form-control" id="policy_type_for_search" name="policy_type_id" >
-                                        <option value="0">Select Policy Type</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="email"> Policy Type <span class="text-danger"></span></label>
+                                        <select class="form-control" id="policy_type_for_search" name="policy_type_id">
+                                            <option value="0">Select Policy Type</option>
+                                            <?php
                                             if (isset($policy_types) && count($policy_types)) {
                                                 foreach ($policy_types as $key => $value) {
                                                     echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Issuer<span class="text-danger">*</span></label>
-                                    <select class="form-control" id="issuer_for_search" name="issuer" required>
-                                        <option value="0">Select Issure</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Issuer<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="issuer_for_search" name="issuer" required>
+                                            <option value="0">Select Issure</option>
+                                            <?php
                                             if (isset($issuer) && count($issuer)) {
                                                 foreach ($issuer as $key => $value) {
                                                     echo "<option value=" . $key . ">" . $value . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
+                                            ?>
+                                        </select>
+                                    </div>
                                 </div>
-                            </div>
 
-                            <div class="form-row">
+                                <div class="form-row">
 
-                                <div class="form-group col-md-3">
-                                    <label for="email"> Status <span class="text-danger"></span></label>
-                                    <select class="form-control" id="policy_status_for_search" name="policy_type_id" >
-                                        <option value="0">Select Status</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="email"> Status <span class="text-danger"></span></label>
+                                        <select class="form-control" id="policy_status_for_search" name="policy_type_id">
+                                            <option value="0">Select Status</option>
+                                            <?php
                                             if (isset($policy_status) && count($policy_status)) {
                                                 foreach ($policy_status as $key => $value) {
                                                     echo "<option value='" . $key . "'>" . $value . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label>Date Type<span class="text-danger"></span></label>
-                                    <select class="form-control" id="date_type" name="date_type" onchange="hideDateField()">
-                                        <option value="0">Select Date Type</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label>Date Type<span class="text-danger"></span></label>
+                                        <select class="form-control" id="date_type" name="date_type" onchange="hideDateField()">
+                                            <option value="0">Select Date Type</option>
+                                            <?php
                                             if (isset($date_type) && count($date_type)) {
                                                 foreach ($date_type as $key => $value) {
                                                     echo "<option value='" . $key . "'>" . $value . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
-
-                                <div class="form-group col-md-3" style="display: none;" id="date_div">
-                                    <label>Date<span class="text-danger"></span></label>
-                                    <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                        <span></span> <i class="mdi mdi-menu-down"></i>
+                                            ?>
+                                        </select>
                                     </div>
-                                    <input type="hidden" id="startDate">
-                                    <input type="hidden" id="endDate">
+
+                                    <div class="form-group col-md-3" style="display: none;" id="date_div">
+                                        <label>Date<span class="text-danger"></span></label>
+                                        <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+                                            <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                            <span></span> <i class="mdi mdi-menu-down"></i>
+                                        </div>
+                                        <input type="hidden" id="startDate">
+                                        <input type="hidden" id="endDate">
+                                    </div>
+
                                 </div>
 
-
-                                <div class="form-group col-md-3 text-right m-b-0" style="margin-top: 29px;">
+                                <div class="form-group text-right m-b-0">
                                     <a href="<?= base_url("/policy_tranction/endorsement/list"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a href="<?= base_url("/policy_tranction/endorsement/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>                            
+                                    <a href="<?= base_url("/policy_tranction/endorsement/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
                                 </div>
 
                             </div>
-
                         </div>
                     </div>
                 </div>
+
             </div>
-
         </div>
-    </div>
-</div>
 
-<div class="row" id="endorsement_list">
-    <div class="col-12">
+    </div>
+
+    <div class="col-12" id="endorsement_list">
         <div class="card">
             <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
-                    <div class="col-6" style="align-self: center;">
+                 <!-- <div class="row" style="margin-bottom:1rem;">
+                   <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Endorsement List</h4>
                     </div>
-                    <div class="col-3" id="status_change" style="text-align: right; position: relative;top: 56px; left: 291px;">
+                    <div class="col-3">
                         <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" onclick="hide_list_show_add()">Add</button>
                     </div>
-                </div>
-                <div>
+                </div> -->
                 <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
@@ -325,136 +324,136 @@ custom-dropdown-menu {
                         </tr>
                     </thead>
                     <tbody>
-                        <?php foreach($endorsement_data_list as $index => $row){ ?>
-                        <tr>
-                            <td><?php echo $index+1; ?></td>
-                            <td><?php echo $issuer[$row['issuer']] ?? ''; ?></td>
-                            <td><?php echo $row['client_short_name']; ?></td>
-                            <td><?php echo $row['client_branch_name']; ?></td>
-                            <td><?php echo $row['insurer_short_name']; ?></td>
-                            <td><?php echo $row['policy_type']; ?></td>
-                            <td><?php echo $action_type[$row['action_type']]; ?></td>
-                            <td><?php echo $row['endorsement_no']; ?></td>
-                            <td><?php echo empty($row['data_received_date']) ? '' : date('d/m/Y', strtotime($row['data_received_date'])); ?></td>
-                            <td class="right-align-input"><?php echo $row['emp_count']; ?></td>
-                            <td class="right-align-input"><?php echo $row['dependent_count']; ?></td>
-                            <td><?php echo empty($row['policy_issue_date']) ? '' : date('d/m/Y', strtotime($row['policy_issue_date'])); ?></td>
-                            <td><?php echo $policy_status[$row['status']]; ?></td>
-
-                            <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>
-                                    <div class="dropdown-menu dropdown-menu-right">
-                                        <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>" onclick="getPolicyTransactionDataForEndorsementEdit('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')"> <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                        <?php foreach ($endorsement_data_list as $index => $row) { ?>
+                            <tr>
+                                <td class="text-center"><?php echo $index + 1; ?></td>
+                                <td><?php echo $issuer[$row['issuer']] ?: 'N/A'; ?></td><!-- Issuer -->
+                                <td><?php echo $row['client_short_name'] ?: 'N/A'; ?></td><!-- Client -->
+                                <td><?php echo $row['client_branch_name'] ?: 'N/A'; ?></td><!-- Branch -->
+                                <td><?php echo $row['insurer_short_name'] ?: 'N/A'; ?></td><!-- Insurer -->
+                                <td><?php echo $row['policy_type'] ?: 'N/A'; ?></td><!-- Policy -->
+                                <td><?php echo $action_type[$row['action_type']] ?: 'N/A';?></td>
+                                <td><?php echo $row['endorsement_no'] ?: 'N/A'; ?></td>
+                                <td><?php echo empty($row['data_received_date']) ? 'N/A' : date('d/m/Y', strtotime($row['data_received_date'])); ?></td>
+                                <td class="right-align-input"><?php echo $row['emp_count'] ?: '0'; ?></td>
+                                <td class="right-align-input"><?php echo $row['dependent_count'] ?: '0'; ?></td>
+                                <td><?php echo empty($row['policy_issue_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_issue_date'])); ?></td>
+                                <td><?php echo $policy_status[$row['status']] ?: 'N/A'; ?></td>
+                                <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>
+                                        <div class="dropdown-menu dropdown-menu-right">
+                                            <a class="dropdown-item btnEdit" data-id="<?= $row['id']; ?>" onclick="getPolicyTransactionDataForEndorsementEdit('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
+                                                <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                            </a>
+                                        </div>
                                     </div>
-                                </div>
-                            </td>
-                        </tr>
+                                </td>
+                            </tr>
                         <?php } ?>
                     </tbody>
-                </table>
-                </div>
-            </div>
-        </div>
+                </table><!-- table -->
+            </div><!-- card-body -->
+        </div><!-- card -->
     </div><!-- end col -->
 </div>
+
+
 <!-- end table row -->
 
 <?php include('policy_transaction_endorsement_form.php'); ?>
 <script>
-document.addEventListener("DOMContentLoaded", function () {
-    const table = document.getElementById("tickets-table");
-    
-    // Create custom dropdown
-    function createCustomDropdown(row) {
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        customDropdown.innerHTML = originalDropdown.innerHTML;
+    document.addEventListener("DOMContentLoaded", function() {
+        const table = document.getElementById("tickets-table");
 
-        // Remove inline onclick handlers and store them in data attributes
-        const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
-        customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
-            const originalOnclick = originalItems[index].getAttribute('onclick');
-            item.removeAttribute('onclick'); // Remove the inline handler
-            item.setAttribute('data-onclick', originalOnclick); // Store in data attribute
-        });
+        // Create custom dropdown
+        function createCustomDropdown(row) {
+            const originalDropdown = row.querySelector('.dropdown-menu');
+            if (!originalDropdown) return null;
 
-        return customDropdown;
-    }
+            const customDropdown = document.createElement('div');
+            customDropdown.className = 'custom-dropdown-menu';
+            customDropdown.innerHTML = originalDropdown.innerHTML;
 
-    let activeDropdown = null;
+            // Remove inline onclick handlers and store them in data attributes
+            const originalItems = originalDropdown.querySelectorAll('.dropdown-item');
+            customDropdown.querySelectorAll('.dropdown-item').forEach((item, index) => {
+                const originalOnclick = originalItems[index].getAttribute('onclick');
+                item.removeAttribute('onclick'); // Remove the inline handler
+                item.setAttribute('data-onclick', originalOnclick); // Store in data attribute
+            });
 
-    // Add click event listener to rows
-    table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+            return customDropdown;
+        }
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the first column
-            if (event.target.closest('td:first-child')) return;
+        let activeDropdown = null;
 
-            if (activeDropdown) activeDropdown.style.display = 'none';
+        // Add click event listener to rows
+        table.querySelectorAll("tbody tr").forEach(row => {
+            const customDropdown = createCustomDropdown(row);
+            if (!customDropdown) return;
 
-            const rect = event.target.getBoundingClientRect();
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`;
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
+            document.body.appendChild(customDropdown);
 
-        // Handle custom dropdown clicks
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-                e.preventDefault();
-                
-                // Execute the original onclick from data attribute
-                const onclickAttr = this.getAttribute('data-onclick');
-                if (onclickAttr) eval(onclickAttr);
+            row.addEventListener("click", function(event) {
+                // Ignore clicks on the first column
+                if (event.target.closest('td:first-child')) return;
 
-                // Handle href navigation
-                const href = this.getAttribute('href');
-                if (href && href !== '#') window.location.href = href;
+                if (activeDropdown) activeDropdown.style.display = 'none';
 
-                if (activeDropdown) {
-                    activeDropdown.style.display = 'none';
-                    activeDropdown = null;
-                }
-                
-                e.stopPropagation();
+                const rect = event.target.getBoundingClientRect();
+                customDropdown.style.display = 'block';
+                customDropdown.style.position = 'fixed';
+                customDropdown.style.left = `${rect.left}px`;
+                customDropdown.style.top = `${rect.bottom + 5}px`;
+                activeDropdown = customDropdown;
+
+                event.stopPropagation();
+            });
+
+            // Handle custom dropdown clicks
+            customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+                item.addEventListener('click', function(e) {
+                    e.preventDefault();
+
+                    // Execute the original onclick from data attribute
+                    const onclickAttr = this.getAttribute('data-onclick');
+                    if (onclickAttr) eval(onclickAttr);
+
+                    // Handle href navigation
+                    const href = this.getAttribute('href');
+                    if (href && href !== '#') window.location.href = href;
+
+                    if (activeDropdown) {
+                        activeDropdown.style.display = 'none';
+                        activeDropdown = null;
+                    }
+
+                    e.stopPropagation();
+                });
             });
         });
-    });
 
-    // Close dropdown on outside click
-    document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+        // Close dropdown on outside click
+        document.addEventListener("click", function() {
+            if (activeDropdown) {
+                activeDropdown.style.display = 'none';
+                activeDropdown = null;
+            }
+        });
     });
-});
-
 </script>
 <script>
-
-    var client_list = ''; 
-    var branch_list = ''; 
-    var policy_list = <?= json_encode($endorsementPolicies) ?>; 
+    var client_list = '';
+    var branch_list = '';
+    var policy_list = <?= json_encode($endorsementPolicies) ?>;
     // console.log("POLICY List",policy_list);
-    var policyListByClient = <?= json_encode($endorsementPolicyListByClient) ?>; 
+    var policyListByClient = <?= json_encode($endorsementPolicyListByClient) ?>;
     var branch_policy = '';
     var unit_list = '';
 
     // select2 document ready
-    $(document).ready(function(){
+    $(document).ready(function() {
 
         getClientAndBranchAndPolicy()
 
@@ -478,42 +477,64 @@ document.addEventListener("DOMContentLoaded", function () {
         $('#client_id').select2();
         $('#client_branch_id').select2();
         $('#client_policy_id').select2();
-        
+
     })
 
     //DataTable document ready
     $(document).ready(function() {
         var ticketsTable = $('#tickets-table');
 
-        if (ticketsTable.length) { 
+        if (ticketsTable.length) {
             ticketsTable.DataTable({
                 scrollX: true,
-                dom: "<'row'<'col-sm-6'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
+                dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right
                     "<'row'<'col-sm-12'tr>>" +
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-                buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-Endorsement-List',
-                    exportOptions: {
-                        columns: ':not(:last-child)' 
+            buttons: [            
+                   {
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function (e, dt, node, config) {
+                            hide_list_show_add();
+                        },
+                        attr: { id: 'btnAdd' }
                     },
-                }],
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'Policy-Tranction-Endorsement-List',
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
+                    }
+                ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
-                pageLength: 25, // Set default number of rows per page (optional)
-                ordering: false, 
+                pageLength: 10, // Set default number of rows per page (optional)
+                ordering: false,
             });
         } else {
             console.error("Table not found.");
         }
+        $('#btnAdd').wrap('<div id="status_change"></div>');
     });
 
     // Date document ready
-    $(document).ready(function(){
+    $(document).ready(function() {
 
         var today = new Date();
 
@@ -567,14 +588,13 @@ document.addEventListener("DOMContentLoaded", function () {
         });
 
         var month = flatpickr("#month", {
-            dateFormat: "M/Y", 
-            allowInput: false, 
+            dateFormat: "M/Y",
+            allowInput: false,
         });
 
     });
 
-    function hide_list_show_add() 
-    {   
+    function hide_list_show_add() {
         removeAllColumnsExceptFirst('insurerTable');
         $('.hideter').hide()
         $('.hidetp').hide()
@@ -588,16 +608,14 @@ document.addEventListener("DOMContentLoaded", function () {
         $('#invoice_no').attr('required', false)
     }
 
-    function show_list_hide_add() 
-    {
+    function show_list_hide_add() {
         $('#endorsement_form').hide()
         $('#endorsement_list').show()
         $('#endorsement_filter').show()
 
     }
 
-    function getClientAndBranchAndPolicy()
-    {   
+    function getClientAndBranchAndPolicy() {
         $.ajax({
             url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
             type: "GET",
@@ -605,15 +623,15 @@ document.addEventListener("DOMContentLoaded", function () {
             success: function(res) {
 
                 console.log('getClientAndBranchAndPolicy', res);
-                
-                if(res.status == true){
+
+                if (res.status == true) {
                     branch_list = res.branch_data;
                     // policy_list = res.policy_data;
                     // policyListByClient = res.policyListByClient;
                     client_list = res.client_data;
                     unit_list = res.unit_data;
                     appendClients(res.client_data);
-                }else{
+                } else {
                     console.log('No data found');
                 }
 
@@ -625,8 +643,7 @@ document.addEventListener("DOMContentLoaded", function () {
         });
     }
 
-    function appendClients(data) 
-    {
+    function appendClients(data) {
         $('#client_id').empty();
 
         $('#client_id').append($('<option>', {
@@ -641,7 +658,7 @@ document.addEventListener("DOMContentLoaded", function () {
 
         $.each(data, function(index, item) {
 
-            if(item.client_policy_count > 0){
+            if (item.client_policy_count > 0) {
 
                 var option = $('<option>', {
                     value: item.id,
@@ -653,8 +670,7 @@ document.addEventListener("DOMContentLoaded", function () {
         });
     }
 
-    function appendBranch(data) 
-    {
+    function appendBranch(data) {
 
         $('#client_branch_id').empty();
 
@@ -667,21 +683,20 @@ document.addEventListener("DOMContentLoaded", function () {
 
             var option = $('<option>', {
                 value: item.id,
-                text: item.branch_name 
+                text: item.branch_name
             });
             $('#client_branch_id').append(option);
         });
     }
 
-    function appendPolicies(data) 
-    {
+    function appendPolicies(data) {
         if (!data) {
 
             toastr.warning("There are no policies in Inception for the selected client and branch.");
         }
         console.log('appendPolicies', data);
         console.log('appendPolicies', $('#client_policy_id'));
-        
+
         $('#client_policy_id').empty();
         $('#client_policy_id').append($('<option>', {
             value: '',
@@ -692,25 +707,24 @@ document.addEventListener("DOMContentLoaded", function () {
             var option = $('<option>', {
                 value: item.id,
                 text: item.policy_type + '-' + item.policy_no,
-                'data-sd' : item.policy_start_date,
-                'data-ed' : item.policy_end_date,
-                'data-insurer' : item.insurer_branch_id + '-' + item.insurer_id,
-                'data-policy' : item.policy_no,
-                'data-cd' : item.cd_ac_no,
-                'data-ebp' : item.ebp,
-                'data-etp' : item.etp,
-                'data-iep' : item.iep,
-                'data-itp' : item.itp,
-                'data-bap' : item.bap,
-                'data-tpa' : item.tpa_branch_id + '-' + item.tpa_id,
-                'data-ptid' : item.policy_type_id,
+                'data-sd': item.policy_start_date,
+                'data-ed': item.policy_end_date,
+                'data-insurer': item.insurer_branch_id + '-' + item.insurer_id,
+                'data-policy': item.policy_no,
+                'data-cd': item.cd_ac_no,
+                'data-ebp': item.ebp,
+                'data-etp': item.etp,
+                'data-iep': item.iep,
+                'data-itp': item.itp,
+                'data-bap': item.bap,
+                'data-tpa': item.tpa_branch_id + '-' + item.tpa_id,
+                'data-ptid': item.policy_type_id,
             });
             $('#client_policy_id').append(option);
         });
     }
 
-    function logSelectedIds() 
-    {
+    function logSelectedIds() {
         var selectedIds = [];
         $('.row-select:checked').each(function() {
             selectedIds.push($(this).data('id'));
@@ -726,12 +740,12 @@ document.addEventListener("DOMContentLoaded", function () {
 
     $("#invoiceForm").submit(function(event) {
 
-        event.preventDefault(); 
+        event.preventDefault();
 
-        var isValid = $('#invoiceForm').parsley().validate();    
-        if (!isValid) { 
+        var isValid = $('#invoiceForm').parsley().validate();
+        if (!isValid) {
             console.log('Form is Empty', 'Warning');
-            return ; 
+            return;
         }
 
         form_action = '<?= base_url("util/updateInvoiceStatus"); ?>';
@@ -746,7 +760,7 @@ document.addEventListener("DOMContentLoaded", function () {
         formData.append('ids', JSON.stringify(ids));
 
         $.ajax({
-            data:formData,
+            data: formData,
             url: form_action,
             type: "POST",
             dataType: 'json',
@@ -757,16 +771,16 @@ document.addEventListener("DOMContentLoaded", function () {
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
 
-                if(res.status == true){
+                if (res.status == true) {
                     toastr.success(res.message, 'Success');
-                }else{
+                } else {
                     toastr.error(res.message, 'Error');
                 }
 
                 window.location.reload();
                 $('.close').click();
             },
-            error: function (xhr, status, error) {
+            error: function(xhr, status, error) {
                 console.error(xhr.responseText);
                 console.error(status, error);
                 $('.loader').fadeOut();
@@ -775,197 +789,193 @@ document.addEventListener("DOMContentLoaded", function () {
         });
     });
 
-    $('#invoice_status').change(function(){
+    $('#invoice_status').change(function() {
 
         let value = $(this).val()
 
-        if(value == 'generated'){
+        if (value == 'generated') {
             $('#invoice_no_div').show()
             $('#invoice_no').attr('required', true)
-        }else{
+        } else {
             $('#invoice_no_div').hide()
             $('#invoice_no').attr('required', false)
         }
     })
 
-    $('#invoice_status_modal').change(function(){
+    $('#invoice_status_modal').change(function() {
 
         let value = $(this).val()
 
-        if(value == 'generated'){
+        if (value == 'generated') {
             $('#invoice_no_div_modal').show()
             $('#invoice_no_modal').attr('required', true)
-        }else{
+        } else {
             $('#invoice_no_div_modal').hide()
             $('#invoice_no_modal').attr('required', false)
 
         }
     })
-
 </script>
 
 
 <script>
+    $(document).ready(function() {
+        getURLParams()
+        $('#client_id_for_search').select2();
+        $('#insurer_id_for_search').select2();
+        $('#policy_type_for_search').select2();
+    })
 
-$(document).ready(function() {
-    getURLParams()
-    $('#client_id_for_search').select2();
-    $('#insurer_id_for_search').select2();
-    $('#policy_type_for_search').select2();
-})
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-function fetchEmpolyeeList(event) 
-{
-    event.preventDefault(); // Prevent default action
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id_for_search').val();
+        var insurer_id = $('#insurer_id_for_search').val();
+        var policy_type_id = $('#policy_type_for_search').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer_for_search').val();
+        var status = $('#policy_status_for_search').val();
 
-    var start_date = $('#startDate').val();
-    var end_date = $('#endDate').val();
-    var client_id = $('#client_id_for_search').val();
-    var insurer_id = $('#insurer_id_for_search').val();
-    var policy_type_id = $('#policy_type_for_search').val();
-    var date_type = $('#date_type').val();
-    var issuer = $('#issuer_for_search').val();
-    var status = $('#policy_status_for_search').val();
+        console.log(start_date + '-' + end_date);
 
-    console.log(start_date + '-' + end_date);
+        var queryParams = {
+            start_date: start_date,
+            end_date: end_date,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            policy_type_id: policy_type_id,
+            date_type: date_type,
+            issuer: issuer,
+            status: status,
+        };
 
-    var queryParams = {
-        start_date: start_date,
-        end_date: end_date,
-        client_id: client_id,
-        insurer_id: insurer_id,
-        policy_type_id: policy_type_id,
-        date_type: date_type,
-        issuer: issuer,
-        status: status,
-    };
-
-    console.log(queryParams)
-
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
-
-function objectToQueryString(obj) 
-{
-    return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-}
-
-function getURLParams() 
-{
-    const url = new URL(window.location.href);
-    const params = new URLSearchParams(url.search);
-
-    const startDate = params.get('start_date') || 0; // Default to 0 if not found
-    const endDate = params.get('end_date') || 0; // Default to 0 if not found
-    const client_id = params.get('client_id') || 0; // Default to 0 if not found
-    const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
-    const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
-    const date_type = params.get('date_type') || 0; // Default to 0 if not found
-    const issuer = params.get('issuer') || 0; // Default to 0 if not found
-    const status = params.get('status') || 0; // Default to 0 if not found
-
-    hideDateField(date_type)
-
-    // console.log('startDate', startDate)
-    // console.log('endDate', endDate)
-    // console.log('client_id', client_id)
-    // console.log('insurer_id', insurer_id)
-    // console.log('policy_type_id', policy_type_id)   
-    // console.log('date_type', date_type)
-    // console.log('issuer', issuer)
-    // console.log('status', status)
-
-    // Log the values or use them as needed
-    // console.log('Start Date:', startDate);
-    // console.log('End Date:', endDate);
-
-    if (startDate != 0 && endDate != 0) {
-        setTimeout(function(){
-            $('#start_date').val(startDate)
-            $('#end_date').val(endDate)
-            $('#client_id_for_search').val(client_id).change()
-            $('#insurer_id_for_search').val(insurer_id).change()
-            $('#policy_type_for_search').val(policy_type_id).change()
-            $('#date_type').val(date_type)
-            $('#issuer_for_search').val(issuer)
-            $('#policy_status_for_search').val(status)
-        },1000)
+        console.log(queryParams)
 
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-}
-
-$(function() {
-
-    const url = new URL(window.location.href);
-    const params = new URLSearchParams(url.search);
-
-    // Get start and end dates from URL parameters, or use default values
-    const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD/MM/YYYY');
-    const endDateParam = params.get('end_date') || moment().format('DD/MM/YYYY');
-
-    // Parse the dates to moment objects
-    var start = moment(startDateParam, 'DD/MM/YYYY');
-    var end = moment(endDateParam, 'DD/MM/YYYY');
-
-    // var start = moment().subtract(29, 'days');
-    // var end = moment();
-
-    function cb(start, end) {
-        $('#reportrange span').html(start.format('D/MM/YYYY') + ' - ' + end.format('D/MM/YYYY'));
-        $('#startDate').val(start.format('DD/MM/YYYY'));
-        $('#endDate').val(end.format('DD/MM/YYYY'));
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
     }
 
-    $('#reportrange').daterangepicker({
-        startDate: start,
-        endDate: end,
-        ranges: {
-        'Today': [moment(), moment()],
-        'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-        'Last 7 Days': [moment().subtract(6, 'days'), moment()],
-        'Last 30 Days': [moment().subtract(29, 'days'), moment()],
-        'This Month': [moment().startOf('month'), moment().endOf('month')],
-        'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        const startDate = params.get('start_date') || 0; // Default to 0 if not found
+        const endDate = params.get('end_date') || 0; // Default to 0 if not found
+        const client_id = params.get('client_id') || 0; // Default to 0 if not found
+        const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+        const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
+        const date_type = params.get('date_type') || 0; // Default to 0 if not found
+        const issuer = params.get('issuer') || 0; // Default to 0 if not found
+        const status = params.get('status') || 0; // Default to 0 if not found
+
+        hideDateField(date_type)
+
+        // console.log('startDate', startDate)
+        // console.log('endDate', endDate)
+        // console.log('client_id', client_id)
+        // console.log('insurer_id', insurer_id)
+        // console.log('policy_type_id', policy_type_id)   
+        // console.log('date_type', date_type)
+        // console.log('issuer', issuer)
+        // console.log('status', status)
+
+        // Log the values or use them as needed
+        // console.log('Start Date:', startDate);
+        // console.log('End Date:', endDate);
+
+        if (startDate != 0 && endDate != 0) {
+            setTimeout(function() {
+                $('#start_date').val(startDate)
+                $('#end_date').val(endDate)
+                $('#client_id_for_search').val(client_id).change()
+                $('#insurer_id_for_search').val(insurer_id).change()
+                $('#policy_type_for_search').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer_for_search').val(issuer)
+                $('#policy_status_for_search').val(status)
+            }, 1000)
+
         }
-    }, cb);
 
-    cb(start, end);
+    }
 
-    $('#clear-filters').on('click', function() {
-        // Reset all select dropdowns to the first option
-        $('#client_id_for_search').val('0').change();
-        $('#insurer_id_for_search').val('0').change();
-        $('#policy_type_for_search').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer_for_search').val('0');
-        $('#policy_status_for_search').val('0');
-        $('#date_div').hide()
+    $(function() {
+
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        // Get start and end dates from URL parameters, or use default values
+        const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD/MM/YYYY');
+        const endDateParam = params.get('end_date') || moment().format('DD/MM/YYYY');
+
+        // Parse the dates to moment objects
+        var start = moment(startDateParam, 'DD/MM/YYYY');
+        var end = moment(endDateParam, 'DD/MM/YYYY');
+
+        // var start = moment().subtract(29, 'days');
+        // var end = moment();
+
+        function cb(start, end) {
+            $('#reportrange span').html(start.format('D/MM/YYYY') + ' - ' + end.format('D/MM/YYYY'));
+            $('#startDate').val(start.format('DD/MM/YYYY'));
+            $('#endDate').val(end.format('DD/MM/YYYY'));
+        }
+
+        $('#reportrange').daterangepicker({
+            startDate: start,
+            endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
+            ranges: {
+                'Today': [moment(), moment()],
+                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+            }
+        }, cb);
+
+        cb(start, end);
+
+        $('#clear-filters').on('click', function() {
+            // Reset all select dropdowns to the first option
+            $('#client_id_for_search').val('0').change();
+            $('#insurer_id_for_search').val('0').change();
+            $('#policy_type_for_search').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer_for_search').val('0');
+            $('#policy_status_for_search').val('0');
+            $('#date_div').hide()
+
+            // Reset the date range picker to default
+            $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
+            $('#reportrange').data('daterangepicker').setEndDate(moment());
+            cb(start, end); // Update the displayed date range
+        });
 
-        // Reset the date range picker to default
-        $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
-        $('#reportrange').data('daterangepicker').setEndDate(moment());
-        cb(start, end); // Update the displayed date range
     });
 
-});
+    function hideDateField(input = null) {
+        let val = $('#date_type').val();
 
-function hideDateField(input = null)
-{   
-    let val = $('#date_type').val();
+        if (input) {
+            val = input;
+        }
 
-    if(input){
-        val = input;
+        if (val != 0) {
+            $('#date_div').show()
+        } else {
+            $('#date_div').hide()
+        }
     }
-
-    if(val != 0){
-        $('#date_div').show()
-    }else{
-        $('#date_div').hide()
-    }
-}
-
 </script>
\ No newline at end of file
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 76ae987c..4ccac05a 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -141,6 +141,22 @@
         font-size: 24px;
     }
 
+/** newly implemented */
+#insurerTable thead th:first-child {  
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+    background-color: transparent !important;
+}
+#insurerTable tbody td {  
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+    background-color: transparent !important;
+}
+#insurerTable th{
+    color: black !important;
+    background-color: transparent !important;
+}
+
 </style>
 
 <div class="tab-pane fade active show" id="form">
@@ -184,15 +200,18 @@
                         <div class="row">
                             <!-- Section 1 -->
                             <div class="col-md-12">
-                                <div class="form-section">
+                                
                                     <div id="accordion_0" class="mb-0">
-                                        <div class="card mb-0">
-                                            <h4 class="m-1">Client Details
-                                                <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
-                                                    <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                </a>
-                                            </h4>
-                                            <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_0">
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Client Details</span>
+                                                                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                                                        aria-expanded="true">
+                                                                        <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                                    </a>
+                                        </label>
+                                        <div class="card mb-1">
+                                          <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_0">
+                                            <div class="card-body">
                                                 <div class="row">
                                                     <div class="form-group col-md-3">
                                                         <label for="email"> Policy Type <span class="text-danger">*</span></label>
@@ -281,15 +300,15 @@
                                                     </div>
                                                 </div>
                                             </div>
+                                         </div>
                                         </div>
                                     </div>
-                                </div>
+                                
                             </div>
                         </div>
 
                         <div class="row" id="vehicle_row_div">
                         </div>
-
                         <!-- Client Section -->
                         <div class="row" id="client_row_div">
                         </div>
@@ -297,16 +316,18 @@
                         <!-- Pre sales Row -->
                         <div class="row" id="pre_sales_row">
                             <div class="col-md-12">
-                                <div class="form-section">
+                                
                                     <div id="accordion_1" class="mb-0">
-                                        <div class="card mb-0">
-                                            <h4 class="m-1">Pre Sales
-                                                <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo" aria-expanded="true">
-                                                    <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                </a>
-                                            </h4>
-                                            <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_1">
-
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Pre Sales</span>
+                                                                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
+                                                                        aria-expanded="true">
+                                                                        <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                                    </a>
+                                        </label>
+                                        <div class="card mb-1">
+                                          <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_1">
+                                            <div class="card-body">
                                                 <div class="row" id="policyholdernamediv" style="display: none;">                                        
                                                     <div class="form-group col-md-3">
                                                         <label for="bp_igst">Policyholder Name</label>
@@ -495,24 +516,28 @@
                                                     </div> -->
                                                 </div>
                                             </div>
+                                          </div>
                                         </div>
                                     </div>
-                                </div>
+                                
                             </div>
                         </div> 
                         
                         <!-- sales Row -->
                         <div class="row" id="sales_row" style="display: none;">
                             <div class="col-md-12">
-                                <div class="form-section">
+                                
                                     <div id="accordion_2" class="mb-0">
-                                        <div class="card mb-0">
-                                            <h4 class="m-1">Sales
-                                                <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseThree" aria-expanded="true">
-                                                    <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                </a>
-                                            </h4>
-                                            <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_2">
+                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Sales</span>
+                                                                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseThree"
+                                                                        aria-expanded="true">
+                                                                        <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                                    </a>
+                                        </label>
+                                        <div class="card mb-1">
+                                          <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_2">
+                                            <div class="card-body">
                                                 <div class="row">
 
                                                     <div class="form-group col-md-3" id="base_policy_id" style="display: none;">
@@ -652,20 +677,27 @@
                                                     </div>
 
                                                 </div>
-                                                <hr>
+                                            </div>
+                                         </div>
+                                        </div>
+                                    </div> <!-- accordion_2 div closed here -->
+                                
+                            </div><!-- 1st col-md-12 div closed here -->
+                        
 
-                                                <!-- Premium Details -->
-                                                <div class="row">
+                                                    <!-- Premium Details -->
                                                     <div class="col-md-12">
-                                                        <div class="form-section">
                                                             <div id="accordion_3" class="mb-0">
+                                                                <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                    <span class="font-color-black">Premium Details</span>
+                                                                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseFour"
+                                                                        aria-expanded="true">
+                                                                        <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                                    </a>
+                                                                </label>
                                                                 <div class="card mb-0">
-                                                                    <h4 class="m-1">Premium Details
-                                                                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseFour" aria-expanded="true">
-                                                                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                                                                        </a>
-                                                                    </h4>
-                                                                    <div id="collapseFour" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                                  <div id="collapseFour" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_3">
+                                                                    <div class="card-body">
                                                                         <div class="row d-none" id="add_more_row">
                                                                             <div class="col-md-2">
                                                                                 <!-- <label for="setInsurerCount">Insurer Count : </label> -->
@@ -681,7 +713,7 @@
                                                                         </div>
 
                                                                         <div id="insurerTableContainer" style="overflow: auto;">
-                                                                            <table data-custom-table-css="table" class="table table-bordered co_share_table" id="insurerTable">
+                                                                            <table data-custom-table-css="table" class="table co_share_table" id="insurerTable">
                                                                                 <thead>
                                                                                     <tr>
                                                                                         <th>Premium Details</th>
@@ -821,22 +853,18 @@
                                                                                     </tr>
                                                                                 </tbody>
                                                                             </table>
-                                                                        </div>
+                                                                        </div> <!-- insurerTableContainer div closed here-->
 
                                                                     </div>
+                                                                  </div> <!-- collapseFour div closed here -->
                                                                 </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+                                                            </div> <!-- accordion_3 div closed here -->
+                                                    </div> <!-- 2nd col-md-12 closed here -->
+
+                        </div> <!-- sales_row div closed here -->
+                                                
                         
-                        <div class="form-group text-right m-b-0" id="submitButton">
+                        <div class="form-group text-right mt-1 m-b-0" id="submitButton">
                             <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
                                 id="btnSubmit">Submit</button>
                         </div>
@@ -4089,8 +4117,10 @@
         // Update header
         $('#insurerTable thead tr').append(`
             <th>
+             <span style="display:flex; justify-content:space-between; align-items:center;">
                 Insurer ${insurerCount}
                 ${insurerCount > 1 ? `<a data-count="${insurerCount}" class="text-danger mdi mdi-delete delete-insurer" style="margin-left: 135px;"></a>` : ''}
+             </span>
             </th>
         `);
 
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index c3e72dcf..ef7ff681 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -146,15 +146,16 @@ table.dataTable tbody td {
 </style>
 
 <div class="row" id="inception_filter">
-    <div class="col-12" style="margin-top: -12px;">
+    <div class="col-12">
         <div id="accordion" class="mb-3">
             <div class="card mb-1">
-                <h4 class="m-1"> 
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h4>
+                <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
                 <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                     <div class="card-body">
                         <div class="form-group">
@@ -256,7 +257,11 @@ table.dataTable tbody td {
                                     <input type="hidden" id="endDate">
                                 </div>
 
-                                <div class="form-group col-md-3 text-right m-b-0" style="margin-top: 29px;">
+                                
+                            </div>
+                            <div class="form-row">
+
+                                <div class="form-group col-md-12 text-right m-b-0">
                                     <a href="<?= base_url("/policy_tranction/inception/list"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
                                     <a href="<?= base_url("/policy_tranction/inception/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>                            
                                 </div>
@@ -309,21 +314,21 @@ table.dataTable tbody td {
                         <tbody>
                             <?php foreach($inception_data_list as $index => $row){ ?>
                             <tr>
-                                <td><?php echo $index+1; ?></td>
+                                <td class="text-center"><?php echo $index+1; ?></td>
                                 <td><?php echo $issuer[$row['issuer']]; ?></td>
-                                <td><?php echo $issuing_type[$row['issue_type']]; ?></td>
-                                <td><?php echo $client_type[$row['client_type']] ?? '-'; ?></td>
+                                <td><?php echo $issuing_type[$row['issue_type']] ?: 'N/A'; ?></td>
+                                <td><?php echo $client_type[$row['client_type']] ?? 'N/A'; ?></td>
                                 <td><?php echo $row['client_type'] == 2 ? $row['client_name'] . " - " . (!empty($row['pan']) ? $row['pan'] :  'N/A') : $row['client_short_name'] . ' - ' . $row['client_branch_name']; ?></td>
-                                <td><?php echo $row['insurer_short_name']; ?></td>
-                                <td><?php echo $row['policy_type']; ?></td>
-                                <td><?php echo $row['policy_no']; ?></td>
-                                <td><?php echo empty($row['policy_issue_date']) ? '' : date('d/m/Y', strtotime($row['policy_issue_date'])); ?></td>
-                                <td><?php echo empty($row['policy_issue_date']) ? '' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
-                                <td><?php echo empty($row['policy_issue_date']) ? '' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
-                                <td class="right-align-input"><?php echo $row['emp_count']; ?></td>
-                                <td class="right-align-input"><?php echo $row['dependent_count']; ?></td>
-                                <td><?php echo $policy_status[$row['status']]; ?></td>
-                                <td><?php echo $row['user_name']; ?></td>
+                                <td><?php echo $row['insurer_short_name'] ?: 'N/A'; ?></td>
+                                <td><?php echo $row['policy_type'] ?: 'N/A'; ?></td>
+                                <td><?php echo $row['policy_no'] ?: 'N/A'; ?></td>
+                                <td><?php echo empty($row['policy_issue_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_issue_date'])); ?></td>
+                                <td><?php echo empty($row['policy_issue_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
+                                <td><?php echo empty($row['policy_issue_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
+                                <td class="right-align-input"><?php echo $row['emp_count'] ?: '0'; ?></td>
+                                <td class="right-align-input"><?php echo $row['dependent_count'] ?: '0'; ?></td>
+                                <td><?php echo $policy_status[$row['status']] ?: 'N/A'; ?></td>
+                                <td><?php echo $row['user_name'] ?: 'N/A'; ?></td>
                                 <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>
@@ -556,33 +561,44 @@ $(document).ready(function() {
     if (ticketsTable.length) {
         ticketsTable.DataTable({
             scrollX: true,
-            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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [
-                {
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-Inception-List',
-                    exportOptions: {
-                        columns: ':not(:last-child)'
+            dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right
+                    "<'row'<'col-sm-12'tr>>" +
+                    "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+            buttons: [            
+                   {
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function (e, dt, node, config) {
+                            hide_list_show_add();
+                        }
                     },
-                }, 
-                {
-                    text: 'Add',
-                    className: 'buttons-html5 addbtnStyle',
-                    action: function (e, dt, node, config) {
-                        hide_list_show_add();
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Policy-Tranction-Inception-List',
+                                        exportOptions: {
+                                              columns: ':not(:last-child)'
+                                        },
+                                    }
+                        ]
                     }
-                }
-
-            ],
+                ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             // ordering: false,
         });
     } else {
diff --git a/app/Views/policy_type_list.php b/app/Views/policy_type_list.php
index b79fc7f2..990f06a5 100755
--- a/app/Views/policy_type_list.php
+++ b/app/Views/policy_type_list.php
@@ -1,17 +1,17 @@
 <style>
-.custom-dropdown-menu {
+  .custom-dropdown-menu {
     display: none;
     position: fixed;
     background-color: #ffffff !important;
-    border: 1px solid rgba(0,0,0,.15);
+    border: 1px solid rgba(0, 0, 0, .15);
     border-radius: 0.25rem;
     padding: 0.5rem 0;
     min-width: 10rem;
     z-index: 9999;
-    box-shadow: 0 0 10px rgba(0,0,0,0.1);
-}
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  }
 
-.custom-dropdown-menu .dropdown-item {
+  .custom-dropdown-menu .dropdown-item {
     display: block !important;
     width: 100% !important;
     padding: 0.5rem 1rem !important;
@@ -24,25 +24,25 @@
     border: 0 !important;
     text-decoration: none !important;
     position: relative !important;
-}
+  }
 
-.custom-dropdown-menu .dropdown-item:hover {
+  .custom-dropdown-menu .dropdown-item:hover {
     background-color: #f8f9fa !important;
     color: #16181b !important;
     cursor: pointer !important;
-}
+  }
 
-.custom-dropdown-menu .dropdown-item i {
+  .custom-dropdown-menu .dropdown-item i {
     margin-right: 8px !important;
     vertical-align: middle !important;
-}
+  }
 
-.table tbody tr {
+  .table tbody tr {
     cursor: pointer;
-}
+  }
 
-/* Ensure the dropdown menu has a solid background */
-.custom-dropdown-menu::before {
+  /* Ensure the dropdown menu has a solid background */
+  .custom-dropdown-menu::before {
     content: '';
     position: absolute;
     top: 0;
@@ -51,26 +51,28 @@
     bottom: 0;
     background: #ffffff;
     z-index: -1;
-}
+  }
 
-/* Add a subtle backdrop effect */
-.custom-dropdown-menu::after {
+  /* Add a subtle backdrop effect */
+  .custom-dropdown-menu::after {
     content: '';
     position: fixed;
     top: 0;
     left: 0;
     right: 0;
     bottom: 0;
-    background: rgba(0,0,0,0.05);
+    background: rgba(0, 0, 0, 0.05);
     z-index: -2;
     pointer-events: none;
-}
+  }
 </style>
-<div class="row" id="policy_list">
+
+<div class="container-fluid-min">
+  <div class="row" id="policy_list">
     <div class="col-12">
-        <div class="card">
-            <div class="card-body maincard">
-                    <!-- <div class="row" style="margin-bottom:1rem;">
+      <div class="card">
+        <div class="card-body maincard">
+          <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Policy Type List</h4>
                         </div>
@@ -78,32 +80,32 @@
                             <a href="<?= base_url("master/policy/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
                         </div>
                     </div> -->
-                    <div class="row" style="margin-bottom:1rem;">
+          <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Policy</h4>
                         </div>
-                    </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">Policy Type</th>
-                            <th class="font-weight-medium">Policy Long Name</th>
-                            <th class="font-weight-medium">BAP</th>
-                            <th class="font-weight-medium">Category</th>
-                            <th class="font-weight-medium">BAP Category</th>
-                            <th class="font-weight-medium">Action</th>
-                        </tr>
-                    </thead>
+                    </div> -->
+          <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+            id="tickets-table">
+            <thead class="bg-light">
+              <tr>
+                <th class="font-weight-medium">Policy Type</th>
+                <th class="font-weight-medium">Policy Long Name</th>
+                <th class="font-weight-medium">BAP</th>
+                <th class="font-weight-medium">Category</th>
+                <th class="font-weight-medium">BAP Category</th>
+                <th class="font-weight-medium">Action</th>
+              </tr>
+            </thead>
 
                     <tbody>
                     <?php if(is_array($policyList)) {foreach($policyList as $row){ ?>
                       <tr>
-                        <td><?php echo $row['policy_type']; ?> </td>
-                        <td><?php echo $row['long_name']; ?> </td>
-                        <td><?php echo $row['bap']; ?></td>
-                        <td><?php echo $row['allocg']; ?></td>
-                        <td><?php echo $row['alloci']; ?></td>
+                        <td><?php echo $row['policy_type'] ?: 'N/A'; ?> </td>
+                        <td><?php echo $row['long_name'] ?: 'N/A'; ?> </td>
+                        <td><?php echo $row['bap'] ?: 'N/A'; ?></td>
+                        <td><?php echo $row['allocg'] ?: 'N/A'; ?></td>
+                        <td><?php echo $row['alloci'] ?: 'N/A'; ?></td>
                         <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>
@@ -116,232 +118,254 @@
                       </tr>
                     <?php }}?>
 
-                    </tbody>
-                </table>
-            </div>
+            </tbody>
+          </table>
         </div>
+      </div>
     </div><!-- end col -->
+  </div>
 </div>
+
 <!-- end row -->
 
 <script>
-document.addEventListener("DOMContentLoaded", function () {
+  document.addEventListener("DOMContentLoaded", function() {
     const table = document.getElementById("tickets-table");
-    
+
     // Create custom dropdown
     function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
+      // Get the original dropdown items
+      const originalDropdown = row.querySelector('.dropdown-menu');
+      if (!originalDropdown) return null;
+
+      // Create new dropdown with proper background and spacing
+      const customDropdown = document.createElement('div');
+      customDropdown.className = 'custom-dropdown-menu';
+
+      // Copy inner content while maintaining icon alignment
+      customDropdown.innerHTML = originalDropdown.innerHTML;
+
+      return customDropdown;
     }
 
     let activeDropdown = null;
 
     // Add click event listener to rows
     table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+      const customDropdown = createCustomDropdown(row);
+      if (!customDropdown) return;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+      document.body.appendChild(customDropdown);
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+      row.addEventListener("click", function(event) {
+        // Ignore clicks on the action column
+        if (event.target.closest('td:last-child')) {
+          return;
+        }
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
+        // Hide any active dropdown
+        if (activeDropdown) {
+          activeDropdown.style.display = 'none';
+        }
 
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+        // Get click position
+        const rect = event.target.getBoundingClientRect();
 
-            // Set as active dropdown
-            activeDropdown = customDropdown;
+        // Position the dropdown with some offset
+        customDropdown.style.display = 'block';
+        customDropdown.style.position = 'fixed';
+        customDropdown.style.left = `${rect.left}px`;
+        customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
 
-            event.stopPropagation();
-        });
-
-        // Preserve click handlers
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-              e.preventDefault();
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
-                }
-                
-                e.stopPropagation();
-            });
+        // Set as active dropdown
+        activeDropdown = customDropdown;
+
+        event.stopPropagation();
+      });
+
+      // Preserve click handlers
+      customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+        item.addEventListener('click', function(e) {
+          e.preventDefault();
+          const onclickAttr = this.getAttribute('onclick');
+          if (onclickAttr) {
+            eval(onclickAttr);
+          }
+
+          const href = this.getAttribute('href');
+          if (href && href !== '#') {
+            window.location.href = href;
+          }
+
+          e.stopPropagation();
         });
+      });
     });
 
     // Close dropdown when clicking outside
     document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+      if (activeDropdown) {
+        activeDropdown.style.display = 'none';
+        activeDropdown = null;
+      }
     });
-});
+  });
 </script>
 
 
 <script>
-
  $(document).ready(function(){
 
   $('#tickets-table').DataTable({
-        dom:  "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" + 
-              "<'row'<'col-sm-12'tr>>" + 
-              "<'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-7'p>>",
+        // buttons: [
+        //     {
+        //         extend: 'csv',
+        //         text: 'CSV', 
+        //         title: 'PolicyTypeList', 
+        //         exportOptions: {
+        //             columns: ':not(:last-child)'
+        //         }
+        //     }
+        // ],
         buttons: [
-            {
-                extend: 'csv',
-                text: 'CSV', 
-                title: 'PolicyTypeList', 
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                }
-            }
-        ],
-
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'PolicyTypeList', 
+                                        exportOptions: {
+                                            columns: ':not(:last-child)'
+                                        }
+                                    }
+                        ]
+                    }
+                ],
 
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
         },
         paging: true ,
+
     });
 
- }) 
+  })
 
-const btnExport = document.querySelector("#btnExport");
-const tableElement = document.querySelector("#tickets-table");
+  const btnExport = document.querySelector("#btnExport");
+  const tableElement = document.querySelector("#tickets-table");
 
-btnExport.addEventListener("click", () => {
-  const obj = new csvExport(tableElement);
-  const csvData = obj.exportCsv();
-  const blob = new Blob([csvData], { type: "text/csv" });
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement("a");
-  a.href = url;
-  a.download = "PolicyTypeList.csv";
-  a.click();
+  btnExport.addEventListener("click", () => {
+    const obj = new csvExport(tableElement);
+    const csvData = obj.exportCsv();
+    const blob = new Blob([csvData], {
+      type: "text/csv"
+    });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = "PolicyTypeList.csv";
+    a.click();
 
-  setTimeout(() => {
-    URL.revokeObjectURL(url);
-  }, 500);
-});
+    setTimeout(() => {
+      URL.revokeObjectURL(url);
+    }, 500);
+  });
 
 
-class csvExport {
-  constructor(table, header = true) {
-    this.table = table;
-    this.rows = Array.from(table.querySelectorAll("tr"));
-    if (!header && this.rows[0].querySelectorAll("th").length) {
-      this.rows.shift();
-    }
-  }
-
-  exportCsv() {
-    const lines = [];
-    const ncols = this._longestRow();
-    for (const row of this.rows) {
-      let line = "";
-      for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
-        if (row.children[i] !== undefined) {
-          line += csvExport.safeData(row.children[i]);
-        }
-        line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+  class csvExport {
+    constructor(table, header = true) {
+      this.table = table;
+      this.rows = Array.from(table.querySelectorAll("tr"));
+      if (!header && this.rows[0].querySelectorAll("th").length) {
+        this.rows.shift();
       }
-      lines.push(line);
     }
-    return lines.join("\n");
+
+    exportCsv() {
+      const lines = [];
+      const ncols = this._longestRow();
+      for (const row of this.rows) {
+        let line = "";
+        for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
+          if (row.children[i] !== undefined) {
+            line += csvExport.safeData(row.children[i]);
+          }
+          line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+        }
+        lines.push(line);
+      }
+      return lines.join("\n");
+    }
+
+    _longestRow() {
+      return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
+    }
+
+    static safeData(td) {
+      let data = td.textContent;
+      //Replace all double quote to two double quotes
+      data = data.replace(/"/g, `""`);
+      //Replace , and \n to double quotes
+      data = /[",\n"]/.test(data) ? `"${data}"` : data;
+      return data;
+    }
   }
 
-  _longestRow() {
-    return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
-  }
 
-  static safeData(td) {
-    let data = td.textContent;
-    //Replace all double quote to two double quotes
-    data = data.replace(/"/g, `""`);
-    //Replace , and \n to double quotes
-    data = /[",\n"]/.test(data) ? `"${data}"` : data;
-    return data;
-  }
-}
-
-
-function removePolciyType(element) {
+  function removePolciyType(element) {
 
     Swal.fire({
-        title: "Are you sure?",
-        text: "You need to remove this!",
-        icon: "info",
-        showCancelButton: true,
-        confirmButtonColor: "#3085d6",
-        confirmButtonText: "Yes",
+      title: "Are you sure?",
+      text: "You need to remove this!",
+      icon: "info",
+      showCancelButton: true,
+      confirmButtonColor: "#3085d6",
+      confirmButtonText: "Yes",
     }).then((result) => {
 
-        if (result.isConfirmed) {
-            var id = element.getAttribute('data-id');
-            var form_action = '<?= base_url("master/policy/remove/") ?>' + id; 
-            $.ajax({
-                url: form_action,
-                type: "GET",
-                dataType: 'json',
-                processData: false,
-                contentType: false,
-                success: function(res) {
-                  // console.log(res.status == true);
-                    if(res){
-                      if (res.status == true) {
-                        toastr.success('Policy type removed successfully', 'success');
-                        location.reload();
-                      } else {
-                        toastr.warning('Failed to remove policy type', 'warning');
-                      }
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error(xhr.responseText);
-                    console.error(status, error);
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                    toastr.warning('Failed to remove policy type', 'warning');
-                  }
-            });
-        }
+      if (result.isConfirmed) {
+        var id = element.getAttribute('data-id');
+        var form_action = '<?= base_url("master/policy/remove/") ?>' + id;
+        $.ajax({
+          url: form_action,
+          type: "GET",
+          dataType: 'json',
+          processData: false,
+          contentType: false,
+          success: function(res) {
+            // console.log(res.status == true);
+            if (res) {
+              if (res.status == true) {
+                toastr.success('Policy type removed successfully', 'success');
+                location.reload();
+              } else {
+                toastr.warning('Failed to remove policy type', 'warning');
+              }
+            }
+          },
+          error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+            toastr.warning('Failed to remove policy type', 'warning');
+          }
+        });
+      }
 
     });
 
-}
-
-
-
+  }
 </script>
\ No newline at end of file
diff --git a/app/Views/policy_type_onboarding.php b/app/Views/policy_type_onboarding.php
index d14db3e2..392e0cfe 100755
--- a/app/Views/policy_type_onboarding.php
+++ b/app/Views/policy_type_onboarding.php
@@ -1,33 +1,32 @@
 <style>
+    body {
+        .multiselect-native-select {
+            position: relative;
+
+            /* bottom: 32px; */
+            select {
+                border: 0 !important;
+                clip: rect(0 0 0 0) !important;
+                height: 1px !important;
+                margin: -1px -1px -1px -3px !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                position: absolute !important;
+                width: 1px !important;
+                left: 50%;
+                top: 30px;
+            }
+        }
+
+        .multiselect-container {
+            width: 100% !important;
+        }
+
+        .multiselect-selected-text {
+            float: left !important;
+        }
 
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
     }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
 </style>
 
 <div id="policy_add">
@@ -50,22 +49,32 @@ body {
                         <span class="title-text ">Policy Type</span>
                     </h4>
                 </div>
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active-tab active">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active-tab active">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
 
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <!-- <li class="nav-item">
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <!-- <li class="nav-item">
                         <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="policy_id_type">
                             <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
                             <span class="d-none d-sm-inline-block">Policies</span>
                         </a>
                     </li> -->
-                </ul>
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
+
                 <div class="tab-content">
                     <?php include('policy_type_basic_info.php'); ?>
                     <?php include('policies.php'); ?>
@@ -79,22 +88,23 @@ body {
 <script>
     function policy_type_branch_contact() {
         var check_policy_type_id = $('#policytype_General_PrimaryKey');
-        
 
-        if(check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0){
+
+        if (check_policy_type_id[0].value == '' || check_policy_type_id[0].value == null || check_policy_type_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the Policy Type!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('First Add the Policy Type!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             if ($('#btnBranchBack')[0].style.display == 'none') {
                 $('#btnBranchAdd').show();
             }
         }
-        
+
     }
 
     document.getElementById("policy_id_type").addEventListener("click", function(event) {
         event.preventDefault();
         policy_type_branch_contact();
     });
-</script>
-
+</script>
\ No newline at end of file
diff --git a/app/Views/pt_form_file_upload_tab.php b/app/Views/pt_form_file_upload_tab.php
index 9390d848..cb8968fe 100644
--- a/app/Views/pt_form_file_upload_tab.php
+++ b/app/Views/pt_form_file_upload_tab.php
@@ -1,37 +1,47 @@
 <div class="row" id="pt_onboarding" style="position: relative; bottom: 25px; display:none;">
     <div class="col-xl-12">
         <div class="card-body">
-            <ul class="nav nav-pills navtab-bg">
-                <li class="nav-item">
-                    <a href="#form" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2 active" id="general_tab">
-                        <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                        <span class="d-none d-sm-inline-block">Policy</span>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab2">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block">KYC Docs</span>
-                    </a>
-                </li>
-                <li class="nav-item" id="hide_file_upload" style="display: none;">
-                    <a href="#fileupload" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block">File Upload</span>
-                    </a>
-                </li>
-                <li class="nav-item" id="hide_vehicle_tab" style="display: none;">
-                    <a href="#vehicle-docs-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="vehicle_tab">
-                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
-                        <span class="d-none d-sm-inline-block">Vehicle Docs</span>
-                    </a>
-                </li>
-            </ul>
+            <div class="tab-wrapper position-relative">
+                <ul class="nav nav-pills navtab-bg" id="myTab">
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#form" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2 active" id="general_tab">
+                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                            <span class="d-none d-sm-inline-block">Policy</span>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab2">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block">KYC Docs</span>
+                        </a>
+                    </li>
+                    <li class="nav-item" id="hide_file_upload" style="display: none;">
+                        <a href="#fileupload" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block">File Upload</span>
+                        </a>
+                    </li>
+                    <li class="nav-item" id="hide_vehicle_tab" style="display: none;">
+                        <a href="#vehicle-docs-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="vehicle_tab">
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
+                            <span class="d-none d-sm-inline-block">Vehicle Docs</span>
+                        </a>
+                    </li>
+                    <li class="nav-item d-flex justify-content-center align-items-center">
+                        <!-- Right Arrow -->
+                        <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                    </li>
+                </ul>
+            </div>
+
             <div class="tab-content">
                 <?php include('policy_transaction_inception_form.php'); ?>
-                <?php include('drive_file_upload.php'); ?>            
-                <?php include('client_kyc.php'); ?>        
-                <?php include('vehicle_docs.php'); ?>        
+                <?php include('drive_file_upload.php'); ?>
+                <?php include('client_kyc.php'); ?>
+                <?php include('vehicle_docs.php'); ?>
             </div>
         </div>
     </div>
@@ -39,45 +49,42 @@
 
 
 <script>
+    $(document).ready(function() {
 
-$(document).ready(function() {
+        $('#kyc_tab').on('click', function(e) {
+            var ptId = $('#policy_tranction_primarykey').val();
 
-    $('#kyc_tab').on('click', function(e) {
-        var ptId = $('#policy_tranction_primarykey').val();
+            if (!ptId) { // Check if ptId is empty or null
+                e.preventDefault(); // Prevent the tab from opening
+                $('#g_drive_file_upload_sbt_btn').hide()
+                toastr.warning('Please create Policy before proceeding to File Upload.');
+            } else {
+                $('#g_drive_file_upload_sbt_btn').show()
+            }
+        });
 
-        if (!ptId) { // Check if ptId is empty or null
-            e.preventDefault(); // Prevent the tab from opening
-            $('#g_drive_file_upload_sbt_btn').hide()
-            toastr.warning('Please create Policy before proceeding to File Upload.');
-        }else{
-            $('#g_drive_file_upload_sbt_btn').show()
-        }
+        $('#kyc_tab2').on('click', function(e) {
+            var ptId = $('#policy_tranction_primarykey').val();
+
+            if (!ptId) { // Check if ptId is empty or null
+                e.preventDefault(); // Prevent the tab from opening
+                $('#btn_other_docs').hide()
+                toastr.warning('Please create Policy before proceeding to File Upload.');
+            } else {
+                $('#btn_other_docs').show()
+            }
+        });
+
+        $('#vehicle_tab').on('click', function(e) {
+            var ptId = $('#policy_tranction_primarykey').val();
+
+            if (!ptId) { // Check if ptId is empty or null
+                e.preventDefault(); // Prevent the tab from opening
+                $('#vehicle_file_upload_sbt_btn').hide()
+                toastr.warning('Please create Policy before proceeding to File Upload.');
+            } else {
+                $('#vehicle_file_upload_sbt_btn').show()
+            }
+        });
     });
-
-    $('#kyc_tab2').on('click', function(e) {
-        var ptId = $('#policy_tranction_primarykey').val();
-
-        if (!ptId) { // Check if ptId is empty or null
-            e.preventDefault(); // Prevent the tab from opening
-            $('#btn_other_docs').hide()
-            toastr.warning('Please create Policy before proceeding to File Upload.');
-        }else{
-            $('#btn_other_docs').show()
-        }
-    });
-
-    $('#vehicle_tab').on('click', function(e) {
-        var ptId = $('#policy_tranction_primarykey').val();
-
-        if (!ptId) { // Check if ptId is empty or null
-            e.preventDefault(); // Prevent the tab from opening
-            $('#vehicle_file_upload_sbt_btn').hide()
-            toastr.warning('Please create Policy before proceeding to File Upload.');
-        }else{
-            $('#vehicle_file_upload_sbt_btn').show()
-        }
-    });
-});
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/renewal_search.php b/app/Views/renewal_search.php
index 9aa1b947..5aa04e50 100644
--- a/app/Views/renewal_search.php
+++ b/app/Views/renewal_search.php
@@ -1,236 +1,248 @@
-<div class="row">
+<div class="container-fluid-min">
     <div class="col-xl-12">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <!-- <div class="text-center"> -->
-                        <div class="form-row">
-                            <div class="form-group col-md-3" id="date_div">
-                                <label>Date<span class="text-danger"></span></label>
-                                <div id="reportrange" class="form-control"
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                    <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <!-- <div class="text-center"> -->
+                            <div class="form-row">
+                                <div class="form-group col-md-3" id="date_div">
+                                    <label>Date<span class="text-danger"></span></label>
+                                    <!-- <div id="reportrange" class="form-control"
                                     style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
                                     <i class="mdi mdi-calendar-blank"></i>&nbsp;
                                     <span></span> <i class="mdi mdi-menu-down"></i>
+                                </div> -->
+                                    <div class="input-icon">
+                                        <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                                    </div>
+                                    <input type="hidden" id="startDate" value=<?= $default_start ?>>
+                                    <input type="hidden" id="endDate" value=<?= $default_end ?>>
                                 </div>
-                                <input type="hidden" id="startDate" value=<?= $default_start ?>>
-                                <input type="hidden" id="endDate" value=<?= $default_end ?>>
-                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="client_branch">Issuer<span class="text-danger"></span></label>
-                                <select class="form-control" id="issuer" name="issuer">
-                                    <option value="">Select Issuer</option>
-                                    <?php
+                                <div class="form-group col-md-3">
+                                    <label for="client_branch">Issuer<span class="text-danger"></span></label>
+                                    <select class="form-control" id="issuer" name="issuer">
+                                        <option value="">Select Issuer</option>
+                                        <?php
                                         if (isset($issuer) && count($issuer)) {
                                             foreach ($issuer as $key => $value) {
                                                 echo "<option value=" . $key . ">" . $value . "</option>";
                                             }
                                         }
-                                    ?>
-                                </select>
+                                        ?>
+                                    </select>
+                                </div>
+
+
+                                <div class="form-group col-md-3 client_type_div">
+                                    <label for="client_type">Client Type<span class="text-danger"></span></label>
+                                    <select class="form-control" id="client_type" name="client_type">
+                                        <option value="">Select Client type</option>
+                                        <option value="1">Group</option>
+                                        <option value="2">Individual</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-3">
+                                    <label for="client_branch">Client<span class="text-danger"></span></label>
+                                    <select class="form-control" id="client_id" name="client_id">
+                                        <option value="">Select Client</option>
+                                    </select>
+                                </div>
+
                             </div>
+                            <div class="row justify-content-end">
 
-
-                            <div class="form-group col-md-3 client_type_div">
-                                <label for="client_type">Client Type<span class="text-danger"></span></label>
-                                <select class="form-control" id="client_type" name="client_type">
-                                    <option value="">Select Client type</option>
-                                    <option value="1">Group</option>
-                                    <option value="2">Individual</option>
-                                </select>
+                                <div class="col-auto">
+                                    <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page"
+                                        onclick="fetchReportPage(event);">Submit</a>
+                                </div>
                             </div>
-
-                            <div class="form-group col-md-3">
-                                <label for="client_branch">Client<span class="text-danger"></span></label>
-                                <select class="form-control" id="client_id" name="client_id">
-                                    <option value="">Select Client</option>
-                                </select>
-                            </div>
-
+                            <!-- </div> -->
                         </div>
-                        <div class="row justify-content-end">
-
-                            <div class="col-auto">
-                                <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page"
-                                    onclick="fetchReportPage(event);">Submit</a>
-                            </div>
-                        </div>
-                        <!-- </div> -->
                     </div>
                 </div>
             </div>
         </div>
     </div>
+
+
+    <div id="report"></div>
 </div>
 
-<div id="report"></div>
 
 <script>
-let client_list = [];
+    let client_list = [];
 
-$(document).ready(function() {
-    getClientAndBranchAndPolicy();
-    $('#client_id').select2();
-})
+    $(document).ready(function() {
+        getClientAndBranchAndPolicy();
+        $('#client_id').select2();
+    })
 
-$(function() {
+    $(function() {
 
-    var start = $('#startDate').val();
-    var end = $('#endDate').val();
+        var start = $('#startDate').val();
+        var end = $('#endDate').val();
 
-    var start = moment(start, 'DD/MM/YYYY');
-    var end = moment(end, 'DD/MM/YYYY');
+        var start = moment(start, 'DD/MM/YYYY');
+        var end = moment(end, 'DD/MM/YYYY');
 
-    function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
-        $('#startDate').val(start.format('DD-MM-YYYY'));
-        $('#endDate').val(end.format('DD-MM-YYYY'));
-    }
-
-    $('#reportrange').daterangepicker({
-        startDate: start,
-        endDate: end,
-        ranges: {
-            'Today': [moment(), moment()],
-            'Next 7 Days': [moment(), moment().add(6, 'days')], // Next 7 Days
-            'Next 30 Days': [moment(), moment().add(29, 'days')], // Next 30 Days
-            'Next Month': [moment().add(1, 'month').startOf('month'), moment().add(1, 'month').endOf(
-                'month')], // Next Month
-            'Next Year': [moment().add(1, 'year').startOf('year'), moment().add(1, 'year').endOf(
-                'year')], // Next Year
-            'Current Year': [moment().startOf('year'), moment().endOf('year')] // Current Year
-
-        }
-    }, cb);
-
-    cb(start, end);
-});
-
-// ----------------------------------------------------------------------------------------------
-
-function fetchReportPage() {
-
-    var fromDate = $('#startDate').val();
-    var toDate = $('#endDate').val();
-    var client_id = $('#client_id').val();
-    var client_type = $('#client_type').val();
-    var issuer = $('#issuer').val();
-    var requestData = {
-        fromDate: fromDate,
-        toDate: toDate,
-        client_id: client_id,
-        client_type: client_type,
-        issuer: issuer,
-    };
-    console.log(typeof fromDate);
-    var url = '<?= base_url('/bdsReport/renewal_report') ?>';
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
-        if (response.status == true) {
-            $('#report').html(response.html);
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-
-        } else {
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-            let message = response.message;
-            toastr.error(message, 'ERROR');
+        function cb(start, end) {
+            $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#startDate').val(start.format('DD-MM-YYYY'));
+            $('#endDate').val(end.format('DD-MM-YYYY'));
         }
 
+        $('#reportrange').daterangepicker({
+            startDate: start,
+            endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
+            ranges: {
+                'Today': [moment(), moment()],
+                'Next 7 Days': [moment(), moment().add(6, 'days')], // Next 7 Days
+                'Next 30 Days': [moment(), moment().add(29, 'days')], // Next 30 Days
+                'Next Month': [moment().add(1, 'month').startOf('month'), moment().add(1, 'month').endOf(
+                    'month')], // Next Month
+                'Next Year': [moment().add(1, 'year').startOf('year'), moment().add(1, 'year').endOf(
+                    'year')], // Next Year
+                'Current Year': [moment().startOf('year'), moment().endOf('year')] // Current Year
 
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            }
+        }, cb);
 
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
+        cb(start, end);
     });
-}
 
-// ----------------------------------------------------------------------------------------------
+    // ----------------------------------------------------------------------------------------------
 
-//get client , branch, policy data
-function getClientAndBranchAndPolicy() {
-    $.ajax({
-        url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
-        type: "GET",
-        dataType: 'json',
-        success: function(res) {
+    function fetchReportPage() {
+
+        var fromDate = $('#startDate').val();
+        var toDate = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var client_type = $('#client_type').val();
+        var issuer = $('#issuer').val();
+        var requestData = {
+            fromDate: fromDate,
+            toDate: toDate,
+            client_id: client_id,
+            client_type: client_type,
+            issuer: issuer,
+        };
+        console.log(typeof fromDate);
+        var url = '<?= base_url('/bdsReport/renewal_report') ?>';
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+            if (response.status == true) {
+                $('#report').html(response.html);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
 
-            console.log('getClientAndBranchAndPolicy', res);
-            if (res.status == true) {
-                client_list = res.client_data;
-                appendClients(res.client_data);
             } else {
-                console.log('No data found');
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
             }
-        },
-        error: function(xhr, status, error) {
+
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            console.error(status, error);
-        }
-    });
-}
+            toastr.error('An error occurred while fetching the report page.', 'ERROR');
 
-//append the clients data 
-function appendClients(data) {
-    $('#client_id').empty();
-
-    $('#client_id').append($('<option>', {
-        value: '0',
-        text: 'Select Client'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name,
-            'data-name': item.client_name,
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
         });
+    }
 
-        $('#client_id').append(option).select2();
-    });
+    // ----------------------------------------------------------------------------------------------
 
-}
+    //get client , branch, policy data
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
 
-$('#client_type').on('change', function() {
-
-    var selectedClientType = $(this).val();
-
-    // console.log('selectedClientType', selectedClientType);
-
-    // Clear and add default options for client
-    $('#client_id').empty().append($('<option>', {
-        value: '',
-        text: 'Select Client'
-    }))
-
-    // Populate client options based on selected client type
-    if (selectedClientType) {
-
-        $.each(client_list, function(index, item) {
-            if (item.client_type == selectedClientType) {
-                var option = $('<option>', {
-                    value: item.id,
-                    text: item.client_name,
-                });
-                $('#client_id').append(option);
+                console.log('getClientAndBranchAndPolicy', res);
+                if (res.status == true) {
+                    client_list = res.client_data;
+                    appendClients(res.client_data);
+                } else {
+                    console.log('No data found');
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
             }
         });
+    }
+
+    //append the clients data 
+    function appendClients(data) {
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '0',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name,
+                'data-name': item.client_name,
+            });
+
+            $('#client_id').append(option).select2();
+        });
 
     }
 
-    // Initialize or refresh Select2 for both dropdowns
-    $('#client_id').select2();
-});
+    $('#client_type').on('change', function() {
+
+        var selectedClientType = $(this).val();
+
+        // console.log('selectedClientType', selectedClientType);
+
+        // Clear and add default options for client
+        $('#client_id').empty().append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }))
+
+        // Populate client options based on selected client type
+        if (selectedClientType) {
+
+            $.each(client_list, function(index, item) {
+                if (item.client_type == selectedClientType) {
+                    var option = $('<option>', {
+                        value: item.id,
+                        text: item.client_name,
+                    });
+                    $('#client_id').append(option);
+                }
+            });
+
+        }
+
+        // Initialize or refresh Select2 for both dropdowns
+        $('#client_id').select2();
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/report_bds.php b/app/Views/report_bds.php
index 35d114a7..9104d9f5 100644
--- a/app/Views/report_bds.php
+++ b/app/Views/report_bds.php
@@ -20,6 +20,21 @@ table.dataTable tbody td {
 .right-align-input {
     text-align: right;
 }
+
+.badge-container {
+  background: #F0F0F0;
+  padding: 6px 12px;
+  border-radius: 6px;
+  font-size: 14px;
+  display: inline-block;
+}
+#totals {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+
 </style>
 
 <div class="col-12" id="second_page">
@@ -32,14 +47,34 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-            <div id="totals" style="margin-bottom: 10px;">
-    <strong>Total Premium:</strong> <span id="total_premium">0.00</span> |
-    <strong>Total Rewards:</strong> <span id="total_rewards">0.00</span> |
-    <strong>Total IRDA Revenue INR:</strong> <span id="total_irda">0.00</span> |
-    <strong>Total Billed Amount:</strong> <span id="total_billed">0.00</span> |
-    <strong>Total Unbilled Amount:</strong> <span id="total_unbilled">0.00</span> |
-    <strong>Total Policy Count:</strong> <span id="total_policy_count"><?= $policy_count ?></span>
-</div>
+            <div id="totals" class="d-flex flex-wrap gap-2 mb-2">
+
+                <div class="badge-container">
+                    Total Premium: <span class="text-primary" id="total_premium">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total Rewards: <span class="text-primary" id="total_rewards">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total IRDA Revenue INR: <span class="text-primary" id="total_irda">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total Billed Amount: <span class="text-primary" id="total_billed">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total Unbilled Amount: <span class="text-primary" id="total_unbilled">0.00</span>
+                </div>
+
+                <div class="badge-container">
+                    Total Policy Count: <span class="text-primary"><?= $policy_count ?></span>
+                </div>
+
+            </div>
+
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
@@ -82,25 +117,25 @@ table.dataTable tbody td {
                         <?php foreach($report_list as $index => $row){ ?>
                         <tr>
                             <td><?= $index + 1 ?></td>
-                            <td><?php echo $row['user_name']; ?></td>
-                            <td><?php echo $row['policy_issue_month']; ?></td>
-                            <td><?php echo $row['revenue_type']; ?></td>
-                            <td><?php echo $row['client_type']; ?></td>
-                            <td><?php echo $row['client_name']; ?></td>
-                            <td><?php echo $row['action_type']; ?></td>
-                            <td><?php echo $row['policy_type']; ?></td>
-                            <td><?php echo $row['bap']; ?></td>
-                            <td><?php echo $row['vehicle_no'] ?? 'N.A'; ?></td>
-                            <td><?php echo $row['policy_no']; ?></td>
-                            <td><?php echo $row['endorsement_no']; ?></td>
-                            <td><?php echo $row['insurer_name']; ?> </td>
-                            <td><?php echo $row['insurer_branch_name']; ?></td>
+                            <td><?php echo $row['user_name'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['policy_issue_month'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['revenue_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['client_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['client_name'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['action_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['policy_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['bap'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['vehicle_no'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['policy_no'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['endorsement_no'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['insurer_name'] ?: 'N/A'; ?> </td>
+                            <td><?php echo $row['insurer_branch_name'] ?: 'N/A'; ?></td>
                             <td><?php echo $row['tpa_name']; ?></td>
-                            <td><?php echo empty($row['endorse_eff_date']) ? '' : date('d/m/Y', strtotime($row['endorse_eff_date'])) ?></td>
-                            <td><?php echo empty($row['policy_start_date']) ? '' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
-                            <td><?php echo empty($row['policy_end_date']) ? '' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
-                            <td><?php echo $row['ref']; ?></td>
-                            <td><?php echo $row['remarks']; ?></td>
+                            <td><?php echo empty($row['endorse_eff_date']) ? 'N/A' : date('d/m/Y', strtotime($row['endorse_eff_date'])) ?></td>
+                            <td><?php echo empty($row['policy_start_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
+                            <td><?php echo empty($row['policy_end_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
+                            <td><?php echo $row['ref'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['remarks'] ?: 'N/A'; ?></td>
                             <td class="right-align-input"><?php echo $row['bp_amt']; ?></td>
                             <td class="right-align-input"><?php echo $row['tp_or_ter']; ?></td>
                             <td class="right-align-input"><?php echo $row['premium_wo_gst']; ?></td>
@@ -227,10 +262,15 @@ $(document).ready(function() {
             //         }
             //     }
             // ],
+            buttons: [
+            {
+            extend: 'collection',
+            text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+            className: 'btn app-btn-secondary ',
             buttons: [
                 {
                     extend: 'csv',
-                    text: 'CSV',
+                    text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
                     title: 'Policy-Tranction-BDS-List',
                     exportOptions: {
                         columns: ':visible', // or specify exact columns [0,1,2,...]
@@ -251,8 +291,9 @@ $(document).ready(function() {
                 },
                 {
                     extend: 'excel',
-                    text: 'Excel',
                     title: 'Policy-Tranction-BDS-List',
+                    text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                    className: 'app-btn-primary ',
                     // customize: function (xlsx) {
                     //     var sheet = xlsx.xl.worksheets['sheet1.xml'];
                     //     var total = 0;
@@ -360,14 +401,19 @@ $(document).ready(function() {
                         }
                     }
                 }
+            ]
+            }
             ],
-
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             ordering: false,
            "footerCallback": function(row, data, start, end, display) {
                 var api = this.api();
diff --git a/app/Views/report_bds_filter.php b/app/Views/report_bds_filter.php
index 856854ed..7628a1fb 100644
--- a/app/Views/report_bds_filter.php
+++ b/app/Views/report_bds_filter.php
@@ -1,567 +1,562 @@
 <style>
-.col-12 {
 
-    max-width: 98% !important;
-}
 </style>
 
-<div class="row">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <div class="form-row">
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Client<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_id" name="client_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Client</option>
-                                    </select>
-                                </div>
+<div class="container-fluid-min">
+    <div class="col-12" id="bds_filter">
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch_id">Client Branch<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_branch_id" name="client_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Client Branch</option>
-                                    </select>
-                                </div>
+                <div class="card mb-1">
+                    <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <div class="form-group">
+                                <div class="form-row">
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Client<span class="text-danger"></span></label>
+                                        <select class="form-control" id="client_id" name="client_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Client</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_id"> Insurer <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()" >
-                                        <option value="0" selected>Select Insurer</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch_id">Client Branch<span class="text-danger"></span></label>
+                                        <select class="form-control" id="client_branch_id" name="client_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Client Branch</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_branch_id"> Insurer Branch <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_branch_id" name="insurer_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0" selected>Select Insurer Branch</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="insurer_id"> Insurer <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id" name="insurer_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0" selected>Select Insurer</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="email"> Policy Type <span class="text-danger"></span></label>
-                                    <select class="form-control" id="policy_type_id" name="policy_type_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Policy Type</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="insurer_branch_id"> Insurer Branch <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_branch_id" name="insurer_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0" selected>Select Insurer Branch</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group col-md-3">
+                                        <label for="email"> Policy Type <span class="text-danger"></span></label>
+                                        <select class="form-control" id="policy_type_id" name="policy_type_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Policy Type</option>
+                                            <?php
                                             if (isset($policy_types) && count($policy_types)) {
                                                 foreach ($policy_types as $key => $value) {
                                                     echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_policy_id"> Client Policy <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="client_policy_id" name="client_policy_id" >
-                                        <option value="0" selected>Select client policy</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="client_policy_id"> Client Policy <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="client_policy_id" name="client_policy_id">
+                                            <option value="0" selected>Select client policy</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Issuer<span class="text-danger">*</span></label>
-                                    <select class="form-control" id="issuer" name="issuer" required>
-                                        <option value="0">Select Issure</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Issuer<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="issuer" name="issuer" required>
+                                            <option value="0">Select Issure</option>
+                                            <?php
                                             if (isset($issuer) && count($issuer)) {
                                                 foreach ($issuer as $key => $value) {
                                                     echo "<option value=" . $key . ">" . $value . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="user_id">Users<span class="text-danger"></span></label>
-                                    <select class="form-control" id="user_id" name="user_id" >
-                                        <option value="0">Select user</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="user_id">Users<span class="text-danger"></span></label>
+                                        <select class="form-control" id="user_id" name="user_id">
+                                            <option value="0">Select user</option>
+                                            <?php
                                             if (isset($users) && count($users)) {
                                                 foreach ($users as $key => $value) {
                                                     echo "<option value='" . $value['id'] . "'>" . $value['first_name'] . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label>Date Type<span class="text-danger"></span></label>
-                                    <select class="form-control" id="date_type" name="date_type" onchange="hideDateField(); changeTitle();">
-                                        <option value="0">Select Date Type</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label>Date Type<span class="text-danger"></span></label>
+                                        <select class="form-control" id="date_type" name="date_type" onchange="hideDateField(); changeTitle();">
+                                            <option value="0">Select Date Type</option>
+                                            <?php
                                             if (isset($date_type) && count($date_type)) {
                                                 foreach ($date_type as $key => $value) {
                                                     echo "<option value='" . $key . "'>" . $value . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
-
-                                <div class="form-group col-md-3" style="display: none;" id="date_div">
-                                    <label>Date<span class="text-danger"></span></label>
-                                    <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                        <span></span> <i class="mdi mdi-menu-down"></i>
+                                            ?>
+                                        </select>
                                     </div>
-                                    <input type="hidden" id="startDate">
-                                    <input type="hidden" id="endDate">
+
+                                    <div class="form-group col-md-3" style="display: none;" id="date_div">
+                                        <label>Date<span class="text-danger"></span></label>
+                                        <div class="input-icon">
+                                            <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                                        </div>
+                                        <input type="hidden" id="startDate">
+                                        <input type="hidden" id="endDate">
+                                    </div>
+
+                                    <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
+                                        <a href="<?= base_url("/policy_tranction/report/list"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
+                                        <a href="<?= base_url("/policy_tranction/report/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
+                                    </div>
+
                                 </div>
 
-                                <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
-                                    <a href="<?= base_url("/policy_tranction/report/list"); ?>" class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a href="<?= base_url("/policy_tranction/report/list"); ?>" class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>                            
-                                </div>
-
-                            </div>
-
-                            <!-- <div class="form-group text-right m-b-0">
+                                <!-- <div class="form-group text-right m-b-0">
                                 <button type="button" class="btn btn-secondary" id="clear-filters">Clear</button>
                                 <a href="<?= base_url("/policy_tranction/report/list"); ?>"
                                             class="btn btn-primary waves-effect waves-light" id="get-emp-list"
                                             onclick="fetchEmpolyeeList(event);">Submit</a>                            
                             </div> -->
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
+            </div>
         </div>
+
+    </div>
+
+
+    <!-- end page title -->
+    <div id="file_list">
+        <?php include('report_bds.php'); ?>
     </div>
 </div>
 
-<!-- end page title -->
-<div class="row" id="file_list">
-    <?php include('report_bds.php'); ?>
-</div>
 
 
 <script>
-
-let client_list = [];
-let branch_list = [];
-let policy_list = [];
-let insurer_list = [];
-let insurer_branch_list = [];
-
-
-$(document).ready(function() {
-
-    getClientAndBranchAndPolicy()
-    getURLParams()
-    $('#client_id').select2();
-    $('#client_branch_id').select2();
-    $('#insurer_id').select2();
-    $('#insurer_branch_id').select2();
-    $('#policy_type_id').select2();
-    $('#client_policy_id').select2();
-    $('#user_id').select2();
-
-})
-
-function fetchEmpolyeeList(event) 
-{
-    event.preventDefault(); // Prevent default action
-
-    var start_date = $('#startDate').val();
-    var end_date = $('#endDate').val();
-    var client_id = $('#client_id').val();
-    var insurer_id = $('#insurer_id').val();
-    var policy_type_id = $('#policy_type_id').val();
-    var date_type = $('#date_type').val();
-    var issuer = $('#issuer').val();
-    var client_branch_id = $('#client_branch_id').val();
-    var insurer_branch_id = $('#insurer_branch_id').val();
-    var client_policy_id = $('#client_policy_id').val();
-    var user_id = $('#user_id').val();
-
-
-    console.log(start_date + '-' + end_date);
-
-    var queryParams = {
-        start_date: start_date,
-        end_date: end_date,
-        client_id: client_id,
-        insurer_id: insurer_id,
-        policy_type_id: policy_type_id,
-        date_type: date_type,
-        issuer: issuer,
-        client_branch_id: client_branch_id,
-        insurer_branch_id: insurer_branch_id,
-        client_policy_id: client_policy_id,
-        user_id: user_id,
-    };
-
-    const queryString = objectToQueryString(queryParams);
-    const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
-    console.log(apiURL);
-    window.location.href = apiURL;
-}
-
-function objectToQueryString(obj) 
-{
-    return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
-}
-
-function getURLParams() 
-{
-    const url = new URL(window.location.href);
-    const params = new URLSearchParams(url.search);
-
-    const startDate = params.get('start_date') || 0; // Default to 0 if not found
-    const endDate = params.get('end_date') || 0; // Default to 0 if not found
-    const client_id = params.get('client_id') || 0; // Default to 0 if not found
-    const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
-    const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
-    const date_type = params.get('date_type') || 0; // Default to 0 if not found
-    const issuer = params.get('issuer') || 0; // Default to 0 if not found
-    const client_branch_id = params.get('client_branch_id') || 0; // Default to 0 if not found
-    const insurer_branch_id = params.get('insurer_branch_id') || 0; // Default to 0 if not found
-    const client_policy_id = params.get('client_policy_id') || 0; // Default to 0 if not found
-    const user_id = params.get('user_id') || 0; // Default to 0 if not found
-
-    hideDateField(date_type)
-
-    console.log('startDate', startDate)
-    console.log('endDate', endDate)
-    console.log('client_id', client_id)
-    console.log('insurer_id', insurer_id)
-    console.log('policy_type_id', policy_type_id)   
-    console.log('date_type', date_type)
-    console.log('issuer', issuer)
-    console.log('client_branch_id', client_branch_id)
-    console.log('insurer_branch_id', insurer_branch_id)
-    console.log('client_policy_id', client_policy_id)
-    console.log('user_id', user_id)
-
-    // Log the values or use them as needed
-    console.log('Start Date:', startDate);
-    console.log('End Date:', endDate);
-
-    if (startDate != 0 && endDate != 0) {
-        setTimeout(function(){
-            $('#start_date').val(startDate)
-            $('#end_date').val(endDate)
-            $('#client_id').val(client_id).select2()
-            $('#insurer_id').val(insurer_id).select2()
-            $('#user_id').val(user_id).select2()
-            $('#policy_type_id').val(policy_type_id).select2()
-            $('#date_type').val(date_type).trigger('change');
-            $('#issuer').val(issuer)
-            setTimeout(function(){
-                $('#client_branch_id').val(client_branch_id).select2()
-                $('#insurer_branch_id').val(insurer_branch_id).select2()
-                setTimeout(function(){
-                    $('#client_policy_id').val(client_policy_id).select2();
-                }, 1000);
-            }, 2000)
-        },1000)
-
-    }
-
-}
-
-$(function() {
-
-    const url = new URL(window.location.href);
-    const params = new URLSearchParams(url.search);
-
-    // Get start and end dates from URL parameters, or use default values
-    const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD-MM-YYYY');
-    const endDateParam = params.get('end_date') || moment().format('DD-MM-YYYY');
-
-    // Parse the dates to moment objects
-    var start = moment(startDateParam, 'DD-MM-YYYY');
-    var end = moment(endDateParam, 'DD-MM-YYYY');
-
-    // var start = moment().subtract(29, 'days');
-    // var end = moment();
-
-    function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
-        $('#startDate').val(start.format('DD-MM-YYYY'));
-        $('#endDate').val(end.format('DD-MM-YYYY'));
-    }
-
-    $('#reportrange').daterangepicker({
-        startDate: start,
-        endDate: end,
-        ranges: {
-        'Today': [moment(), moment()],
-        'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-        'Last 7 Days': [moment().subtract(6, 'days'), moment()],
-        'Last 30 Days': [moment().subtract(29, 'days'), moment()],
-        'This Month': [moment().startOf('month'), moment().endOf('month')],
-        'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
-        }
-    }, cb);
-
-    cb(start, end);
-
-    $('#clear-filters').on('click', function() {
-        // Reset all select dropdowns to the first option
-        $('#client_id').val('0').change();
-        $('#insurer_id').val('0').change();
-        $('#policy_type_id').val('0').change();
-        $('#date_type').val('0');
-        $('#issuer').val('0');
-        $('#date_div').hide()
-
-        // Reset the date range picker to default
-        $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
-        $('#reportrange').data('daterangepicker').setEndDate(moment());
-        cb(start, end); // Update the displayed date range
-    });
-
-});
-
-function hideDateField(input = null)
-{   
-    let val = $('#date_type').val();
-
-    if(input){
-        val = input;
-    }
-
-    if(val != 0){
-        $('#date_div').show()
-    }else{
-        $('#date_div').hide()
-    }
-}
-
-// -----------------------------------------------------------------------------------------------
-
-//featch client, client branch, insurer, insurer branch and client policy list data
-function getClientAndBranchAndPolicy()
-{   
-    $.ajax({
-        url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
-        type: "GET",
-        dataType: 'json',
-        success: function(res) {
-
-            console.log('getClientAndBranchAndPolicy', res);
-            if(res.status == true){
-                client_list = res.client_data;
-                branch_list = res.branch_data;
-                policy_list = res.policy_data;
-                insurer_list = res.insurer_data;
-                insurer_branch_list = res.insurer_branch_data;
-                appendClients(res.client_data);
-                appendInsurer(res.insurer_data);
-            }else{
-                console.log('No data found');
-            }
-
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-        }
-    });
-}
-
-//append clients for filter 
-function appendClients(data) 
-{
-    $('#client_id').empty();
-
-    $('#client_id').append($('<option>', {
-        value: '',
-        text: 'Select Client'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name,
-            'data-cn': item.client_name,
-            'data-ct': item.client_type,
-            class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
-        });
-
-        $('#client_id').append(option);
-    });
-
-}
-
-//append clients branch for filter 
-function appendBranch(data) 
-{
-
-    $('#client_branch_id').empty();
-
-    $('#client_branch_id').append($('<option>', {
-        value: '',
-        text: 'Select Branch'
-    }));
-
-    $.each(data, function(index, item) {
-
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name 
-        });
-        $('#client_branch_id').append(option);
-    });
-}
-
-//append insurer for filter 
-function appendInsurer(data) 
-{
-    $('#insurer_id').empty();
-
-    $('#insurer_id').append($('<option>', {
-        value: '',
-        text: 'Select Insurer'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.name,
-        });
-
-        $('#insurer_id').append(option);
-    });
-
-}
-
-//append insurer branch for filter 
-function appendInsurerBranch(data) 
-{
-
-    $('#insurer_branch_id').empty();
-
-    $('#insurer_branch_id').append($('<option>', {
-        value: '',
-        text: 'Select Insurer Branch'
-    }));
-
-    $.each(data, function(index, item) {
-
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name 
-        });
-        $('#insurer_branch_id').append(option);
-    });
-}
-
-//append client policy for filter
-function appendPolicies(data)
-{
-    // console.log('appendPolicies', data);
-    // console.log('appendPolicies', $('#client_policy_id'));
-    
-    $('#client_policy_id').empty();
-    $('#client_policy_id').append($('<option>', {
-        value: '',
-        text: 'Select Policy',
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.policy_type + '-' + item.policy_no,
-        });
-        $('#client_policy_id').append(option);
-    });
-}
-
-// -------------------------------------------------------------------------------------------------
-
-//client branch and insurer branch onchange document ready function
-$(document).ready(function(){
-
-    $('#client_id').change(function(){
-
-        let client_id = $(this).val();
-        console.log('client_id', client_id);
-
-        if(branch_list != '') {
-            // console.log(branch_list[client_id]);
-            let data = branch_list[client_id];
-            appendBranch(data);
-        }
-        
-    })
-
-    $('#insurer_id').change(function(){
-
-        let insurer_id = $(this).val();
-        console.log('insurer_id', insurer_id);
-
-        if(insurer_branch_list != '') {
-            // console.log(insurer_branch_list[insurer_id]);
-            let data = insurer_branch_list[insurer_id];
-            appendInsurerBranch(data);
-        }
+    let client_list = [];
+    let branch_list = [];
+    let policy_list = [];
+    let insurer_list = [];
+    let insurer_branch_list = [];
+
+
+    $(document).ready(function() {
+
+        getClientAndBranchAndPolicy()
+        getURLParams()
+        $('#client_id').select2();
+        $('#client_branch_id').select2();
+        $('#insurer_id').select2();
+        $('#insurer_branch_id').select2();
+        $('#policy_type_id').select2();
+        $('#client_policy_id').select2();
+        $('#user_id').select2();
 
     })
 
-});
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-//get policy list based on the client, client_branch, insurer, insurer_branch and policy type
-function getClientPolicyDataBasedOnClientAndInsuer(){
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').val();
+        var client_branch_id = $('#client_branch_id').val();
+        var insurer_branch_id = $('#insurer_branch_id').val();
+        var client_policy_id = $('#client_policy_id').val();
+        var user_id = $('#user_id').val();
 
-    let client_id = $('#client_id').val() ?? 0;
-    let client_branch_id = $('#client_branch_id').val() ?? 0;
-    let insurer_id = $('#insurer_id').val() ?? 0;
-    let insurer_branch_id = $('#insurer_branch_id').val() ?? 0;
-    let policy_type_id = $('#policy_type_id').val() ?? 0;
 
-    let url = '<?= base_url('util/getClientPolicyDataBasedOnClientAndInsuer/') ?>';
+        console.log(start_date + '-' + end_date);
 
-    let requestData = { 
-            client_id: client_id, 
-            client_branch_id: client_branch_id, 
-            insurer_id: insurer_id, 
-            insurer_branch_id: insurer_branch_id, 
-            policy_type_id: policy_type_id, 
+        var queryParams = {
+            start_date: start_date,
+            end_date: end_date,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            policy_type_id: policy_type_id,
+            date_type: date_type,
+            issuer: issuer,
+            client_branch_id: client_branch_id,
+            insurer_branch_id: insurer_branch_id,
+            client_policy_id: client_policy_id,
+            user_id: user_id,
         };
 
-    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
-        console.log('Data fetched successfully:', response);
-
-        if (response.status === true) {
-
-            appendPolicies(response.data)
-            
-        } else {
-            toastr.warning(response.message, 'WARNING');
-        }
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-    });
-
-}
-
-//for the change title 
-function changeTitle(input){
-
-    let val = $(input).val();
-    if(val == 'statement_month'){
-        $('#bds_title').text(' - Statement Month Wise List')
-    }else{
-        $('#bds_title').text(' - Policy Wise List')
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
     }
 
-}
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
 
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        const startDate = params.get('start_date') || 0; // Default to 0 if not found
+        const endDate = params.get('end_date') || 0; // Default to 0 if not found
+        const client_id = params.get('client_id') || 0; // Default to 0 if not found
+        const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+        const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
+        const date_type = params.get('date_type') || 0; // Default to 0 if not found
+        const issuer = params.get('issuer') || 0; // Default to 0 if not found
+        const client_branch_id = params.get('client_branch_id') || 0; // Default to 0 if not found
+        const insurer_branch_id = params.get('insurer_branch_id') || 0; // Default to 0 if not found
+        const client_policy_id = params.get('client_policy_id') || 0; // Default to 0 if not found
+        const user_id = params.get('user_id') || 0; // Default to 0 if not found
+
+        hideDateField(date_type)
+
+        console.log('startDate', startDate)
+        console.log('endDate', endDate)
+        console.log('client_id', client_id)
+        console.log('insurer_id', insurer_id)
+        console.log('policy_type_id', policy_type_id)
+        console.log('date_type', date_type)
+        console.log('issuer', issuer)
+        console.log('client_branch_id', client_branch_id)
+        console.log('insurer_branch_id', insurer_branch_id)
+        console.log('client_policy_id', client_policy_id)
+        console.log('user_id', user_id)
+
+        // Log the values or use them as needed
+        console.log('Start Date:', startDate);
+        console.log('End Date:', endDate);
+
+        if (startDate != 0 && endDate != 0) {
+            setTimeout(function() {
+                $('#start_date').val(startDate)
+                $('#end_date').val(endDate)
+                $('#client_id').val(client_id).select2()
+                $('#insurer_id').val(insurer_id).select2()
+                $('#user_id').val(user_id).select2()
+                $('#policy_type_id').val(policy_type_id).select2()
+                $('#date_type').val(date_type).trigger('change');
+                $('#issuer').val(issuer)
+                setTimeout(function() {
+                    $('#client_branch_id').val(client_branch_id).select2()
+                    $('#insurer_branch_id').val(insurer_branch_id).select2()
+                    setTimeout(function() {
+                        $('#client_policy_id').val(client_policy_id).select2();
+                    }, 1000);
+                }, 2000)
+            }, 1000)
+
+        }
+
+    }
+
+    $(function() {
+
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        // Get start and end dates from URL parameters, or use default values
+        const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD-MM-YYYY');
+        const endDateParam = params.get('end_date') || moment().format('DD-MM-YYYY');
+
+        // Parse the dates to moment objects
+        var start = moment(startDateParam, 'DD-MM-YYYY');
+        var end = moment(endDateParam, 'DD-MM-YYYY');
+
+        // var start = moment().subtract(29, 'days');
+        // var end = moment();
+
+        function cb(start, end) {
+            $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#startDate').val(start.format('DD-MM-YYYY'));
+            $('#endDate').val(end.format('DD-MM-YYYY'));
+        }
+
+        $('#reportrange').daterangepicker({
+            startDate: start,
+            endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
+            ranges: {
+                'Today': [moment(), moment()],
+                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+            }
+        }, cb);
+
+        cb(start, end);
+
+        $('#clear-filters').on('click', function() {
+            // Reset all select dropdowns to the first option
+            $('#client_id').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').val('0');
+            $('#date_div').hide()
+
+            // Reset the date range picker to default
+            $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
+            $('#reportrange').data('daterangepicker').setEndDate(moment());
+            cb(start, end); // Update the displayed date range
+        });
+
+    });
+
+    function hideDateField(input = null) {
+        let val = $('#date_type').val();
+
+        if (input) {
+            val = input;
+        }
+
+        if (val != 0) {
+            $('#date_div').show()
+        } else {
+            $('#date_div').hide()
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------
+
+    //featch client, client branch, insurer, insurer branch and client policy list data
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+                if (res.status == true) {
+                    client_list = res.client_data;
+                    branch_list = res.branch_data;
+                    policy_list = res.policy_data;
+                    insurer_list = res.insurer_data;
+                    insurer_branch_list = res.insurer_branch_data;
+                    appendClients(res.client_data);
+                    appendInsurer(res.insurer_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+    //append clients for filter 
+    function appendClients(data) {
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name,
+                'data-cn': item.client_name,
+                'data-ct': item.client_type,
+                class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
+            });
+
+            $('#client_id').append(option);
+        });
+
+    }
+
+    //append clients branch for filter 
+    function appendBranch(data) {
+
+        $('#client_branch_id').empty();
+
+        $('#client_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select Branch'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#client_branch_id').append(option);
+        });
+    }
+
+    //append insurer for filter 
+    function appendInsurer(data) {
+        $('#insurer_id').empty();
+
+        $('#insurer_id').append($('<option>', {
+            value: '',
+            text: 'Select Insurer'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.name,
+            });
+
+            $('#insurer_id').append(option);
+        });
+
+    }
+
+    //append insurer branch for filter 
+    function appendInsurerBranch(data) {
+
+        $('#insurer_branch_id').empty();
+
+        $('#insurer_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select Insurer Branch'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#insurer_branch_id').append(option);
+        });
+    }
+
+    //append client policy for filter
+    function appendPolicies(data) {
+        // console.log('appendPolicies', data);
+        // console.log('appendPolicies', $('#client_policy_id'));
+
+        $('#client_policy_id').empty();
+        $('#client_policy_id').append($('<option>', {
+            value: '',
+            text: 'Select Policy',
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.policy_type + '-' + item.policy_no,
+            });
+            $('#client_policy_id').append(option);
+        });
+    }
+
+    // -------------------------------------------------------------------------------------------------
+
+    //client branch and insurer branch onchange document ready function
+    $(document).ready(function() {
+
+        $('#client_id').change(function() {
+
+            let client_id = $(this).val();
+            console.log('client_id', client_id);
+
+            if (branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = branch_list[client_id];
+                appendBranch(data);
+            }
+
+        })
+
+        $('#insurer_id').change(function() {
+
+            let insurer_id = $(this).val();
+            console.log('insurer_id', insurer_id);
+
+            if (insurer_branch_list != '') {
+                // console.log(insurer_branch_list[insurer_id]);
+                let data = insurer_branch_list[insurer_id];
+                appendInsurerBranch(data);
+            }
+
+        })
+
+    });
+
+    //get policy list based on the client, client_branch, insurer, insurer_branch and policy type
+    function getClientPolicyDataBasedOnClientAndInsuer() {
+
+        let client_id = $('#client_id').val() ?? 0;
+        let client_branch_id = $('#client_branch_id').val() ?? 0;
+        let insurer_id = $('#insurer_id').val() ?? 0;
+        let insurer_branch_id = $('#insurer_branch_id').val() ?? 0;
+        let policy_type_id = $('#policy_type_id').val() ?? 0;
+
+        let url = '<?= base_url('util/getClientPolicyDataBasedOnClientAndInsuer/') ?>';
+
+        let requestData = {
+            client_id: client_id,
+            client_branch_id: client_branch_id,
+            insurer_id: insurer_id,
+            insurer_branch_id: insurer_branch_id,
+            policy_type_id: policy_type_id,
+        };
+
+        sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+            console.log('Data fetched successfully:', response);
+
+            if (response.status === true) {
+
+                appendPolicies(response.data)
+
+            } else {
+                toastr.warning(response.message, 'WARNING');
+            }
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+        });
+
+    }
+
+    //for the change title 
+    function changeTitle(input) {
+
+        let val = $(input).val();
+        if (val == 'statement_month') {
+            $('#bds_title').text(' - Statement Month Wise List')
+        } else {
+            $('#bds_title').text(' - Policy Wise List')
+        }
+
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/report_bds_old.php b/app/Views/report_bds_old.php
index 06c84ba2..261dade0 100644
--- a/app/Views/report_bds_old.php
+++ b/app/Views/report_bds_old.php
@@ -193,7 +193,7 @@ $(document).ready(function() {
                 searchPlaceholder: "Search..."
             },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             ordering: false, 
         });
     } else {
diff --git a/app/Views/retail_endorsement_list.php b/app/Views/retail_endorsement_list.php
index 41dc17d5..44bbacbe 100755
--- a/app/Views/retail_endorsement_list.php
+++ b/app/Views/retail_endorsement_list.php
@@ -12,82 +12,90 @@
         position: relative;
         left: 79px;
     }
+
     .emp_data_model {
-        font-size: 17px;        /* keep fixed size */
+        font-size: 17px;
+        /* keep fixed size */
         color: #555 !important;
         cursor: pointer;
-        transition: transform 0.2s, color 0.2s; /* smooth hover effect */
-        display: inline-block;  /* important for transform */
+        transition: transform 0.2s, color 0.2s;
+        /* smooth hover effect */
+        display: inline-block;
+        /* important for transform */
     }
 
     .emp_data_model:hover {
-        color: #00999E  !important;
-        transform: scale(1.5); 
+        color: #00999E !important;
+        transform: scale(1.5);
     }
 </style>
 
-<div class="container-fluid">
-    <h2>Retail Endorsement</h2>
+<div class="container-fluid-min">
     <div class="row">
         <div class="col-xl-12">
-            <div id="accordion" class="mb-3">
-                <div class="card mb-1">
-                    <h5 class="m-1">
-                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
-                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                        </a>
-                    </h5>
-                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                        <div class="card-body">
-                            <!-- <div class="text-center"> -->
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <label>Client</label> <br />
-                                    <select class="form-control" id="clients">
-                                        <option value="0">Select</option>
-                                        <?php foreach ($client as $key => $value) { ?>
-                                            <option value="<?= $value['id'] ?>" <?= (($getData['client_id'] ?? '') == $value['id']) ? 'selected' : '' ?>>
-                                                <?= $value['client_name'] . (!empty($value['short_name']) ? ' ( ' . $value['short_name'] . ' )' : '') ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+            <div class="card-body">
+                <div id="accordion" class="mb-3">
+                    <div class="card mb-1">
+                        <h4>
+                            Filter
+                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                aria-expanded="true">
+                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                        </h4>
+                        <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                            <div class="card-body">
+                                <!-- <div class="text-center"> -->
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <label>Client</label> <br />
+                                        <select class="form-control" id="clients">
+                                            <option value="0">Select</option>
+                                            <?php foreach ($client as $key => $value) { ?>
+                                                <option value="<?= $value['id'] ?>" <?= (($getData['client_id'] ?? '') == $value['id']) ? 'selected' : '' ?>>
+                                                    <?= $value['client_name'] . (!empty($value['short_name']) ? ' ( ' . $value['short_name'] . ' )' : '') ?>
+                                                </option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-4">
-                                    <label>Insurer</label> <br />
-                                    <select class="form-control" id="insurer">
-                                        <option value="0">Select</option>
-                                        <?php foreach ($insurer as $key => $value) { ?>
-                                            <option value="<?= $value['id'] ?>" <?= (($getData['insurer_id'] ?? '') == $value['id']) ? 'selected' : '' ?>>
-                                                <?= $value['name'] . (!empty($value['short_name']) ? ' ( ' . $value['short_name'] . ' )' : '') ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-4">
+                                        <label>Insurer</label> <br />
+                                        <select class="form-control" id="insurer">
+                                            <option value="0">Select</option>
+                                            <?php foreach ($insurer as $key => $value) { ?>
+                                                <option value="<?= $value['id'] ?>" <?= (($getData['insurer_id'] ?? '') == $value['id']) ? 'selected' : '' ?>>
+                                                    <?= $value['name'] . (!empty($value['short_name']) ? ' ( ' . $value['short_name'] . ' )' : '') ?>
+                                                </option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-4">
-                                    <label>Status</label> <br />
-                                    <select class="form-control" id="status1">
-                                        <option value="0">Select</option>
-                                        <?php foreach ($status as $key => $value) { ?>
-                                            <option value="<?= $key ?>" <?= (($getData['status'] ?? '') == $key) ? 'selected' : '' ?>>
-                                                <?= $value ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-4">
+                                        <label>Status</label> <br />
+                                        <select class="form-control" id="status1">
+                                            <option value="0">Select</option>
+                                            <?php foreach ($status as $key => $value) { ?>
+                                                <option value="<?= $key ?>" <?= (($getData['status'] ?? '') == $key) ? 'selected' : '' ?>>
+                                                    <?= $value ?>
+                                                </option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
 
+                                </div>
+                                <div class="row">
+                                    <div class="col-12" style="text-align: right;">
+                                        <a href="<?= base_url("employee/retail-endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
+                                    </div>
+                                </div>
+                                <!-- </div> -->
                             </div>
-                            <div class="row">
-                                <div class="col-12" style="text-align: right;">
-                                    <a href="<?= base_url("employee/retail-endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
-                                </div>
-                            </div>
-                            <!-- </div> -->
                         </div>
                     </div>
                 </div>
             </div>
+
         </div>
     </div>
 
@@ -103,17 +111,17 @@
                     <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
                         <thead class="bg-light">
                             <tr>
-                                <th class="font-weight-medium">SNO</th>
-                                <th class="font-weight-medium">Policy number</th>
-                                <th class="font-weight-medium">Endorsement Number</th>
-                                <th class="font-weight-medium">Description</th>
-                                <th class="font-weight-medium">Client</th>
-                                <th class="font-weight-medium">Insurer name</th>
-                                <th class="font-weight-medium">Agent</th>
-                                <th class="font-weight-medium">Mananger</th>
-                                <th class="font-weight-medium">Created At</th>
-                                <th class="font-weight-medium">Status</th>
-                                <th class="font-weight-medium">Action</th>
+                                <th class="font-weight-medium">S.No&nbsp;</th>
+                                <th class="font-weight-medium">Policy number&nbsp;</th>
+                                <th class="font-weight-medium">Endorsement Number&nbsp;</th>
+                                <th class="font-weight-medium">Description&nbsp;</th>
+                                <th class="font-weight-medium">Client&nbsp;</th>
+                                <th class="font-weight-medium">Insurer name&nbsp;</th>
+                                <th class="font-weight-medium">Agent&nbsp;</th>
+                                <th class="font-weight-medium">Mananger&nbsp;</th>
+                                <th class="font-weight-medium">Created At&nbsp;</th>
+                                <th class="font-weight-medium">Status&nbsp;</th>
+                                <th class="font-weight-medium">Action&nbsp;</th>
                             </tr>
                         </thead>
 
@@ -126,26 +134,26 @@
                                         <td class="text-center"><?php echo $employee['policy_number'] ?></td>
                                         <td class="text-center"><?php echo $employee['endorsement_no'] ?></td>
                                         <td class="text-center"><?php echo $employee['endorsement_description'] ?></td>
-                                        <td class="text-center"><?php echo $employee['client_name'] ? $employee['client_name'] .' ( '. $employee['client_short_name'] .' ) ' : 'N/A' ?></td>
-                                        <td class="text-center"><?php echo $employee['insurer_name'] ? $employee['insurer_name'] .' ( '. $employee['insurer_short_name'] .' ) ' : 'N/A' ?></td>
+                                        <td class="text-center"><?php echo $employee['client_name'] ? $employee['client_name'] . ' ( ' . $employee['client_short_name'] . ' ) ' : 'N/A' ?></td>
+                                        <td class="text-center"><?php echo $employee['insurer_name'] ? $employee['insurer_name'] . ' ( ' . $employee['insurer_short_name'] . ' ) ' : 'N/A' ?></td>
                                         <td class="text-center"><?php echo $employee['agent_name'] ?? 'N/A' ?></td>
                                         <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']));
-                                                echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
-                                                endif; ?></td>
+                                                                    $cd =  date("j F Y", 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') {
-                                                  echo '<span class="badge badge-primary">' . $employee['status'] . '</span>';
-                                                 } elseif ($employee['status'] == 'inprogress') {
-                                                  echo '<span class="badge badge-warning">' . $employee['status'] . '</span>';
-                                                 } elseif ($employee['status'] == 'complete') {
-                                                  echo '<span class="badge badge-success">' . $employee['status'] . '</span>';
-                                                 }
-                                            ?>
+                                                                    echo '<span class="badge badge-primary">' . $employee['status'] . '</span>';
+                                                                } elseif ($employee['status'] == 'inprogress') {
+                                                                    echo '<span class="badge badge-warning">' . $employee['status'] . '</span>';
+                                                                } elseif ($employee['status'] == 'complete') {
+                                                                    echo '<span class="badge badge-success">' . $employee['status'] . '</span>';
+                                                                }
+                                                                ?>
                                         </td>
-                                        <td class="text-center"><a href="#" data-id="<?php echo $employee['id'] ?>" data-eno="<?php echo $employee['endorsement_no'] ?>" data-status="<?php echo $employee['status'] ?>" 
-                                            class="mdi mdi-pencil text-muted vertical-middle emp_data_model" aria-hidden="true" data-toggle="modal" data-target="#centermodal"></a>
+                                        <td class="text-center"><a href="#" data-id="<?php echo $employee['id'] ?>" data-eno="<?php echo $employee['endorsement_no'] ?>" data-status="<?php echo $employee['status'] ?>"
+                                                class="mdi mdi-pencil text-muted vertical-middle emp_data_model" aria-hidden="true" data-toggle="modal" data-target="#centermodal"></a>
                                         </td>
                                     </tr>
                             <?php }
@@ -163,47 +171,47 @@
 
 
 
-<div class="modal fade app-text-black " id="centermodal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-  <div class="modal-dialog modal-dialog-centered">
-    <div class="modal-content">
-      <form id="retailEndorsementForm">
-        <div class="modal-header">
-            <h4 class="modal-title title-text" id="myCenterModalLabel" style="font-size:27px !important">Edit Endorsement Details <span id="heading"></span></h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        </div>
+<div class="modal fade font-color-black " id="centermodal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <form id="retailEndorsementForm">
+                <div class="modal-header">
+                    <h4 class="modal-title title-text" id="myCenterModalLabel" style="font-size:27px !important">Edit Endorsement Details <span id="heading"></span></h4>
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                </div>
 
-        <div class="modal-body">    
-          <div class="form-row">
-            <input type="hidden" id="edit_id" name="id">
-            <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
-            <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>"/>
-            
-            
-            <div class="form-group col-md-12">
-                    <label for="endorsement_no" class="sub-title-text ">Endorsement Number<span class="text-danger">*</span></label>
-                    <input type="text" class="form-control" id="endorsement_no" placeholder="Enter Endorsement Number" name="endorsement_no" required>
-            </div>
-            
+                <div class="modal-body">
+                    <div class="form-row">
+                        <input type="hidden" id="edit_id" name="id">
+                        <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
+                        <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
 
-            <div class="form-group col-md-12">
-              <label for="edit_status" class="sub-title-text ">Status<span class="text-danger">*</span></label>
-              <select class="form-control" id="edit_status" name="status" required>
-                <option value="">Select Status</option>
-                <?php foreach ($status as $key => $value) { ?>
-                            <option value="<?= $key ?>"><?= $value ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
+
+                        <div class="form-group col-md-12">
+                            <label for="endorsement_no" class="sub-title-text ">Endorsement Number<span class="text-danger">*</span></label>
+                            <input type="text" class="form-control" id="endorsement_no" placeholder="Enter Endorsement Number" name="endorsement_no" required>
+                        </div>
+
+
+                        <div class="form-group col-md-12">
+                            <label for="edit_status" class="sub-title-text ">Status<span class="text-danger">*</span></label>
+                            <select class="form-control" id="edit_status" name="status" required>
+                                <option value="">Select Status</option>
+                                <?php foreach ($status as $key => $value) { ?>
+                                    <option value="<?= $key ?>"><?= $value ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-footer">
+                    <button class="btn app-btn-outline-secondary  mr-2 " type="button" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                    <button type="submit" class="btn app-btn-secondary" id="btnSubmit" onclick="submitRetailEndorsement(event)">Save</button>
+                </div>
+            </form>
         </div>
-        
-        <div class="modal-footer">
-            <button class="btn app-btn-outline-secondary  mr-2 " type="button" data-dismiss="modal" aria-hidden="true">Cancel</button>
-            <button type="submit" class="btn app-btn-secondary" id="btnSubmit" onclick="submitRetailEndorsement(event)">Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
 
 
@@ -222,7 +230,7 @@
         console.log("window loaded");
     });
 
-    
+
     // Function to convert object to query parameters
     function objectToQueryString(obj) {
         return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
@@ -234,7 +242,7 @@
         var client_id = $('#clients').val();
         var insurer_id = $('#insurer').val();
         var status = $('#status1').val();
-        
+
         var queryParams = {
             client_id: client_id,
             insurer_id: insurer_id,
@@ -260,7 +268,7 @@
         var eno = $(this).data('eno');
         var status = $(this).data('status');
         // console.log(val);
-        fetchRetailEndorsementData(id,eno,status)
+        fetchRetailEndorsementData(id, eno, status)
 
     });
 
@@ -276,19 +284,19 @@
 
         var endorsement_no = document.getElementById('endorsement_no').value.trim();
         var edit_status = document.getElementById('edit_status').value.trim();
-         
+
         if (endorsement_no === "" || edit_status === "") {
             toastr.warning('Please fill all required fields.', 'Warning');
             form.classList.add('was-validated');
             return;
         }
-    
+
         $.ajax({
             url: "<?= base_url('/employee/retail-endorsement-save') ?>",
             type: "POST",
             data: formData,
-            processData: false,   
-            contentType: false,   
+            processData: false,
+            contentType: false,
             dataType: 'json',
             success: function(response) {
                 if (response.status === "success") {
@@ -311,17 +319,17 @@
         });
     }
 
-    function fetchRetailEndorsementData(id,eno,status) {
+    function fetchRetailEndorsementData(id, eno, status) {
 
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
         var form = document.getElementById('retailEndorsementForm');
-            form.reset(); 
+        form.reset();
+
+        $("#edit_id").val(id);
+        $("#endorsement_no").val(eno);
+        $("#edit_status").val(status);
 
-            $("#edit_id").val(id);
-            $("#endorsement_no").val(eno); 
-            $("#edit_status").val(status);
-        
         setTimeout(function() {
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
@@ -332,26 +340,49 @@
     $(document).ready(function() {
 
         $('#tickets-table').DataTable({
-            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-7'p>>",
+            // buttons: [{
+            //     extend: 'csv',
+            //     text: 'CSV',
+            //     title: 'Retail-Endorsement-List',
+            //     className: 'my_class',
+            //     exportOptions: {
+            //         columns: ':not(:last-child)',
+            //         format: {
+            //             body: function (data, row, column, node) {
+            //                 // Convert data to string to avoid scientific notation in CSV
+            //                 if (!isNaN(data) && parseFloat(data) > 1e20) {
+            //                     return `'${data}`;
+            //                 }
+            //                 return data.toString();// Ensures all data is treated as strings
+            //             }
+            //         }
+            //     }
+            // }],
             buttons: [{
-                extend: 'csv',
-                text: 'CSV',
-                title: 'Retail-Endorsement-List',
-                className: 'my_class',
-                exportOptions: {
-                    columns: ':not(:last-child)',
-                    format: {
-                        body: function (data, row, column, node) {
-                            // Convert data to string to avoid scientific notation in CSV
-                            if (!isNaN(data) && parseFloat(data) > 1e20) {
-                                return `'${data}`;
+                extend: 'collection',
+                text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                className: 'btn app-btn-secondary ',
+                buttons: [{
+                    extend: 'csv',
+                    text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                    className: 'app-btn-primary ',
+                    title: 'Retail-Endorsement-List',
+                    exportOptions: {
+                        columns: ':not(:last-child)',
+                        format: {
+                            body: function(data, row, column, node) {
+                                // Convert data to string to avoid scientific notation in CSV
+                                if (!isNaN(data) && parseFloat(data) > 1e20) {
+                                    return `'${data}`;
+                                }
+                                return data.toString(); // Ensures all data is treated as strings
                             }
-                            return data.toString();// Ensures all data is treated as strings
                         }
                     }
-                }
+                }, ]
             }],
             initComplete: function(settings, json) {
                 $('.my_class').css({
@@ -360,13 +391,19 @@
                 });
             },
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                searchPlaceholder: "Search"
             },
             paging: true,
             // pagingType: 'full_numbers'
-            columnDefs: [
-                { type: 'scientific', targets: 0 } // Apply custom sorting type to the first column
+            columnDefs: [{
+                    type: 'scientific',
+                    targets: 0
+                } // Apply custom sorting type to the first column
             ],
         });
 
diff --git a/app/Views/rfq/gmc.php b/app/Views/rfq/gmc.php
index 82cedab9..0f5bb4d0 100644
--- a/app/Views/rfq/gmc.php
+++ b/app/Views/rfq/gmc.php
@@ -130,21 +130,21 @@
 
    <div class="form-row">
 
-       <div class="form-group col-md-3">
+       <div class="form-group col-md-4">
            <label for="incept_emp_count" class="emp_title"> No of Employees at Inception <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['incept_emp_count']) ? $lead_edit_data['incept_emp_count'] : '' ?>" type="text" class="form-control" id="incept_emp_count" name="incept_emp_count[]"
                placeholder="Enter Lives" required oninput="calculateTotalLives(this)">
        </div>
 
-       <div class="form-group col-md-3">
+       <div class="form-group col-md-4">
            <label for="incept_dept_count" class="depnd_title"> No of Dependents at Inception <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['incept_dept_count']) ? $lead_edit_data['incept_dept_count'] : '' ?>" type="text" class="form-control" id="incept_dept_count" name="incept_dept_count[]"
                placeholder="Enter Lives" required oninput="calculateTotalLives(this)">
        </div>
 
-       <div class="form-group col-md-3">
+       <div class="form-group col-md-4">
            <label for="incept_no_of_lives" class="total_title"> Total Lives at Inception <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['incept_no_of_lives']) ? $lead_edit_data['incept_no_of_lives'] : '' ?>" type="text" class="form-control" id="incept_no_of_lives" name="incept_no_of_lives[]"
@@ -155,20 +155,20 @@
 
    <div class="form-row">
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="exp_emp_count"> No of Employees at Expiry <span class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['exp_emp_count']) ? $lead_edit_data['exp_emp_count'] : '' ?>" type="text" class="form-control" id="exp_emp_count" name="exp_emp_count[]"
                placeholder="Enter Lives">
        </div>
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="exp_dept_count"> No of Dependents at Expiry <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['exp_dept_count']) ? $lead_edit_data['exp_dept_count'] : '' ?>" type="text" class="form-control" id="exp_dept_count" name="exp_dept_count[]"
                placeholder="Enter Lives">
        </div>
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="exp_no_of_lives"> Total Lives at Expiry <span class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['exp_no_of_lives']) ? $lead_edit_data['exp_no_of_lives'] : '' ?>" type="text" class="form-control" id="exp_no_of_lives" name="exp_no_of_lives[]"
                placeholder="Enter Lives">
@@ -178,21 +178,21 @@
 
    <div class="form-row">
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="renewal_emp_count"> No of Employees at Renewal <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['renewal_emp_count']) ? $lead_edit_data['renewal_emp_count'] : '' ?>" type="text" class="form-control" id="renewal_emp_count" name="renewal_emp_count[]"
                placeholder="Enter Lives">
        </div>
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="renewal_dept_count"> No of Dependents at Renewal <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['renewal_dept_count']) ? $lead_edit_data['renewal_dept_count'] : '' ?>" type="text" class="form-control" id="renewal_dept_count" name="renewal_dept_count[]"
                placeholder="Enter Lives">
        </div>
 
-       <div class="form-group col-md-3 renewalFields" style="display: none;">
+       <div class="form-group col-md-4 renewalFields" style="display: none;">
            <label for="renewal_no_of_lives"> Total Lives at Renewal <span
                    class="text-danger"></span></label>
            <input value="<?= isset($lead_edit_data['renewal_no_of_lives']) ? $lead_edit_data['renewal_no_of_lives'] : '' ?>" type="text" class="form-control" id="renewal_no_of_lives" name="renewal_no_of_lives[]"
diff --git a/app/Views/rfq/gpa.php b/app/Views/rfq/gpa.php
index a8cd08fc..70abf90a 100644
--- a/app/Views/rfq/gpa.php
+++ b/app/Views/rfq/gpa.php
@@ -2,32 +2,32 @@
 
 <div class="form-row" >
 
-        <div class="form-group col-md-3">
+        <div class="form-group col-md-4">
             <label for="incept_emp_count" class="emp_title"> No of Employees at Inception  <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['incept_emp_count']) ? $lead_edit_data['incept_emp_count'] : '' ?>" type="text" class="form-control" id="incept_emp_count" name="incept_emp_count[]" placeholder="Enter Lives" required>
         </div>
 
-        <div class="form-group col-md-3">
+        <div class="form-group col-md-4">
             <label for="total_lives_at_incept" class="total_title"> Total Lives at Inception <span class="text-danger"></span></label>
             <input value="<?= isset($lead_edit_data['total_lives_at_incept']) ? $lead_edit_data['total_lives_at_incept'] : '' ?>" type="text" class="form-control" id="total_lives_at_incept" name="total_lives_at_incept[]" placeholder="Enter Lives" disabled>
         </div>
 
-        <div class="form-group col-md-3 renewalFields">
+        <div class="form-group col-md-4 renewalFields">
             <label for="total_si_at_incept"> Total Sum Insured at Inception  <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['total_si_at_incept']) ? $lead_edit_data['total_si_at_incept'] : '' ?>" type="text" class="form-control" id="total_si_at_incept" name="total_si_at_incept[]" placeholder="Enter Sum Insured" required>
         </div>
 
-        <div class="form-group col-md-3 renewalFields">
+        <div class="form-group col-md-4 renewalFields">
             <label for="premium_at_incept"> Premium at inception <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['premium_at_incept']) ? $lead_edit_data['premium_at_incept'] : '' ?>" type="text" class="form-control" id="premium_at_incept" name="premium_at_incept[]" placeholder="Enter Premium" required>
         </div>
 
-        <div class="form-group col-md-3 renewalFields">
+        <div class="form-group col-md-4 renewalFields">
             <label for="renewal_emp_count"> No of Employees at Renewal <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['renewal_emp_count']) ? $lead_edit_data['renewal_emp_count'] : '' ?>" type="text" class="form-control" id="renewal_emp_count" name="renewal_emp_count[]" placeholder="Enter Lives" >
         </div>
 
-        <div class="form-group col-md-3 renewalFields">
+        <div class="form-group col-md-4 renewalFields">
             <label for="total_si_at_renewal"> Total Sum Insured at Renewal   <span class="text-danger">*</span></label>
             <input value="<?= isset($lead_edit_data['total_si_at_renewal']) ? $lead_edit_data['total_si_at_renewal'] : '' ?>" type="text" class="form-control" id="total_si_at_renewal" name="total_si_at_renewal[]" placeholder="Enter Sum Insured" >
         </div>
diff --git a/app/Views/rfq/multi_files.php b/app/Views/rfq/multi_files.php
index 11e517ed..09ba89ab 100644
--- a/app/Views/rfq/multi_files.php
+++ b/app/Views/rfq/multi_files.php
@@ -12,36 +12,71 @@ $increment = 1;
 ?>
 
     <div class="form-row d-flex align-items-end" id="fileField_<?= $displayIndex ?>">
+        <div class="form-group row" style="width: 100%;">
         <input type="hidden" name="leads_file_id[]" value="<?= htmlspecialchars($value['id']) ?>" id="file_id_<?= $displayIndex ?>">
 
-        <div class="form-group col-md-5">
-            <label>Document Name</label>
+        <div class="col-auto" style="align-content: center;">
+                    <label class="col-form-label">Document Name</label>
+        </div>
+        <div class="col-md-3">
             <input type="text" class="form-control" name="docs_name_<?= $increment ?>[]" 
-                placeholder="<?= $placeholder ?>" 
+                placeholder="<?= $placeholder ?>" style="background: #F5FFFF !important;"
                 value="<?= htmlspecialchars($value['docs_name']) ?>" id="docs_name_<?= $displayIndex ?>">
         </div>
-
-        <div class="form-group col-md-5">
+        <div class="col-auto" style="align-content: center;">
             <label>
                 File Upload<br>
                 <small id="file_name_display_<?= $displayIndex ?>" class="text-muted">
                     <?= !empty($value['file_name']) ? htmlspecialchars($value['file_name']) : 'No file chosen' ?>
                 </small>
             </label>
-            <input type="file" class="form-control" id="file_name_<?= $displayIndex ?>" 
-                name="file_name_<?= $increment ?>[]" accept="<?= $accept ?>" 
-                onchange="showFileName(this, <?= $displayIndex ?>)">
+        </div>
+        <div class="col-md-3">
+            <div class="input-icon">
+                    <input type="file" class="form-control" id="file_name_<?= $displayIndex ?>" name="file_name_<?= $increment ?>[]" accept="<?= $accept ?>" onchange="showFileName(this, <?= $displayIndex ?>)" style="background: #F5FFFF !important;">
+                    <i class="mdi mdi-upload additional-icon"></i>
+            </div> 
         </div>
 
-        <div class="col-md-2" style="position: relative; bottom: 16px;">
-            <button type="button" class="btn btn-danger" onclick="removeFileField(<?= $displayIndex ?>, <?= htmlspecialchars($value['id']) ?>)">x</button>
-            <button type="button" class="btn btn-primary" onclick="addFileField(<?= $increment ?>)">+</button>
+        <div class="col-auto">
+            <button type="button" class="btn btn-danger" onclick="removeFileField(<?= $displayIndex ?>, <?= htmlspecialchars($value['id']) ?>)"><span class="mdi mdi-trash-can"></span></button>
+            <button type="button" class="btn app-btn-secondary" onclick="addFileField(<?= $increment ?>)">+</button>
+        </div>
         </div>
     </div>
 
-<?php } } else { ?>
+<?php } }else { ?>
     <!-- Default field if no file data exists -->
     <div class="form-row d-flex align-items-end" id="fileField_1">
+        <div class="form-group row" style="width: 100%;">
+        <input type="hidden" name="leads_file_id[]" value="">
+
+                    <div class="col-auto" style="align-content: center;">
+                        <label class="col-form-label">Document Name</label>
+                    </div>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="docs_name_1[]" 
+                            placeholder="First file must be Demography." id="docs_name_1" style="background: #F5FFFF !important;">
+                    </div>
+                    <div class="col-auto" style="align-content: center;">
+                            <label>File Upload<br>
+                            <small id="file_name_display_1" class="text-muted">No file chosen</small></label>
+                    </div>
+                    <div class="col-md-3">
+                        <div class="input-icon">
+                            <input type="file" class="form-control" id="file_name_1" 
+                                name="file_name_1[]" accept=".xls,.xlsx" onchange="showFileName(this, 1)" style="background: #F5FFFF !important;">
+                            <i class="mdi mdi-upload additional-icon"></i>
+                        </div>
+                    </div>
+                    <div class="col-auto">
+                        <button type="button" class="btn btn-danger" onclick="removeFileField(1, '')"><span class="mdi mdi-trash-can"></span></button>
+                        <button type="button" class="btn app-btn-secondary" onclick="addFileField(1)">+</button>
+                    </div>
+                </div>
+    </div>
+
+    <!-- <div class="form-row d-flex align-items-end" id="fileField_1">
         <input type="hidden" name="leads_file_id[]" value="">
 
         <div class="form-group col-md-5">
@@ -63,5 +98,5 @@ $increment = 1;
             <button type="button" class="btn btn-danger" onclick="removeFileField(1, '')">x</button>
             <button type="button" class="btn btn-primary" onclick="addFileField(1)">+</button>
         </div>
-    </div>
+    </div> -->
 <?php } ?>
diff --git a/app/Views/tat_report_band_wise_list.php b/app/Views/tat_report_band_wise_list.php
index 7bc6972c..813b37f9 100644
--- a/app/Views/tat_report_band_wise_list.php
+++ b/app/Views/tat_report_band_wise_list.php
@@ -8,10 +8,7 @@
         padding: 4px 4px !important;
     }
 
-    .col-12 {
-
-        max-width: 98% !important;
-    }
+    
 
     .dataTables_filter {
         position: absolute;
@@ -103,21 +100,45 @@
                 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-7'p>>", // Pagination at the bottom, without page length selector
-                buttons: [{
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'TAT BAND WISE DATA',
-                    },
+                // buttons: [{
+                //         extend: 'csv',
+                //         text: 'CSV',
+                //         title: 'TAT BAND WISE DATA',
+                //     },
+                //     {
+                //         extend: 'excel',
+                //         text: 'Excel',
+                //         title: 'TAT BAND WISE DATA',
+                //     }
+                // ],
+                buttons: [
                     {
-                        extend: 'excel',
-                        text: 'Excel',
-                        title: 'TAT BAND WISE DATA',
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'TAT BAND WISE DATA',
+                                    },
+                                    {
+                                        extend: 'excel',
+                                        text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'TAT BAND WISE DATA',
+                                    }
+                        ]
                     }
-
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 10, // Set default number of rows per page (optional)
diff --git a/app/Views/test_members_list.php b/app/Views/test_members_list.php
index 79b52c8b..2793884c 100644
--- a/app/Views/test_members_list.php
+++ b/app/Views/test_members_list.php
@@ -138,22 +138,22 @@ th:first-child, td:first-child {
                 <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
-                        <th><input type="checkbox" id="selectAll" onclick="toggleAll(this)"></th>                            
-                        <th class="font-weight-medium">SNO</th>
+                        <th><input type="checkbox" id="selectAll" onclick="toggleAll(this)">&nbsp;</th>                            
+                        <th class="font-weight-medium">S.No&nbsp;</th>
                             <?php if (isset($getData)) { 
                                 if ($getData['client_id'] == '0' && $getData['policy_id'] == '0' && $getData['branch_id'] == '0' && ($getData['emp_code'] != "" || $getData['emp_name'] != "" || $getData['status'] != "")) { ?>
-                                    <th class="font-weight-medium">Client/Branch</th>
+                                    <th class="font-weight-medium">Client/Branch&nbsp;</th>
                             <?php } 
                                 if ($getData['client_id'] != '0' && $getData['branch_id'] == '0') { ?>
-                                    <th class="font-weight-medium">Branch</th>
+                                    <th class="font-weight-medium">Branch&nbsp;</th>
                             <?php } } ?>
 
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">EMP Code</th>
-                            <th class="font-weight-medium">Relationship</th>
-                            <th class="font-weight-medium">Gender</th>
-                            <th class="font-weight-medium">Date of Birth</th>
-                            <th class="font-weight-medium">Existing Policy Count</th>
+                            <th class="font-weight-medium">Name&nbsp;</th>
+                            <th class="font-weight-medium">EMP Code&nbsp;</th>
+                            <th class="font-weight-medium">Relationship&nbsp;</th>
+                            <th class="font-weight-medium">Gender&nbsp;</th>
+                            <th class="font-weight-medium">Date of Birth&nbsp;</th>
+                            <th class="font-weight-medium">Existing Policy Count&nbsp;</th>
                             <!-- <th class="font-weight-medium">Policy name</th>
                             <th class="font-weight-medium">Insurer name</th>
                             <th class="font-weight-medium">TPA ID</th>
@@ -557,8 +557,12 @@ document.addEventListener("DOMContentLoaded", function () {
                     className:"unmapEmployees"
                 }],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
                 pageLength: 25 // Set default number of rows per page (optional)
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index c0938ee2..5e2376a5 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -1,21 +1,29 @@
 <style>
+.table th,
+.table td {
+    padding: 8px;
+}
+
+table.dataTable tbody td {
+    padding: 4px 4px !important;
+}
 
 .col-12 {
-
     max-width: 98% !important;
 }
 
-
-.right-align-input {
-    text-align: right;
+.dataTables_filter {
+    position: absolute;
 }
 
-.text-custom {
-    font-weight: 400;            
-    font-style: normal;          
-    font-size: 11px;
-    line-height: 1.44;           
-    letter-spacing: -0.02em;     
+.column-header {
+    margin-right: 10px;
+}
+
+
+.btn {
+    font-size: 0.9rem;
+    padding: 0.5rem 1rem;
 }
 
 </style>
@@ -27,90 +35,85 @@
   color: #6c757d !important; 
 }
 
-table.dataTable td.wrap {
-    white-space: normal !important; 
-    word-break: break-word; 
-}
-
 </style>
 
+<div class="row" id="ticket_list">
+    <div class="col-12">
+        <div class="card">
+            <div class="card-body">
+                <div>
+                    <div class="table-responsive">
+                        <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
 
-<div class="col-12">
-    <div class="card">
-        <div class="card-body maincard">
-            <div class="row">
-                <div class="col-6" style="align-self: center;">
-                    <p class="title-text  font-color-black" style="position: relative;">Tickets </p>
-                </div>
-            </div>
-            <div>
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
-                    <thead class="app-table-head">
-                        <tr>
-                            <th>Ticket ID</th>
-                            <th class="app-text-left">Name</th>
-                            <th>Policy Number</th>
-                            <th>Ticket Type</th>
-                            <th>Subject</th>
-                            <th>Status</th>
-                            <th class="app-text-left">Assign To</th>
-                            <th>Created At</th>
-                            <th>Updated At</th>
-                        </tr>
-                    </thead>
-                    <tbody class="app-table-body">
-                        <?php if (isset($ticket_data)) { ?>
-                            <?php foreach($ticket_data as $index => $row){ ?>
+                            <thead class="bg-light">
+                                <tr>
+                                    <th><div class="column-header">Ticket ID&nbsp;</div></th>
+                                    <th class="text-left"><div class="column-header">Name &nbsp;</div></th>
+                                    <th><div class="column-header">Policy Number &nbsp;</div></th>
+                                    <th><div class="column-header">Ticket Type &nbsp;</div></th>
+                                    <th><div class="column-header">Subject &nbsp;</div></th>
+                                    <th><div class="column-header">Status &nbsp;</div></th>
+                                    <th class="text-left"><div class="column-header">Assign To &nbsp;</div></th>
+                                    <th><div class="column-header">Created At &nbsp;</div></th>
+                                    <th><div class="column-header">Updated At &nbsp;</div></th>
+                                </tr>
+                            </thead>
 
-                                    <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
-                                    <td class="app-text-right"><?php echo $row['thz_id']; ?></td>
-                                    <td class="app-text-left">
-                                        <?php echo $row['name']; ?> 
-                                        <span class="text-custom-grey"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
-                                        <span class="text-custom-grey"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
-                                    </td>
-                                    <td class="app-text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
+                            <tbody class="app-table-body">
+                                <?php if(isset($ticket_data)) { ?>
+                                    <?php foreach($ticket_data as $index => $row){ ?>
+                                      <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
+                                        <td class="text-center"><?php echo $row['thz_id']; ?></td>
+                                        <td class="text-left"><?php echo $row['name']; ?> 
+                                          <span class="text-custom-grey"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
+                                          <span class="text-custom-grey"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
+                                        </td>
+                                        <td class="text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
                                               ? $row['policy_no'] 
                                               : 'N/A'; ?>
                                     </td>
-                                    <td class="app-text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : '-'; ?></td>
-                                    <td class="app-text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
+                                    <td class="text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : 'N/A'; ?></td>
+                                    <td class="text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
                                       <?php 
                                           $subject = $row['subject'] ? $row['subject'] : 'N/A';
-                                          echo (strlen($subject) > 50) 
-                                              ? htmlspecialchars(substr($subject, 0, 50)) . "..." 
+                                          echo (strlen($subject) > 18) 
+                                              ? htmlspecialchars(substr($subject, 0, 18)) . "..." 
                                               : htmlspecialchars($subject);
                                       ?>
                                     </td>
-                                    <td class="app-text-center"><?php echo $row['status'] ? $row['status'] : '-' ; ?></td>
-                                    <td class="app-text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : '-'; ?></td>        
-                                    <td class="app-text-left">
+                                    <td class="text-center"><?php echo $row['status'] ? $row['status'] : 'N/A' ; ?></td>
+                                    <td class="text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : 'N/A'; ?></td>        
+                                    <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
-                                        $cd =  date("j F Y", strtotime($row['created_at']));
+                                        $cd =  date("j M Y", strtotime($row['created_at']));
                                         $ct =  date("h:i a", strtotime($row['created_at']));
                                         echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
                                         endif;
                                     ?>
                                     </td>
-                                    <td class="app-text-left">
+                                    <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
-                                        $ud =  date("j F Y", strtotime($row['updated_at']));
+                                        $ud =  date("j M Y", strtotime($row['updated_at']));
                                         $ut =  date("h:i a", strtotime($row['updated_at']));
                                         echo $ud . "<br><span class='time'> " . $ut . "</span>"; 
                                         endif;
                                     ?>
                                     </td>
-                                </tr>
-                            <?php } ?>
-                        <?php } ?>
-                    </tbody>
-                </table>
-
-                <div>
+                                    </tr>
+                                    <?php } ?>
+                                <?php } else { ?>
+                                    <tr>
+                                        <td colspan="9" class="text-center">No data available</td>
+                                    </tr>
+                                <?php } ?>
+                            </tbody>
+                            
+                        </table>
+                    </div>
                 </div>
             </div>
-        </div><!-- end col -->
-    </div>
+        </div>
+    </div><!-- end col -->
 </div>
 
 <div class="modal fade " id="ticketModal" tabindex="-1" role="dialog" aria-hidden="true">
@@ -244,7 +247,7 @@ table.dataTable td.wrap {
 
             <!-- <div class="form-group col-md-12 ">
               <label for="subject">Subject<span class="text-danger">*</span></label>
-              <small id="subjectCounter" class="form-text text-muted app-text-right">0/150</small>
+              <small id="subjectCounter" class="form-text text-muted text-right">0/150</small>
             </div> -->
             <div class="form-group col-md-12 ">
               <div class="d-flex justify-content-between">
@@ -257,7 +260,7 @@ table.dataTable td.wrap {
             <div class="form-group col-md-12 ">
               <div class="d-flex justify-content-between">
                 <label for="message">Message<span class="text-danger">*</span></label>
-                <small id="messageCounter" class="form-text text-muted text-end app-text-right">0/1500</small>
+                <small id="messageCounter" class="form-text text-muted text-end text-right">0/1500</small>
               </div>
               <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
               <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="3" required maxlength="1500"></textarea>
@@ -306,8 +309,69 @@ table.dataTable td.wrap {
 </div>
 
 
+
 <script>
 
+    // Datatable document ready
+    $(document).ready(function() {
+
+        var ticketsTable = $('#tickets-table');
+
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                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-7'p>>", // Pagination at the bottom, without page length selector
+                buttons: [            
+                   {
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
+                        action: function(e, dt, node, config) { 
+                            openTicket();
+                        }
+                    },
+                    {
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        className: 'app-btn-primary ',
+                                        title: 'Tickets',
+                                    },
+                                    {
+                                      extend: 'excel',
+                                      text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                      exportOptions: {
+                                          orthogonal: 'sort'
+                                      },
+                                      className: 'app-btn-primary ',
+                                      title: 'Tickets'
+                                    }
+                        ]
+                    }
+                ],
+                 language: {
+                  search: `
+                  <div class="datatable-search-wrapper">
+                      _INPUT_
+                      <i class="mdi mdi-magnify datatable-search-icon"></i>
+                  </div>`,
+                  searchPlaceholder: "Search"
+                },
+                paging: true,
+                pageLength: 10,
+                order: [[0, 'desc']]
+            });
+        } else {
+            console.error("Table not found.");
+        }
+    });
+
+
     function openTicket(){
         var form = document.getElementById('ticketForm');
         form.reset(); 
@@ -344,10 +408,10 @@ table.dataTable td.wrap {
         var ticketType = document.getElementById('ticket_type').value.trim();
 
         // Validation checks
-        if (name === "" || mobile === "" || email === "" || ticketType === "") {
-            toastr.warning('Please fill all required fields.', 'Warning');
-            form.classList.add('was-validated');
-            return;
+        if (message.length === 0) {
+          toastr.error('Message cannot be empty', 'Warning');
+          form.classList.add('was-validated');
+          return;
         }
 
         if (message.length > 1500) {
@@ -356,6 +420,12 @@ table.dataTable td.wrap {
           return;
         }
 
+        if (subject.length === 0) {
+          toastr.error('Subject cannot be empty', 'Warning');
+          form.classList.add('was-validated');
+          return;
+        }
+
         if (subject.length > 150) {
           toastr.error('Subject cannot exceed 150 characters', 'Warning');
           form.classList.add('was-validated');
@@ -376,6 +446,12 @@ table.dataTable td.wrap {
             return;
         }
 
+        if (name === "" || mobile === "" || email === "" || ticketType === "" || subject === "" || message === "") {
+            toastr.warning('Please fill all required fields.', 'Warning');
+            form.classList.add('was-validated');
+            return;
+        }
+
         var form = document.getElementById("ticketForm"); // your form ID
         var formData = new FormData(form);
 
@@ -583,53 +659,6 @@ $(document).ready(function() {
     $("#modal_assignee").select2();
     hideandshowpolicy();
 
-    var ticketsTable = $('#scroll-horizontal-datatable');
-
-    if (ticketsTable.length) {
-
-      ticketsTable.DataTable({
-          scrollX: true,
-          dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
-            "<'row'<'col-sm-12'tr>>" + 
-            "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
-          buttons: [
-              {
-                  text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Create New Ticket </span>',
-                  className: 'btn app-btn-primary  mr-2',
-                  action: function(e, dt, node, config) { 
-                      openTicket();
-                  }
-              },
-              {
-                  extend: 'collection',
-                  text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
-                  className: 'btn app-btn-secondary ',
-                  buttons: [
-                            {
-                                extend: 'csv',
-                                text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
-                                className: 'app-btn-primary ',
-                            },
-                            {
-                                extend: 'excel',
-                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
-                                exportOptions: {
-                                    orthogonal: 'sort'
-                                },
-                                className: 'app-btn-primary ',
-                            }
-                  ]
-              }
-          ],
-          paging: true,
-          pageLength: 25,
-          order: [[0, 'desc']]
-      });
-
-    } else {
-        console.error("Table Not found.");
-    }
-
     const subjectInput = document.getElementById("subject");
     const subjectCounter = document.getElementById("subjectCounter");
 
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 98443f8f..b3d26b07 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -1,5 +1,4 @@
 <style>
-
 .notes-box {
   display: flex;
   align-items: center;
@@ -15,6 +14,10 @@
   resize: none;
   padding: 8px;
   font-size: 14px;
+  background-color: transparent !important;
+  border-radius: 0px !important;
+  box-shadow: 0px 0px 0px 0px transparent !important;
+  border-color: transparent !important;
 }
 
 .icon-buttons {
@@ -72,10 +75,12 @@
 .conversation-card,
 .conversation-card .card-header,
 .conversation-card .card-body {
-  
   background: #F5FFFF !important;
 }
-
+.conversation-card{
+    box-shadow: 0 2px 4px 0 #00000040;
+    border-radius : 15px !important;
+}
 .master-card{
     border-radius: 15px !important;
     box-shadow: 0 2px 4px 0 #00000040;
@@ -129,146 +134,134 @@ hr{
 }
 </style>
 
+<div class="row" id="notespage">
 
+   <h3 class="secondary-title">
+    <a href="#" onclick="history.back(); return false;">
+        <i class="mdi mdi-chevron-left" title="Back"></i>
+    </a>
+    <span>Ticket ID - <?= $master[0]['thz_id']; ?></span>
+   </h3>
 
-<div class="col-12">
-    <div class="card ">
-        <div class="card-body maincard">
-            
-            <!-- Title -->
-            <div class="row" id="notes-title" style="padding-bottom: 10px;">
-                <!-- <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;"><span onclick="history.back()"><i class="mdi mdi-chevron-left" style="font-size: 24px;"></i></span> Ticket ID-<?php echo $master[0]['thz_id']; ?></h4>
-                </div> -->
-                <h4 class="d-flex align-items-center" style="gap: 8px;">
-                    <span onclick="history.back()" style="cursor: pointer;">
-                        <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
-                    </span>
-                    <span class="title-text ">Ticket ID-<?= $master[0]['thz_id']; ?></span>
-                </h4>
-            </div>
-
-            <!-- Body -->
-            <div class="row" id="notes-body"> 
-
-                <!-- Left Details -->
-                <div class="col-5" id="notes-body-left">
-                    <div class="card master-card" style="background:#F5FFFF;">
-                        <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
-                            <p class="sub-title-text  mb-0">Details</p>
-                            <?php if($master[0]['status'] !== "Closed") : ?>
-                            <a href="javascript:void(0);" onclick="openEditTicket()">
-                                <i class="mdi mdi-pencil edit-icon" title="Edit"></i>
-                                <!-- <i class="mdi mdi-pencil"
-                                title="Edit"
-                                style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
-                                onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
-                                onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
-                                </i> -->
-                            </a>
-                            <?php endif; ?>
-                        </div>
-                        <div class="card-body card-scroll sub-title-text " style="padding:0 27px !important; background:#F5FFFF;">
-                            <div class="row mb-2 ml-o">
-                                <div class="col-4 app-subtitle app-text-grey ">Ticket ID</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['thz_id'];?></div>
+    <div class="col-12">
+        <div class="card">
+            <div class="card-body">
+                <div class="row" id="notes-body"> 
+                    <!-- Left Details -->
+                    <div class="col-5" id="notes-body-left">
+                        <div class="card master-card" style="background:#F5FFFF; border-radius: 15px;">
+                            <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
+                                <h3 class="mb-0">Details</h3>
+                                <?php if($master[0]['status'] !== "Closed") : ?>
+                                <a href="javascript:void(0);" onclick="openEditTicket()">
+                                    <i class="mdi mdi-pencil edit-icon" title="Edit"></i>
+                                    <!-- <i class="mdi mdi-pencil"
+                                    title="Edit"
+                                    style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
+                                    onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
+                                    onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
+                                    </i> -->
+                                </a>
+                                <?php endif; ?>
                             </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Name</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['name'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Mobile</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['mobile'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Policy Number</div>
-                                <div class="col-8 app-text text-end  app-text-black" style="font-weight: 500 !important;">
-                                    <?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
-                                        ? '<u class="app-text-black">
-                                                <a href="javascript:void(0);" 
-                                                class="app-text-black"
-                                                data-toggle="modal" 
-                                                data-target="#PolicyModal" 
-                                                title="Click to view Policy Terms"
-                                                data-id="'.$master[0]['policy_id'].'">'
-                                                .$master[0]['policy_no'].'
-                                                </a>
-                                        </u>'
-                                        : 'N/A'; ?>
+                            <div class="card-body card-scroll  " style="padding:0 27px !important; background:#F5FFFF; border-radius: 15px !important;">
+                                <div class="row mb-2 ml-o">
+                                    <div class="col-4 app-subtitle app-text-grey ">Ticket ID</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['thz_id'];?></div>
                                 </div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Assigned To</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['assignee_name'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Status</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;">
-                                        <?= (!empty($master[0]['status']) && strtolower($master[0]['status']) !== 'null') 
-                                            ? '<u class="app-text-black">
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Name</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['name'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Mobile</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['mobile'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Policy Number</div>
+                                    <div class="col-8 text-end  font-color-black" style="font-weight: 500 !important;">
+                                        <?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
+                                            ? '<u class="font-color-black">
                                                     <a href="javascript:void(0);" 
-                                                    class="app-text-black"
-                                                    onclick="statusHistory('.$master[0]['thz_id'].')"
+                                                    class="font-color-black"
                                                     data-toggle="modal" 
-                                                    data-target="#StatusModal" 
-                                                    title="Click to view Status History">'
-                                                    .$master[0]['status'].'
+                                                    data-target="#PolicyModal" 
+                                                    title="Click to view Policy Terms"
+                                                    data-id="'.$master[0]['policy_id'].'">'
+                                                    .$master[0]['policy_no'].'
                                                     </a>
                                             </u>'
                                             : 'N/A'; ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Ticket Type</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important;"><?= $master[0]['ticket_type'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Subject</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['subject'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Message</div>
-                                <div class="col-8 app-text app-text-black text-end " style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['message'];?></div>
-                            </div>
-                            <div class="row mb-2">
-                                <div class="col-4 app-subtitle app-text-grey ">Related Tickets</div>
-                                <div class="col-8 app-text text-end " style="font-weight: 500 !important;">
-                                    <u class="text-warning">
-                                        <a href="javascript:void(0);" 
-                                        class="text-warning"
-                                        data-toggle="modal" 
-                                        data-target="#relatedTicketModal" 
-                                        title="<?= empty($master[0]['created_by']) ? 'No related tickets' : 'Click to view related tickets'; ?>"
-                                        data-id="<?= $master[0]['created_by']; ?>">
-                                        View
-                                        </a>
-                                    </u>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Assigned To</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['assignee_name'];?></div>
                                 </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Status</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;">
+                                            <?= (!empty($master[0]['status']) && strtolower($master[0]['status']) !== 'null') 
+                                                ? '<u class="font-color-black">
+                                                        <a href="javascript:void(0);" 
+                                                        class="font-color-black"
+                                                        onclick="statusHistory('.$master[0]['thz_id'].')"
+                                                        data-toggle="modal" 
+                                                        data-target="#StatusModal" 
+                                                        title="Click to view Status History">'
+                                                        .$master[0]['status'].'
+                                                        </a>
+                                                </u>'
+                                                : 'N/A'; ?>
+                                    </div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Ticket Type</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important;"><?= $master[0]['ticket_type'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Subject</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['subject'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Message</div>
+                                    <div class="col-8 font-color-black text-end " style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['message'];?></div>
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-4 app-subtitle app-text-grey ">Related Tickets</div>
+                                    <div class="col-8 text-end " style="font-weight: 500 !important;">
+                                        <u class="text-warning">
+                                            <a href="javascript:void(0);" 
+                                            class="text-warning"
+                                            data-toggle="modal" 
+                                            data-target="#relatedTicketModal" 
+                                            title="<?= empty($master[0]['created_by']) ? 'No related tickets' : 'Click to view related tickets'; ?>"
+                                            data-id="<?= $master[0]['created_by']; ?>">
+                                            View
+                                            </a>
+                                        </u>
+                                    </div>
 
+                                </div>
+                                <!-- add more fields -->
                             </div>
-                            <!-- add more fields -->
                         </div>
                     </div>
-                </div>
-
-                <!-- Right Conversation -->
-                 
-                <div class="col-7">
-                    
-                    <!-- Conversation Card -->
-                    <div class="card mb-3 conversation-card">
-                         <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none; padding-bottom: 0px;">
-                            <p class="sub-title-text  app-text-black" >Conversation</p>
-                        </div>
-                        <div class="card-body recard-scroll" style="padding:0 27px !important; margin:0 !important; background:#F5FFFF;">
+                    <!-- Right Conversation -->
+                    <div class="col-7" id="notes-body-right">
+                        <!-- Conversation Card -->
+                        <div class="card mb-3 conversation-card" style="background:#F5FFFF; border-radius: 15px !important;">
+                         <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none; padding-bottom: 0px; border-radius: 15px !important;">
+                            <h3 class="font-color-black" >Conversation</h3>
+                         </div>
+                         <div class="card-body recard-scroll" style="padding:0 27px !important; margin:0 !important; background:#F5FFFF;  border-radius: 15px !important;">
                           <?php if(!empty($notes)): ?>
                             <?php foreach($notes as $i => $conv): ?>
                                 
                                 <div style="border:none; padding: 0px; margin: 0px;">
                                         <hr/>
                                         <!-- Top Row: Message + Badge -->
-                                        <div class="d-flex justify-content-between align-items-start app-text app-text-black ">
+                                        <div class="d-flex justify-content-between align-items-start font-color-black ">
                                             <p class="mb-1 ml-0 mr-0 " style="font-weight: 400 !important;"><?= $conv['notes'] ?></p>
                                             <!-- <?php if(!empty($conv['notes_by'])): ?>
                                                 <span class="badge bg-warning text-dark"><?= $conv['notes_by'] ?></span>
@@ -294,7 +287,7 @@ hr{
                                     <p class="text-center  font-color-black"><i>No Data Found</i></p>
                                 </div>
                             <?php endif; ?>
-                        </div>
+                         </div>
                     </div>
 
                     <!-- Input Card -->
@@ -313,24 +306,27 @@ hr{
                                         <button type="button" class="btn-icon" onclick="submitConverstionTicket('External', this)"><i class="mdi mdi-email"></i></button>
                                     </div>
                             </div>
-                            <small id="messageCounter" class="form-text text-muted text-end app-text-right">0/1500</small>
+                            <small id="messageCounter" class="form-text text-muted text-end text-right">0/1500</small>
                         </form>
                     </div>
-
+                    </div>
                 </div>
-            </div> <!-- /notes-body -->
-
+            </div>
         </div>
     </div>
 </div>
 
-<div class="modal fade app-text-black " id="EditModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade font-color-black " id="EditModal" tabindex="-1" role="dialog" aria-hidden="true"
+data-backdrop="static" 
+     data-keyboard="false"
+     data-bs-backdrop="static" 
+     data-bs-keyboard="false">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content">
       <form id="ticketForm">
         <div class="modal-header">
             <h4 class="modal-title title-text" id="EditModalLabel" style="font-size:27px !important">Update</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-bs-dismiss="modal">×</button>
         </div>
 
         <div class="modal-body">    
@@ -339,7 +335,7 @@ hr{
             <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
             
             <div class="form-group col-md-12">
-              <label for="ticket_type" class="sub-title-text ">Ticket Type<span class="text-danger">*</span></label>
+              <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
               <select class="form-control" id="ticket_type" name="ticket_type" required>
                 <option value="">Select Ticket Type</option>
                 <!-- <option value="Sales">Sales</option>
@@ -356,7 +352,7 @@ hr{
 
 
             <div class="form-group col-md-12">
-              <label for="status" class="sub-title-text ">Status</label>
+              <label for="status">Status</label>
               <select class="form-control" id="status" name="status">
                 <option value="">Select Status</option>
                 <option value="Open">Open</option>
@@ -370,7 +366,7 @@ hr{
                  // 2,3,4 dropdown data'va varannum but dropdown hide pannanum  --> 
             <?php if(in_array(get_role_id(), [1,5]) ) { ?> 
             <div class="form-group col-md-12">
-              <label for="assign_to" class="sub-title-text ">Assign To</label>
+              <label for="assign_to">Assign To</label>
               <select class="form-control" id="assign_to" name="assign_to">
                 <option value="">Select Assign To</option>
                 <?php if(isset($assignee)) { ?>
@@ -386,7 +382,7 @@ hr{
           </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn app-btn-secondary " onclick="submitTicket()">Save</button>
+          <button type="button" class="btn app-btn-secondary" onclick="submitTicket()">Save</button>
         </div>
       </form>
     </div>
@@ -399,7 +395,7 @@ hr{
       
         <div class="modal-header" style="border-bottom-width:0;">
             <h4 class="modal-title title-text  " style="font-size:27px !important">Related Tickets</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-bs-dismiss="modal">×</button>
         </div>
 
         <div class="modal-body card-scroll" style="padding-top:5px!important;">  
@@ -446,7 +442,7 @@ hr{
       
         <div class="modal-header" style="border-bottom-width:0;">
             <h4 class="modal-title title-text  ">Policy Terms</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-bs-dismiss="modal">×</button>
         </div>
 
         <div class="modal-body card-scroll" style="padding-top:5px!important;">  
@@ -471,7 +467,7 @@ hr{
       
         <div class="modal-header" style="border-bottom-width:0;">
             <h4 class="modal-title title-text ">Status History</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-bs-dismiss="modal">×</button>
         </div>
 
         <div class="modal-body card-scroll history-container" style="padding:5px 11px 11px 11px!important;">  
@@ -481,15 +477,12 @@ hr{
   </div>
 </div>
 
-
-
 <script>
 
     $(document).ready(function() {
-            // Initialize select2
-            $("#ticket_type").select2();
-            $("#status").select2();
-            $("#assign_to").select2();
+        // Initialize select2
+        $("#ticket_type, #status, #assign_to").select2();
+
             const messageInput = document.getElementById("notes");
             const messageCounter = document.getElementById("messageCounter");
 
@@ -504,20 +497,35 @@ hr{
                 messageInput.classList.remove('is-invalid');
             }
             });
-            
 
+        const btn = document.querySelector("button[onclick='submitTicket()']");
+
+        
+        $("#ticket_type, #status, #assign_to").on('change', function() {
+            if (btn.disabled) {
+                btn.disabled = false;
+                btn.innerText = "Save";
+            }
+        });
     });
 
 
     function openEditTicket() {
             var form = document.getElementById('ticketForm');
             form.reset(); 
+            form.classList.remove('was-validated'); // remove Bootstrap validation styling
+
+            var btn = document.querySelector("button[onclick='submitTicket()']");
+            btn.disabled = false;
+            btn.innerText = "Save";            
+            
 
             var masterData = <?= json_encode($master[0]); ?>;
             console.log(masterData);
 
             $("#edit_thz_id").val(masterData.thz_id);
-            $("#ticket_type").val(masterData.ticket_type).trigger("change"); 
+            // $("#updated_by").val("<?= get_session_userid(); ?>");
+            $("#ticket_type").val(masterData.ticket_type).trigger("change");
             $("#status").val(masterData.status).trigger("change");
             $("#assign_to").val(masterData.assign_to).trigger("change");
 
@@ -633,13 +641,13 @@ function statusHistory(thzId) {
                 let table = `
                 <div class="table-responsive">
                     <table data-custom-table-css="table" class="table w-100 nowrap text-custom-black text-custom  app-datatable">
-                        <thead class="app-table-head">
+                        <thead class="bg-light">
                             <tr>
-                                <th class="app-text app-text-white">S.No</th>
-                                <th class="app-text app-text-white">Old Status</th>
-                                <th class="app-text app-text-white">New Status</th>
-                                <th class="app-text app-text-white">Updated By</th>
-                                <th class="app-text app-text-white">Date/Time</th>
+                                <th class="app-text-white">S.No</th>
+                                <th class="app-text-white">Old Status</th>
+                                <th class="app-text-white">New Status</th>
+                                <th class="app-text-white">Updated By</th>
+                                <th class="app-text-white">Date/Time</th>
                             </tr>
                         </thead>
                         <tbody class="app-table-body">
diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php
index cfa9e718..125d792e 100644
--- a/app/Views/ticket_edit_onbording.php
+++ b/app/Views/ticket_edit_onbording.php
@@ -1,12 +1,37 @@
 <style>
-.bg-staff {
-    background-color: #FFF5E5;
-}
+    .bg-staff {
+        background-color: #FFF5E5;
+    }
 
-.label-font-size{
-    font-size:0.875rem;
-}
+    .label-font-size {
+        font-size: 0.875rem;
+    }
 
+    .nav-pills,
+    .nav-link {
+        background-color: #F5FFFF !important;
+        color: #00999E !important;
+        border-radius: 10px;
+
+    }
+
+    .nav-pills {
+        background-color: #F5FFFF !important;
+        color: #00999E !important;
+        box-shadow: 0px 2px 4px 0px #00000040;
+        padding-top: 5px;
+    }
+
+
+    .nav-link.active-tab {
+        color: white !important;
+        background-color: #00999E !important;
+        font-size: small !important;
+        padding: 8px 16px;
+        border-radius: 10px !important;
+        box-shadow: 0px 2px 4px 0px #00000040;
+
+    }
 </style>
 <div class="row">
     <div class="col-12">
@@ -25,75 +50,85 @@
                 </div>
 
                 <!-- Navigation Tabs -->
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-tab" data-toggle="tab" class="nav-link px-2 py-1 active label-font-size" id="general_tab"
-                            aria-expanded="true">
-                            <i class="mdi mdi-ticket-account"></i>
-                            <span class="d-none d-sm-inline-block ">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#reply-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="reply_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-message-processing"></i>
-                            <span class="d-none d-sm-inline-block">Reply</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#note-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="note_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-note-text"></i>
-                            <span class="d-none d-sm-inline-block">Notes</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#history-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="history_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-history"></i>
-                            <span class="d-none d-sm-inline-block">History</span>
-                        </a>
-                    </li>
-                    <?php if(in_array($ticket_data['ticket_type_id'], [1,2,3,4,5,6,7])){ ?>
-                    <li class="nav-item">
-                        <a href="#autoQuery-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="auto_query_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-robot mr-1"></i>                            
-                            <span class="d-none d-sm-inline-block">Auto Query Content</span>
-                        </a>
-                    </li>
-                    <?php } ?>
-                    <li class="nav-item">
-                        <a href="#uploads-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="uploads_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-file mr-1"></i>                            
-                            <span class="d-none d-sm-inline-block">Claim Files</span>
-                        </a>
-                    </li>
-                    <?php if(in_array($ticket_data['ticket_type_id'], [1,2,3,4,5,6,7])){ ?>
-                    <li class="nav-item">
-                        <a href="#viewpolicyterms-tab" data-toggle="tab" class="nav-link px-2 py-1 label-font-size" id="viewpolicyterms_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-eye mr-1"></i>                            
-                            <span class="d-none d-sm-inline-block">View Policy Terms</span>
-                        </a>
-                    </li>
-                    <?php } ?>
-                </ul>
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-tab" data-toggle="tab" class="nav-link px-3 py-2 active label-font-size" id="general_tab"
+                                aria-expanded="true">
+                                <i class="mdi mdi-ticket-account"></i>
+                                <span class="d-none d-sm-inline-block ">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#reply-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="reply_tab"
+                                aria-expanded="false">
+                                <i class="mdi mdi-message-processing"></i>
+                                <span class="d-none d-sm-inline-block">Reply</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#note-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="note_tab"
+                                aria-expanded="false">
+                                <i class="mdi mdi-note-text"></i>
+                                <span class="d-none d-sm-inline-block">Notes</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#history-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="history_tab"
+                                aria-expanded="false">
+                                <i class="mdi mdi-history"></i>
+                                <span class="d-none d-sm-inline-block">History</span>
+                            </a>
+                        </li>
+                        <?php if (in_array($ticket_data['ticket_type_id'], [1, 2, 3, 4, 5, 6, 7])) { ?>
+                            <li class="nav-item">
+                                <a href="#autoQuery-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="auto_query_tab"
+                                    aria-expanded="false">
+                                    <i class="mdi mdi-robot mr-1"></i>
+                                    <span class="d-none d-sm-inline-block">Auto Query Content</span>
+                                </a>
+                            </li>
+                        <?php } ?>
+                        <li class="nav-item">
+                            <a href="#uploads-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="uploads_tab"
+                                aria-expanded="false">
+                                <i class="mdi mdi-file mr-1"></i>
+                                <span class="d-none d-sm-inline-block">Claim Files</span>
+                            </a>
+                        </li>
+                        <?php if (in_array($ticket_data['ticket_type_id'], [1, 2, 3, 4, 5, 6, 7])) { ?>
+                            <li class="nav-item">
+                                <a href="#viewpolicyterms-tab" data-toggle="tab" class="nav-link px-3 py-2 label-font-size" id="viewpolicyterms_tab"
+                                    aria-expanded="false">
+                                    <i class="mdi mdi-eye mr-1"></i>
+                                    <span class="d-none d-sm-inline-block">View Policy Terms</span>
+                                </a>
+                            </li>
+                        <?php } ?>
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
+
 
                 <!-- Tab Content -->
                 <div class="tab-content">
                     <div class="tab-pane fade show active" id="general-tab">
-                        <?php 
+                        <?php
 
                         if ($ticket_data['ticket_type_id'] == 1) {
-                             include('ticket_form_gmc.php');
-                        } else if($ticket_data['ticket_type_id'] == 8){
-                             include('ticket_form_motor.php');
+                            include('ticket_form_gmc.php');
+                        } else if ($ticket_data['ticket_type_id'] == 8) {
+                            include('ticket_form_motor.php');
                         } else {
-                             include('ticket_form_gpa.php');
-                        } 
-                       ?>
+                            include('ticket_form_gpa.php');
+                        }
+                        ?>
                     </div>
                     <div class="tab-pane fade" id="reply-tab">
                         <?php include('ticket_reply.php'); ?>
@@ -104,18 +139,18 @@
                     <div class="tab-pane fade" id="history-tab">
                         <?php include('ticket_history.php'); ?>
                     </div>
-                    <?php if(in_array($ticket_data['ticket_type_id'], [1,2,3,4,5,6,7])){ ?>
-                    <div class="tab-pane fade" id="autoQuery-tab">
-                        <?php include('ticket_auto_query.php'); ?>
-                    </div>
+                    <?php if (in_array($ticket_data['ticket_type_id'], [1, 2, 3, 4, 5, 6, 7])) { ?>
+                        <div class="tab-pane fade" id="autoQuery-tab">
+                            <?php include('ticket_auto_query.php'); ?>
+                        </div>
                     <?php } ?>
                     <div class="tab-pane fade" id="uploads-tab">
                         <?php include('claim_files_upload.php'); ?>
                     </div>
-                    <?php if(in_array($ticket_data['ticket_type_id'], [1,2,3,4,5,6,7])){ ?>
-                    <div class="tab-pane fade" id="viewpolicyterms-tab">
-                        <?php include('view_policy_terms.php'); ?>
-                    </div>
+                    <?php if (in_array($ticket_data['ticket_type_id'], [1, 2, 3, 4, 5, 6, 7])) { ?>
+                        <div class="tab-pane fade" id="viewpolicyterms-tab">
+                            <?php include('view_policy_terms.php'); ?>
+                        </div>
                     <?php } ?>
                 </div>
             </div>
@@ -137,18 +172,18 @@
                         <select class="form-control" onchange="setMemberData(this)">
                             <option value="0">Select Insured Member</option>
                             <?php if (!empty($member_data)) : ?>
-                            <?php foreach ($member_data as $value) : ?>
-                            <option value="<?= isset($value['emp_code']) ? $value['emp_code'] : '' ?>"
-                                data-empID="<?= isset($value['emp_id']) ? $value['emp_id'] : '' ?>"
-                                data-empName="<?= isset($value['emp_name']) ? htmlspecialchars($value['emp_name'], ENT_QUOTES, 'UTF-8') : '' ?>"
-                                data-policyNo="<?= isset($value['policy_no']) ? $value['policy_no'] : '' ?>"
-                                data-tpaNo="<?= isset($value['tpa_no']) ? $value['tpa_no'] : '' ?>"
-                                data-relationship="<?= isset($value['emp_relationship']) ? htmlspecialchars($value['emp_relationship'], ENT_QUOTES, 'UTF-8') : '' ?>">
-                                <?= isset($value['emp_name']) && isset($value['emp_relationship']) 
-                                    ? htmlspecialchars($value['emp_name'] . ' - ' . $value['emp_relationship'], ENT_QUOTES, 'UTF-8') 
-                                    : 'Unknown Member' ?>
-                            </option>
-                            <?php endforeach; ?>
+                                <?php foreach ($member_data as $value) : ?>
+                                    <option value="<?= isset($value['emp_code']) ? $value['emp_code'] : '' ?>"
+                                        data-empID="<?= isset($value['emp_id']) ? $value['emp_id'] : '' ?>"
+                                        data-empName="<?= isset($value['emp_name']) ? htmlspecialchars($value['emp_name'], ENT_QUOTES, 'UTF-8') : '' ?>"
+                                        data-policyNo="<?= isset($value['policy_no']) ? $value['policy_no'] : '' ?>"
+                                        data-tpaNo="<?= isset($value['tpa_no']) ? $value['tpa_no'] : '' ?>"
+                                        data-relationship="<?= isset($value['emp_relationship']) ? htmlspecialchars($value['emp_relationship'], ENT_QUOTES, 'UTF-8') : '' ?>">
+                                        <?= isset($value['emp_name']) && isset($value['emp_relationship'])
+                                            ? htmlspecialchars($value['emp_name'] . ' - ' . $value['emp_relationship'], ENT_QUOTES, 'UTF-8')
+                                            : 'Unknown Member' ?>
+                                    </option>
+                                <?php endforeach; ?>
                             <?php endif; ?>
                         </select>
 
@@ -166,153 +201,153 @@
     <?php include("ticket_conversation.php") ?>
 </div>
 
-<?php //include("ticket_form_handler.php") ?>
+<?php //include("ticket_form_handler.php") 
+?>
 
 <script>
-    
-function submitClaimForm(event, form) {
+    function submitClaimForm(event, form) {
 
-    event.preventDefault();
+        event.preventDefault();
 
-    var isValid = $('#ticket_form_data').parsley().validate();
+        var isValid = $('#ticket_form_data').parsley().validate();
 
-    if (!isValid) {
-        toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
-        return false;
-    }
-
-    const formAction = '<?= base_url("ticket/update"); ?>';
-
-    // Show loader
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-
-    // Collect IDs and form data
-    const formData = new FormData(form);
-
-    // AJAX request
-    $.ajax({
-        data: formData,
-        url: formAction,
-        type: "POST",
-        dataType: 'json',
-        processData: false,
-        contentType: false,
-        success: function(response) {
-            // Hide loader
-
-            console.log('Form submitted response:', response);
-
-            if (response.status === true) {
-                location.reload();
-                toastr.success(response.message, 'SUCCESS');
-            } else {
-                toastr.error(response.message, 'ERROR');
-            }
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-
-            // Hide loader
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-        }
-    });
-}
-
-function openFetchEmpDataodal() {
-    var myModal = new bootstrap.Modal(document.getElementById('member_data_modal'));
-    myModal.show();
-}
-
-function setMemberData(input) {is_head_approved
-
-    var selectedOption = $(input).find(':selected');
-
-    // Retrieve the data-* attributes
-    var empId = selectedOption.data('empid');
-    var empName = selectedOption.data('empname');
-    var policyNo = selectedOption.data('policyno');
-    var tpaNo = selectedOption.data('tpano');
-    var relationship = selectedOption.data('relationship');
-
-    $('#tpa_no').val(tpaNo);
-    $('#insured_emp_id').val(empId);
-    $('#insured_name').val(empName);
-    $('#policy_no').val(policyNo);
-
-    $('#relationship option').each(function() {
-        if ($(this).text() === relationship) {
-            $(this).prop('selected', true);
-        }
-    });
-}
-
-function showConfirmationModal(event) {
-    Swal.fire({
-        title: "Approve Claim Rejection",
-        // text: "Do you want to save this?",
-        icon: "warning",
-        showCancelButton: true,
-        showDenyButton: true, 
-        confirmButtonColor: "#3085d6",
-        cancelButtonColor: "#6c757d",
-        denyButtonColor: "#d33",
-        confirmButtonText: "Approve",
-        denyButtonText: "Reject",
-        cancelButtonText: "Cancel"
-    }).then((result) => {
-        if (result.isConfirmed) {
-            $('#is_head_approved').val(1);
-            console.log($('#ticket_form_data')[0])
-            submitClaimForm(event, $('#ticket_form_data')[0]); // Fixed selector
-        } else if (result.isDenied) {
-            // Show second Swal for rejection reason
-            Swal.fire({
-                title: "Rejection Reason",
-                text: "Please provide a reason for rejection",
-                input: "textarea",
-                inputPlaceholder: "Enter your reason here...",
-                icon: "info",
-                showCancelButton: true,
-                confirmButtonColor: "#3085d6",
-                cancelButtonColor: "#6c757d",
-                confirmButtonText: "Submit",
-                cancelButtonText: "Back"
-            }).then((reasonResult) => {
-                if (reasonResult.isConfirmed) {
-                    // Check if reason is not empty
-                    if (reasonResult.value && reasonResult.value.trim() !== "") {
-                        $('#is_head_approved').val(2);
-                        $('#rejection_reason').val(reasonResult.value.trim());
-                        console.log($('#ticket_form_data')[0]);
-                        $('#head_rejection_reason').val(reasonResult.value.trim());
-                        submitClaimForm(event, $('#ticket_form_data')[0]);
-                    } else {
-                        // Alert if reason is empty
-                        Swal.fire({
-                            title: "Error",
-                            text: "Rejection reason cannot be empty",
-                            icon: "error",
-                            confirmButtonColor: "#3085d6"
-                        }).then(() => {
-                            // Go back to the rejection reason dialog
-                            showConfirmationModal(event);
-                        });
-                    }
-                } else {
-                    // If canceled, go back to first Swal
-                    showConfirmationModal(event);
-                }
-            });
-        } else {
-            $('#is_head_approved').val(0);
+        if (!isValid) {
+            toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
             return false;
         }
-    });
-}
 
+        const formAction = '<?= base_url("ticket/update"); ?>';
+
+        // Show loader
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        // Collect IDs and form data
+        const formData = new FormData(form);
+
+        // AJAX request
+        $.ajax({
+            data: formData,
+            url: formAction,
+            type: "POST",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(response) {
+                // Hide loader
+
+                console.log('Form submitted response:', response);
+
+                if (response.status === true) {
+                    location.reload();
+                    toastr.success(response.message, 'SUCCESS');
+                } else {
+                    toastr.error(response.message, 'ERROR');
+                }
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+
+                // Hide loader
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+    }
+
+    function openFetchEmpDataodal() {
+        var myModal = new bootstrap.Modal(document.getElementById('member_data_modal'));
+        myModal.show();
+    }
+
+    function setMemberData(input) {
+        is_head_approved
+
+        var selectedOption = $(input).find(':selected');
+
+        // Retrieve the data-* attributes
+        var empId = selectedOption.data('empid');
+        var empName = selectedOption.data('empname');
+        var policyNo = selectedOption.data('policyno');
+        var tpaNo = selectedOption.data('tpano');
+        var relationship = selectedOption.data('relationship');
+
+        $('#tpa_no').val(tpaNo);
+        $('#insured_emp_id').val(empId);
+        $('#insured_name').val(empName);
+        $('#policy_no').val(policyNo);
+
+        $('#relationship option').each(function() {
+            if ($(this).text() === relationship) {
+                $(this).prop('selected', true);
+            }
+        });
+    }
+
+    function showConfirmationModal(event) {
+        Swal.fire({
+            title: "Approve Claim Rejection",
+            // text: "Do you want to save this?",
+            icon: "warning",
+            showCancelButton: true,
+            showDenyButton: true,
+            confirmButtonColor: "#3085d6",
+            cancelButtonColor: "#6c757d",
+            denyButtonColor: "#d33",
+            confirmButtonText: "Approve",
+            denyButtonText: "Reject",
+            cancelButtonText: "Cancel"
+        }).then((result) => {
+            if (result.isConfirmed) {
+                $('#is_head_approved').val(1);
+                console.log($('#ticket_form_data')[0])
+                submitClaimForm(event, $('#ticket_form_data')[0]); // Fixed selector
+            } else if (result.isDenied) {
+                // Show second Swal for rejection reason
+                Swal.fire({
+                    title: "Rejection Reason",
+                    text: "Please provide a reason for rejection",
+                    input: "textarea",
+                    inputPlaceholder: "Enter your reason here...",
+                    icon: "info",
+                    showCancelButton: true,
+                    confirmButtonColor: "#3085d6",
+                    cancelButtonColor: "#6c757d",
+                    confirmButtonText: "Submit",
+                    cancelButtonText: "Back"
+                }).then((reasonResult) => {
+                    if (reasonResult.isConfirmed) {
+                        // Check if reason is not empty
+                        if (reasonResult.value && reasonResult.value.trim() !== "") {
+                            $('#is_head_approved').val(2);
+                            $('#rejection_reason').val(reasonResult.value.trim());
+                            console.log($('#ticket_form_data')[0]);
+                            $('#head_rejection_reason').val(reasonResult.value.trim());
+                            submitClaimForm(event, $('#ticket_form_data')[0]);
+                        } else {
+                            // Alert if reason is empty
+                            Swal.fire({
+                                title: "Error",
+                                text: "Rejection reason cannot be empty",
+                                icon: "error",
+                                confirmButtonColor: "#3085d6"
+                            }).then(() => {
+                                // Go back to the rejection reason dialog
+                                showConfirmationModal(event);
+                            });
+                        }
+                    } else {
+                        // If canceled, go back to first Swal
+                        showConfirmationModal(event);
+                    }
+                });
+            } else {
+                $('#is_head_approved').val(0);
+                return false;
+            }
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/ticket_feedback_list.php b/app/Views/ticket_feedback_list.php
index 495d59ec..57ab8b6b 100644
--- a/app/Views/ticket_feedback_list.php
+++ b/app/Views/ticket_feedback_list.php
@@ -63,10 +63,10 @@ table.dataTable tbody td {
                         <?php if (isset($feedback_data)) { ?>
                             <?php foreach($feedback_data as $data){ ?>
                                     <tr onclick="viewFeedbackForm(<?php echo $data['id']; ?>)">
-                                    <td><?php echo $data['claim_number']; ?></td>
-                                    <td><?php echo $data['emp_code']; ?></td>
-                                    <td><?php echo $data['emp_name']; ?></td>
-                                    <td><?php echo $data['client_name']; ?></td>
+                                    <td><?php echo $data['claim_number'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $data['emp_code'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $data['emp_name'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $data['client_name'] ?: 'N/A'; ?></td>
                                 </tr>
                             <?php } ?>
                         <?php } ?>
@@ -98,26 +98,54 @@ $(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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Claim-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'claim-List',
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                },
-            ],
+            // buttons: [{
+            //         extend: 'csv',
+            //         text: 'CSV',
+            //         title: 'Claim-List',
+            //     },
+            //     {
+            //         extend: 'excel',
+            //         text: 'Excel',
+            //         title: 'claim-List',
+            //         exportOptions: {
+            //             orthogonal: 'sort'
+            //         },
+            //     },
+            // ],
+            buttons: [
+              {
+                  extend: 'collection',
+                  text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                  className: 'btn app-btn-secondary ',
+                  buttons: [
+                            {
+                                extend: 'csv',
+                                text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                className: 'app-btn-primary ',
+                                title: 'Claim-List',
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                title: 'claim-List',
+                                className: 'app-btn-primary ',
+                            }
+                  ]
+              }
+          ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
             },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             ordering: false,
         });
     } else {
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index 25d15e5b..095e8de7 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -24,425 +24,453 @@
         font-size: 24px;
     }
 
-    .label-font-size{
-        font-size:0.875rem;
+    .label-font-size {
+        font-size: 0.875rem;
     }
-
-
-
-
 </style>
-<div class="row">
-    <div class="col-12">
-        <div class="<?= !isset($ticket_data) ? "card" : "" ?>" style="margin-right: 23px;">
-            <div class="card-body">
-                <?php if (!isset($ticket_data)) { ?>
-                    <!-- Header Section -->
-                    <div class="row mb-3">
-                        <div class="col-6 d-flex align-items-center">
-                            <h4 class="mb-0">Claim GMC</h4>
+
+<div class="container-fluid-min">
+    <div class="row">
+        <div class="col-12">
+            <div class="<?= !isset($ticket_data) ? "card" : "" ?>" >
+                <div class="card-body">
+                    <?php if (!isset($ticket_data)) { ?>
+                        <!-- Header Section -->
+                        <div class="row mb-3">
+                            <div class="col-6 d-flex align-items-center">
+                                <h4 class="mb-0">Claim GMC</h4>
+                            </div>
+                            <div class="col-6 text-right">
+                                <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
+                                    <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i>
+                                </a>
+                            </div>
                         </div>
-                        <div class="col-6 text-right">
-                            <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
-                                <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i>
-                            </a>
-                        </div>
-                    </div>
-                <?php } ?>
-                <form role="form" class="parsley-examples" method="post" id="ticket_form_data" onsubmit="submitClaimForm(event, this)" enctype="multipart/form-data">
+                    <?php } ?>
+                    <form role="form" class="parsley-examples" method="post" id="ticket_form_data" onsubmit="submitClaimForm(event, this)" enctype="multipart/form-data">
 
-                    <input type="hidden" id="ticket_type_id" name="ticket_type_id" value="1">
-                    <input type="hidden" id="ticket_master_id" name="ticket_master_id" value="<?= isset($ticket_data['id']) ? $ticket_data['id'] : '' ?>">
-                    <input type="hidden" id="is_head_approved" name="is_head_approved" value="<?= isset($ticket_data['is_head_approved']) ? $ticket_data['is_head_approved'] : '' ?>">
-                    <input type="hidden" id="extra_fields_array_for_validate" name="extra_fields_array_for_validate" value='<?= isset($extra_fields_array_for_validate) && !empty($extra_fields_array_for_validate) ? json_encode($extra_fields_array_for_validate) : "[]" ?>'>
-                    <input type="hidden" id="head_rejection_reason" name="head_rejection_reason">
+                        <input type="hidden" id="ticket_type_id" name="ticket_type_id" value="1">
+                        <input type="hidden" id="ticket_master_id" name="ticket_master_id" value="<?= isset($ticket_data['id']) ? $ticket_data['id'] : '' ?>">
+                        <input type="hidden" id="is_head_approved" name="is_head_approved" value="<?= isset($ticket_data['is_head_approved']) ? $ticket_data['is_head_approved'] : '' ?>">
+                        <input type="hidden" id="extra_fields_array_for_validate" name="extra_fields_array_for_validate" value='<?= isset($extra_fields_array_for_validate) && !empty($extra_fields_array_for_validate) ? json_encode($extra_fields_array_for_validate) : "[]" ?>'>
+                        <input type="hidden" id="head_rejection_reason" name="head_rejection_reason">
 
-                    <div class="form-group">
 
-                        <h4>Employee Details</h4>
-                        <hr>
+                        <div id="accordion1" class="mb-3">
+                            <div class="card mb-1">
+                                <h4 class="m-1">
+                                    Employee details
+                                    <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
+                                        <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                                    </a>
+                                </h4>
+                                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion1">
+                                    <div class="card-body">
 
-                        <!-- first_data_points -->
-                        <div class="form-row">
+                                        <!-- first_data_points -->
+                                        <div class="form-row">
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_code" class="label-font-size">Employee ID <span class="text-danger">*</span> &nbsp; &nbsp; <i class="mdi mdi-magnify text-danger"
-                                        aria-hidden="true" onclick="openFetchEmpDataodal(this)"></i> <span
-                                        class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="emp_code" placeholder="Enter Employee ID"
-                                    value="<?= isset($ticket_data['emp_code']) ? $ticket_data['emp_code'] : '' ?>"
-                                    name="emp_code" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_code" class="label-font-size">Employee ID <span class="text-danger">*</span> &nbsp; &nbsp; <i class="mdi mdi-magnify text-danger"
+                                                        aria-hidden="true" onclick="openFetchEmpDataodal(this)"></i> <span
+                                                        class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="emp_code" placeholder="Enter Employee ID"
+                                                    value="<?= isset($ticket_data['emp_code']) ? $ticket_data['emp_code'] : '' ?>"
+                                                    name="emp_code" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_name" class="label-font-size">Employee Name <span class="text-danger">*</span></label>
-                                <input type=hidden id="emp_id" name="emp_id" value="<?= isset($ticket_data['emp_id']) ? $ticket_data['emp_id'] : '' ?>">
-                                <input type="text" class="form-control" id="emp_name" placeholder="Enter Employee Name"
-                                    value="<?= isset($ticket_data['emp_name']) ? $ticket_data['emp_name'] : '' ?>"
-                                    name="emp_name" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_name" class="label-font-size">Employee Name <span class="text-danger">*</span></label>
+                                                <input type=hidden id="emp_id" name="emp_id" value="<?= isset($ticket_data['emp_id']) ? $ticket_data['emp_id'] : '' ?>">
+                                                <input type="text" class="form-control" id="emp_name" placeholder="Enter Employee Name"
+                                                    value="<?= isset($ticket_data['emp_name']) ? $ticket_data['emp_name'] : '' ?>"
+                                                    name="emp_name" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="insured_name" class="label-font-size"> Insured Name <span class="text-danger">*</span></label>
-                                <input type=hidden id="insured_emp_id" name="insured_emp_id" value="<?= isset($ticket_data['insured_emp_id']) ? $ticket_data['insured_emp_id'] : '' ?>">
-                                <input class="form-control" id="insured_name" name="insured_name" value="<?= isset($ticket_data['insured_name']) ? $ticket_data['insured_name'] : '' ?>" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="insured_name" class="label-font-size"> Insured Name <span class="text-danger">*</span></label>
+                                                <input type=hidden id="insured_emp_id" name="insured_emp_id" value="<?= isset($ticket_data['insured_emp_id']) ? $ticket_data['insured_emp_id'] : '' ?>">
+                                                <input class="form-control" id="insured_name" name="insured_name" value="<?= isset($ticket_data['insured_name']) ? $ticket_data['insured_name'] : '' ?>" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="relationship" class="label-font-size"> Relationship <span class="text-danger">*</span></label>
-                                <select class="form-control" id="relationship" name="relationship" required>
-                                    <option value="">Select Relationship</option>
-                                    <?php
-                                    if (isset($relationshipType) && count($relationshipType)) {
-                                        foreach ($relationshipType as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['relationship'] == $key) ? 'selected' : '';
-                                            echo "<option value='$key' $selected>$value</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="relationship" class="label-font-size"> Relationship <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="relationship" name="relationship" required>
+                                                    <option value="">Select Relationship</option>
+                                                    <?php
+                                                    if (isset($relationshipType) && count($relationshipType)) {
+                                                        foreach ($relationshipType as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['relationship'] == $key) ? 'selected' : '';
+                                                            echo "<option value='$key' $selected>$value</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="policy_no" class="label-font-size">Policy No <span class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="policy_no"
-                                    value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>"
-                                    name="policy_no" placeholder="Policy Number">
-                            </div>
-                            <div class="form-group col-md-3">
-                                <label for="tpa_no" class="label-font-size">TPA ID <span class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="tpa_no" placeholder="Enter TPA ID"
-                                    value="<?= isset($ticket_data['tpa_no']) ? $ticket_data['tpa_no'] : '' ?>"
-                                    name="tpa_no">
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="policy_no" class="label-font-size">Policy No <span class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="policy_no"
+                                                    value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>"
+                                                    name="policy_no" placeholder="Policy Number">
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="tpa_no" class="label-font-size">TPA ID <span class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="tpa_no" placeholder="Enter TPA ID"
+                                                    value="<?= isset($ticket_data['tpa_no']) ? $ticket_data['tpa_no'] : '' ?>"
+                                                    name="tpa_no">
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_mobile" class="label-font-size">Employee Mobile No <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="emp_mobile" placeholder="Enter EMP Mobile"
-                                    value="<?= isset($ticket_data['emp_mobile']) ? $ticket_data['emp_mobile'] : '' ?>"
-                                    name="emp_mobile" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_mobile" class="label-font-size">Employee Mobile No <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="emp_mobile" placeholder="Enter EMP Mobile"
+                                                    value="<?= isset($ticket_data['emp_mobile']) ? $ticket_data['emp_mobile'] : '' ?>"
+                                                    name="emp_mobile" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_mail" class="label-font-size">Employee Mail ID <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="emp_mail" placeholder="Enter EMP Mail"
-                                    value="<?= isset($ticket_data['emp_mail']) ? $ticket_data['emp_mail'] : '' ?>"
-                                    name="emp_mail" required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_mail" class="label-font-size">Employee Mail ID <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="emp_mail" placeholder="Enter EMP Mail"
+                                                    value="<?= isset($ticket_data['emp_mail']) ? $ticket_data['emp_mail'] : '' ?>"
+                                                    name="emp_mail" required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="emp_personal_mail" class="label-font-size">Employee Personal Mail ID</label>
-                                <input type="text" class="form-control" id="emp_personal_mail" placeholder="Enter EMP Personal Mail"
-                                    value="<?= isset($ticket_data['emp_personal_mail']) ? $ticket_data['emp_personal_mail'] : '' ?>"
-                                    name="emp_personal_mail">
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="emp_personal_mail" class="label-font-size">Employee Personal Mail ID</label>
+                                                <input type="text" class="form-control" id="emp_personal_mail" placeholder="Enter EMP Personal Mail"
+                                                    value="<?= isset($ticket_data['emp_personal_mail']) ? $ticket_data['emp_personal_mail'] : '' ?>"
+                                                    name="emp_personal_mail">
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="client_name" class="label-font-size">Corporate Name <span class="text-danger">*</span></label>
-                                <input type="hidden" id="client_id" name="client_id" value="<?= isset($ticket_data['client_id']) ? $ticket_data['client_id'] : '' ?>">
-                                <input type="text" class="form-control" id="client_name" placeholder="Client" value="<?= isset($ticket_data['client_name']) ? $ticket_data['client_name'] : '' ?>" readonly required>
-                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label for="client_name" class="label-font-size">Corporate Name <span class="text-danger">*</span></label>
+                                                <input type="hidden" id="client_id" name="client_id" value="<?= isset($ticket_data['client_id']) ? $ticket_data['client_id'] : '' ?>">
+                                                <input type="text" class="form-control" id="client_name" placeholder="Client" value="<?= isset($ticket_data['client_name']) ? $ticket_data['client_name'] : '' ?>" readonly required>
+                                            </div>
 
-                            <div class="form-group col-md-3">
-                                <label for="insurer_id" class="label-font-size">Insurer <span class="text-danger">*</span></label>
-                                <input type=hidden id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>">
-                                <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly required>
-                            </div>
-                            <input type="hidden" id="empIDHidden" onchange="getClientPolicy()">
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <label class="label-font-size">Policy <span class="text-danger">*</span></label>
-                                    <select id="emp_client_policy" name="client_policy_id"
-                                        class="form-control custom-select" required onchange="setMinDateDOA(this.value); setInsurerAndTPAData(this)">
-                                        <?php if (!empty($ticket_data['client_policy_id'])) { ?>
-                                            <option value="<?= $ticket_data['client_policy_id'] ?>"><?= $ticket_data['client_policy_id_text'] ?></option>
-                                        <?php } else { ?>
-                                            <option value="">Policy</option>
-                                        <?php } ?>
-                                    </select>
+                                            <div class="form-group col-md-3">
+                                                <label for="insurer_id" class="label-font-size">Insurer <span class="text-danger">*</span></label>
+                                                <input type=hidden id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>">
+                                                <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly required>
+                                            </div>
+                                            <input type="hidden" id="empIDHidden" onchange="getClientPolicy()">
+                                            <div class="col-md-3">
+                                                <div class="form-group">
+                                                    <label class="label-font-size">Policy <span class="text-danger">*</span></label>
+                                                    <select id="emp_client_policy" name="client_policy_id"
+                                                        class="form-control custom-select" required onchange="setMinDateDOA(this.value); setInsurerAndTPAData(this)">
+                                                        <?php if (!empty($ticket_data['client_policy_id'])) { ?>
+                                                            <option value="<?= $ticket_data['client_policy_id'] ?>"><?= $ticket_data['client_policy_id_text'] ?></option>
+                                                        <?php } else { ?>
+                                                            <option value="">Policy</option>
+                                                        <?php } ?>
+                                                    </select>
+                                                </div>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="tpa_name">TPA <span class="text-danger"></span></label>
+                                                <input type=hidden id="tpa_id" name="tpa_id" value="<?= isset($ticket_data['tpa_id']) ? $ticket_data['tpa_id'] : '' ?>">
+                                                <input type=text class="form-control" id="tpa_name" placeholder="TPA" value="<?= isset($ticket_data['tpa_name']) ? $ticket_data['tpa_name'] : '' ?>" readonly>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="acm_id">Account Manager <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="acm_id" name="acm_id" required>
+                                                    <!-- <option value="0">Select Account Manager</option> -->
+                                                    <?php
+                                                    if (isset($acms) && count($acms)) {
+                                                        foreach ($acms as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['acm_id'] == $value['id']) ? 'selected' : '';
+                                                            echo "<option value=" . $value['id'] . "  $selected >" . $value['first_name'] . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                        </div>
+                                        <!-- end first_data_points -->
+                                        <!-- </div> -->
+                                    </div>
                                 </div>
                             </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="tpa_name">TPA <span class="text-danger"></span></label>
-                                <input type=hidden id="tpa_id" name="tpa_id" value="<?= isset($ticket_data['tpa_id']) ? $ticket_data['tpa_id'] : '' ?>">
-                                <input type=text class="form-control" id="tpa_name" placeholder="TPA" value="<?= isset($ticket_data['tpa_name']) ? $ticket_data['tpa_name'] : '' ?>" readonly>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="acm_id">Account Manager <span class="text-danger">*</span></label>
-                                <select class="form-control" id="acm_id" name="acm_id" required>
-                                    <!-- <option value="0">Select Account Manager</option> -->
-                                    <?php
-                                    if (isset($acms) && count($acms)) {
-                                        foreach ($acms as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['acm_id'] == $value['id']) ? 'selected' : '';
-                                            echo "<option value=" . $value['id'] . "  $selected >" . $value['first_name'] . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                        </div>
-                        <!-- end first_data_points -->
-
-                        <br><br>
-
-                        <div style="display: flex; align-items: center; gap: 10px;">
-                            <h5 style="margin: 0;">
-                                Claim Details 
-                                <i id="infoIcon" class="mdi mdi-information-outline info-icon" title="Click for more details" style="margin-left: 5px;"></i>
-                                <?= isset($ticket_data['claim_number']) && !empty($ticket_data['claim_number']) ? '( Claim No : ' . $ticket_data['claim_number'] . ' )' : '' ?>
-                            </h5>
                         </div>
 
-                        <hr>
+                        <div id="accordion2" class="mb-3">
+                            <div class="card mb-1">
+                                <h4 class="m-1">
+                                    Claim Details
+                                    <i id="infoIcon" class="mdi mdi-information-outline info-icon" title="Click for more details" style="margin-left: 5px;"></i>
+                                    <?= isset($ticket_data['claim_number']) && !empty($ticket_data['claim_number']) ? '( Claim No : ' . $ticket_data['claim_number'] . ' )' : '' ?>
 
-                        <!-- second_data_points -->
-                        <div class="form-row">
 
-                            <div class="form-group col-md-3">
-                                <label  class="label-font-size" for="claim_status">Status <span class="text-danger">*</span></label>
-                                <select class="form-control" id="claim_status_id" name="claim_status_id" required>
-                                    <!-- <option value="0">Select status</option> -->
-                                    <?php
-                                    if (isset($claim_status) && count($claim_status)) {
-                                        foreach ($claim_status as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['claim_status_id'] == $value['id']) ? 'selected' : '';
-                                            echo "<option value=" . $value['id'] . " $selected>" . $value['claim_status'] . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
+                                    <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo" aria-expanded="true">
+                                        <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                                    </a>
+                                </h4>
+                                <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion2">
+                                    <div class="card-body">
+                                        <!-- second_data_points -->
+                                        <div class="form-row">
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="claim_status">Status <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="claim_status_id" name="claim_status_id" required>
+                                                    <!-- <option value="0">Select status</option> -->
+                                                    <?php
+                                                    if (isset($claim_status) && count($claim_status)) {
+                                                        foreach ($claim_status as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['claim_status_id'] == $value['id']) ? 'selected' : '';
+                                                            echo "<option value=" . $value['id'] . " $selected>" . $value['claim_status'] . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="priority">Priority <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="priority" name="priority" required>
+                                                    <!-- <option value="0">Select Priority</option> -->
+                                                    <?php
+                                                    if (isset($priorityType) && count($priorityType)) {
+                                                        foreach ($priorityType as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['priority'] == $key) ? 'selected' : '';
+                                                            echo "<option value=" . $key . " $selected>" . $value . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="mode_of_intimation"> Mode of Submission <span
+                                                        class="text-danger">*</span></label>
+                                                <select class="form-control" id="mode_of_intimation" name="mode_of_intimation" required>
+                                                    <!-- <option value="0">Select Mode</option> -->
+                                                    <?php
+                                                    if (isset($modeOFIntimate) && count($modeOFIntimate)) {
+                                                        foreach ($modeOFIntimate as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['mode_of_intimation'] == $key) ? 'selected' : '';
+                                                            echo "<option value='" . $key . "'  $selected>" . $value . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="claim_type"> Claim Type <span class="text-danger">*</span></label>
+                                                <select class="form-control" id="claim_type" name="claim_type" required>
+                                                    <!-- <option value="0">Select claim Type</option> -->
+                                                    <?php
+                                                    if (isset($claim_type) && count($claim_type)) {
+                                                        foreach ($claim_type as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['claim_type'] == $key) ? 'selected' : '';
+                                                            echo "<option value='" . $key . "' $selected>" . $value . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="hospital_name">Hospital Name <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="hospital_name"
+                                                    placeholder="Enter Hospital Name"
+                                                    value="<?= isset($ticket_data['hospital_name']) ? $ticket_data['hospital_name'] : '' ?>"
+                                                    name="hospital_name" required>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="doa">DOA <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="doa" placeholder="Enter DOA"
+                                                    value="<?= isset($ticket_data['doa']) ? $ticket_data['doa'] : '' ?>"
+                                                    name="doa" required>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="dod">DOD <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="dod" placeholder="Enter DOD"
+                                                    value="<?= isset($ticket_data['dod']) ? $ticket_data['dod'] : '' ?>" name="dod" required>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" for="claim_amount">Claim Amount <span class="text-danger">*</span></label>
+                                                <input type="text" class="form-control" id="claim_amount"
+                                                    placeholder="Enter Claim Amount"
+                                                    value="<?= isset($ticket_data['claim_amount']) ? $ticket_data['claim_amount'] : '' ?>"
+                                                    name="claim_amount" required>
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                                <label class="label-font-size" id="pod_no_label_1" for="pod_no">POD No with Courier Name <span id="pod_no_label_1_span" class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="pod_no" placeholder="Enter POD NO"
+                                                    value="<?= isset($ticket_data['pod_no']) ? $ticket_data['pod_no'] : '' ?>"
+                                                    name="pod_no">
+                                            </div>
+
+                                        </div>
+                                        <!-- end second_data_points -->
+                                    </div>
+                                </div>
                             </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="priority">Priority <span class="text-danger">*</span></label>
-                                <select class="form-control" id="priority" name="priority" required>
-                                    <!-- <option value="0">Select Priority</option> -->
-                                    <?php
-                                    if (isset($priorityType) && count($priorityType)) {
-                                        foreach ($priorityType as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['priority'] == $key) ? 'selected' : '';
-                                            echo "<option value=" . $key . " $selected>" . $value . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="mode_of_intimation"> Mode of Submission <span
-                                        class="text-danger">*</span></label>
-                                <select class="form-control" id="mode_of_intimation" name="mode_of_intimation" required>
-                                    <!-- <option value="0">Select Mode</option> -->
-                                    <?php
-                                    if (isset($modeOFIntimate) && count($modeOFIntimate)) {
-                                        foreach ($modeOFIntimate as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['mode_of_intimation'] == $key) ? 'selected' : '';
-                                            echo "<option value='" . $key . "'  $selected>" . $value . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="claim_type"> Claim Type <span class="text-danger">*</span></label>
-                                <select class="form-control" id="claim_type" name="claim_type" required>
-                                    <!-- <option value="0">Select claim Type</option> -->
-                                    <?php
-                                    if (isset($claim_type) && count($claim_type)) {
-                                        foreach ($claim_type as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['claim_type'] == $key) ? 'selected' : '';
-                                            echo "<option value='" . $key . "' $selected>" . $value . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="hospital_name">Hospital Name <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="hospital_name"
-                                    placeholder="Enter Hospital Name"
-                                    value="<?= isset($ticket_data['hospital_name']) ? $ticket_data['hospital_name'] : '' ?>"
-                                    name="hospital_name" required>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="doa">DOA <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="doa" placeholder="Enter DOA"
-                                    value="<?= isset($ticket_data['doa']) ? $ticket_data['doa'] : '' ?>"
-                                    name="doa" required>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="dod">DOD <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="dod" placeholder="Enter DOD"
-                                    value="<?= isset($ticket_data['dod']) ? $ticket_data['dod'] : '' ?>" name="dod" required>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" for="claim_amount">Claim Amount <span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="claim_amount"
-                                    placeholder="Enter Claim Amount"
-                                    value="<?= isset($ticket_data['claim_amount']) ? $ticket_data['claim_amount'] : '' ?>"
-                                    name="claim_amount" required>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label class="label-font-size" id="pod_no_label_1" for="pod_no">POD No with Courier Name <span id="pod_no_label_1_span" class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="pod_no" placeholder="Enter POD NO"
-                                    value="<?= isset($ticket_data['pod_no']) ? $ticket_data['pod_no'] : '' ?>"
-                                    name="pod_no">
-                            </div>
-
                         </div>
-                        <!-- end second_data_points -->
 
-                        <br><br>
-                        <h5>Additional Details</h5>
-                        <hr>
 
-                        <!-- third_data_points -->
-                        <div class="form-row">
+                        <div id="accordion3" class="mb-3">
+                            <div class="card mb-1">
+                                <h4 class="m-1">
+                                    Additional Documents
+                                    <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseThree" aria-expanded="true">
+                                        <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                                    </a>
+                                </h4>
+                                <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion3">
+                                    <div class="card-body">
+                                        <!-- third_data_points -->
+                                        <div class="form-row">
 
-                            <div class="form-group col-md-3 up_cnu" style="display: none;">
-                                <label class="label-font-size" for="claim_number">Claim Number <span class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="claim_number" placeholder="Enter Claim NO"
-                                    value="<?= isset($ticket_data['claim_number']) ? $ticket_data['claim_number'] : '' ?>"
-                                    name="claim_number">
+                                            <div class="form-group col-md-3 up_cnu" style="display: none;">
+                                                <label class="label-font-size" for="claim_number">Claim Number <span class="text-danger"></span></label>
+                                                <input type="text" class="form-control" id="claim_number" placeholder="Enter Claim NO"
+                                                    value="<?= isset($ticket_data['claim_number']) ? $ticket_data['claim_number'] : '' ?>"
+                                                    name="claim_number">
+                                            </div>
+
+                                            <div class="form-group col-md-3 up_cnu" style="display: none;">
+                                                <label class="label-font-size" for="registration_date">Registration Date</label>
+                                                <input type="text" class="form-control datepicker" id="registration_date" placeholder="Select Registration Date"
+                                                    value="<?= isset($ticket_data['registration_date']) ? $ticket_data['registration_date'] : '' ?>" name="registration_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 cda_ir" style="display: none;">
+                                                <label class="label-font-size" for="raised_date">Raised Date</label>
+                                                <input type="text" class="form-control datepicker" id="raised_date" placeholder="Select Raised Date"
+                                                    value="<?= isset($ticket_data['raised_date']) ? $ticket_data['raised_date'] : '' ?>" name="raised_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 up_qdr" style="display: none;">
+                                                <label class="label-font-size" for="query_received_date">Query Received Date</label>
+                                                <input type="text" class="form-control datepicker" id="query_received_date" placeholder="Select Query Received Date"
+                                                    value="<?= isset($ticket_data['query_received_date']) ? $ticket_data['query_received_date'] : '' ?>" name="query_received_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 rejected" style="display: none;">
+                                                <label class="label-font-size" for="denial_reason">Denial Reason</label>
+                                                <input type="text" class="form-control" id="denial_reason" placeholder="Enter Denial Reason"
+                                                    value="<?= isset($ticket_data['denial_reason']) ? $ticket_data['denial_reason'] : '' ?>" name="denial_reason">
+                                            </div>
+
+                                            <div class="form-group col-md-3 rejected" style="display: none;">
+                                                <label class="label-font-size" for="denial_date">Denial Date</label>
+                                                <input type="text" class="form-control datepicker" id="denial_date" placeholder="Select Denial Date"
+                                                    value="<?= isset($ticket_data['denial_date']) ? $ticket_data['denial_date'] : '' ?>" name="denial_date">
+                                            </div>
+
+                                            <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">
+                                            </div>
+
+                                            <div class="form-group col-md-3 approved" style="display: none;">
+                                                <label class="label-font-size" for="approved_date">Approved Date</label>
+                                                <input type="text" class="form-control datepicker" id="approved_date" placeholder="Select Approved Date"
+                                                    value="<?= isset($ticket_data['approved_date']) ? $ticket_data['approved_date'] : '' ?>" name="approved_date">
+                                            </div>
+
+                                            <div class="form-group col-md-6 approved" style="display: none;">
+                                                <label class="label-font-size" for="approved_letter">Approved Letter</label>
+                                                <input type="text" class="form-control" id="approved_letter" placeholder="Enter Approved Letter"
+                                                    value="<?= isset($ticket_data['approved_letter']) ? $ticket_data['approved_letter'] : '' ?>" name="approved_letter">
+                                            </div>
+
+                                            <div class="form-group col-md-6 approved" style="display: none;">
+                                                <label class="label-font-size" for="approved_description">Approved Description</label>
+                                                <input type="text" class="form-control" id="approved_description" placeholder="Enter Approved Description"
+                                                    value="<?= isset($ticket_data['approved_description']) ? $ticket_data['approved_description'] : '' ?>" name="approved_description">
+                                            </div>
+
+                                            <div class="form-group col-md-3 settled" style="display: none;">
+                                                <label class="label-font-size" for="utr_details">UTR Details</label>
+                                                <input type="text" class="form-control" id="utr_details" placeholder="Enter UTR Details"
+                                                    value="<?= isset($ticket_data['utr_details']) ? $ticket_data['utr_details'] : '' ?>" name="utr_details">
+                                            </div>
+
+                                            <div class="form-group col-md-3 settled" style="display: none;">
+                                                <label class="label-font-size" for="settled_date">Settled Date</label>
+                                                <input type="text" class="form-control datepicker" id="settled_date" placeholder="Select Settled Date"
+                                                    value="<?= isset($ticket_data['settled_date']) ? $ticket_data['settled_date'] : '' ?>" name="settled_date">
+                                            </div>
+
+                                            <div class="form-group col-md-6 settled" style="display: none;">
+                                                <label class="label-font-size" for="settle_letter">Settle Letter</label>
+                                                <input type="text" class="form-control" id="settle_letter" placeholder="Enter Settle Letter"
+                                                    value="<?= isset($ticket_data['settle_letter']) ? $ticket_data['settle_letter'] : '' ?>" name="settle_letter">
+                                            </div>
+
+                                            <div class="form-group col-md-3 payment" style="display: none;">
+                                                <label class="label-font-size" for="pay_initiate_date">Payment Initiate Date</label>
+                                                <input type="text" class="form-control datepicker" id="pay_initiate_date" placeholder="Select Payment Initiate Date"
+                                                    value="<?= isset($ticket_data['pay_initiate_date']) ? $ticket_data['pay_initiate_date'] : '' ?>" name="pay_initiate_date">
+                                            </div>
+
+                                            <div class="form-group col-md-3 canceled" style="display: none;">
+                                                <label class="label-font-size" for="cancel_remark">Cancel Remark</label>
+                                                <textarea class="form-control" id="cancel_remark" rows="1" placeholder="Enter Cancel Remark" name="cancel_remark"><?= isset($ticket_data['cancel_remark']) ? $ticket_data['cancel_remark'] : '' ?></textarea>
+                                            </div>
+
+                                            <div class="form-group col-md-3 returned" style="display: none;">
+                                                <label class="label-font-size" for="return_remark">Return Remark</label>
+                                                <textarea class="form-control" id="return_remark" rows="1" placeholder="Enter Return Remark" name="return_remark"><?= isset($ticket_data['return_remark']) ? $ticket_data['return_remark'] : '' ?></textarea>
+                                            </div>
+
+                                            <div class="form-group col-md-6 returned" style="display: none;">
+                                                <label class="label-font-size" for="awb_no_courier_name">Return AWB No with Courier Name</label>
+                                                <input type="text" class="form-control" id="awb_no_courier_name" placeholder="eg : 0001/ST Courier"
+                                                    value="<?= isset($ticket_data['awb_no_courier_name']) ? $ticket_data['awb_no_courier_name'] : '' ?>" name="awb_no_courier_name">
+                                            </div>
+
+                                            <div class="form-group col-md-3 non_id" style="display: none;">
+                                                <label class="label-font-size" for="non_id_reason">Non ID Reason <span id="non_id_reason_lable_id" class="text-danger"></span></label>
+                                                <select class="form-control" id="non_id_reason" name="non_id_reason">
+                                                    <option value="">Select Reason</option>
+                                                    <?php
+                                                    if (isset($nonIDReason) && count($nonIDReason)) {
+                                                        foreach ($nonIDReason as $key => $value) {
+                                                            $selected = (isset($ticket_data) && $ticket_data['non_id_reason'] == $key) ? 'selected' : '';
+                                                            echo "<option value='" . $key . "'  $selected>" . $value . "</option>";
+                                                        }
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+
+                                        </div>
+                                        <!-- end third_data_points -->
+                                    </div>
+                                </div>
                             </div>
-
-                            <div class="form-group col-md-3 up_cnu" style="display: none;">
-                                <label class="label-font-size" for="registration_date">Registration Date</label>
-                                <input type="text" class="form-control datepicker" id="registration_date" placeholder="Select Registration Date"
-                                    value="<?= isset($ticket_data['registration_date']) ? $ticket_data['registration_date'] : '' ?>" name="registration_date">
-                            </div>
-
-                            <div class="form-group col-md-3 cda_ir" style="display: none;">
-                                <label class="label-font-size" for="raised_date">Raised Date</label>
-                                <input type="text" class="form-control datepicker" id="raised_date" placeholder="Select Raised Date"
-                                    value="<?= isset($ticket_data['raised_date']) ? $ticket_data['raised_date'] : '' ?>" name="raised_date">
-                            </div>
-
-                            <div class="form-group col-md-3 up_qdr" style="display: none;">
-                                <label class="label-font-size" for="query_received_date">Query Received Date</label>
-                                <input type="text" class="form-control datepicker" id="query_received_date" placeholder="Select Query Received Date"
-                                    value="<?= isset($ticket_data['query_received_date']) ? $ticket_data['query_received_date'] : '' ?>" name="query_received_date">
-                            </div>
-
-                            <div class="form-group col-md-3 rejected" style="display: none;">
-                                <label class="label-font-size" for="denial_reason">Denial Reason</label>
-                                <input type="text" class="form-control" id="denial_reason" placeholder="Enter Denial Reason"
-                                    value="<?= isset($ticket_data['denial_reason']) ? $ticket_data['denial_reason'] : '' ?>" name="denial_reason">
-                            </div>
-
-                            <div class="form-group col-md-3 rejected" style="display: none;">
-                                <label class="label-font-size" for="denial_date">Denial Date</label>
-                                <input type="text" class="form-control datepicker" id="denial_date" placeholder="Select Denial Date"
-                                    value="<?= isset($ticket_data['denial_date']) ? $ticket_data['denial_date'] : '' ?>" name="denial_date">
-                            </div>
-
-                            <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">
-                            </div>
-
-                            <div class="form-group col-md-3 approved" style="display: none;">
-                                <label class="label-font-size" for="approved_date">Approved Date</label>
-                                <input type="text" class="form-control datepicker" id="approved_date" placeholder="Select Approved Date"
-                                    value="<?= isset($ticket_data['approved_date']) ? $ticket_data['approved_date'] : '' ?>" name="approved_date">
-                            </div>
-
-                            <div class="form-group col-md-6 approved" style="display: none;">
-                                <label class="label-font-size" for="approved_letter">Approved Letter</label>
-                                <input type="text" class="form-control" id="approved_letter" placeholder="Enter Approved Letter"
-                                    value="<?= isset($ticket_data['approved_letter']) ? $ticket_data['approved_letter'] : '' ?>" name="approved_letter">
-                            </div>
-
-                            <div class="form-group col-md-6 approved" style="display: none;">
-                                <label class="label-font-size" for="approved_description">Approved Description</label>
-                                <input type="text" class="form-control" id="approved_description" placeholder="Enter Approved Description"
-                                    value="<?= isset($ticket_data['approved_description']) ? $ticket_data['approved_description'] : '' ?>" name="approved_description">
-                            </div>
-
-                            <div class="form-group col-md-3 settled" style="display: none;">
-                                <label class="label-font-size" for="utr_details">UTR Details</label>
-                                <input type="text" class="form-control" id="utr_details" placeholder="Enter UTR Details"
-                                    value="<?= isset($ticket_data['utr_details']) ? $ticket_data['utr_details'] : '' ?>" name="utr_details">
-                            </div>
-
-                            <div class="form-group col-md-3 settled" style="display: none;">
-                                <label class="label-font-size" for="settled_date">Settled Date</label>
-                                <input type="text" class="form-control datepicker" id="settled_date" placeholder="Select Settled Date"
-                                    value="<?= isset($ticket_data['settled_date']) ? $ticket_data['settled_date'] : '' ?>" name="settled_date">
-                            </div>
-
-                            <div class="form-group col-md-6 settled" style="display: none;">
-                                <label class="label-font-size" for="settle_letter">Settle Letter</label>
-                                <input type="text" class="form-control" id="settle_letter" placeholder="Enter Settle Letter"
-                                    value="<?= isset($ticket_data['settle_letter']) ? $ticket_data['settle_letter'] : '' ?>" name="settle_letter">
-                            </div>
-
-                            <div class="form-group col-md-3 payment" style="display: none;">
-                                <label class="label-font-size" for="pay_initiate_date">Payment Initiate Date</label>
-                                <input type="text" class="form-control datepicker" id="pay_initiate_date" placeholder="Select Payment Initiate Date"
-                                    value="<?= isset($ticket_data['pay_initiate_date']) ? $ticket_data['pay_initiate_date'] : '' ?>" name="pay_initiate_date">
-                            </div>
-
-                            <div class="form-group col-md-3 canceled" style="display: none;">
-                                <label class="label-font-size" for="cancel_remark">Cancel Remark</label>
-                                <textarea class="form-control" id="cancel_remark" rows="1" placeholder="Enter Cancel Remark" name="cancel_remark"><?= isset($ticket_data['cancel_remark']) ? $ticket_data['cancel_remark'] : '' ?></textarea>
-                            </div>
-
-                            <div class="form-group col-md-3 returned" style="display: none;">
-                                <label class="label-font-size" for="return_remark">Return Remark</label>
-                                <textarea class="form-control" id="return_remark" rows="1" placeholder="Enter Return Remark" name="return_remark"><?= isset($ticket_data['return_remark']) ? $ticket_data['return_remark'] : '' ?></textarea>
-                            </div>
-
-                            <div class="form-group col-md-6 returned" style="display: none;">
-                                <label class="label-font-size" for="awb_no_courier_name">Return AWB No with Courier Name</label>
-                                <input type="text" class="form-control" id="awb_no_courier_name" placeholder="eg : 0001/ST Courier"
-                                    value="<?= isset($ticket_data['awb_no_courier_name']) ? $ticket_data['awb_no_courier_name'] : '' ?>" name="awb_no_courier_name">
-                            </div>
-
-                            <div class="form-group col-md-3 non_id" style="display: none;">
-                                <label class="label-font-size" for="non_id_reason">Non ID Reason <span id="non_id_reason_lable_id" class="text-danger"></span></label>
-                                <select class="form-control" id="non_id_reason" name="non_id_reason">
-                                    <option value="">Select Reason</option>
-                                    <?php
-                                    if (isset($nonIDReason) && count($nonIDReason)) {
-                                        foreach ($nonIDReason as $key => $value) {
-                                            $selected = (isset($ticket_data) && $ticket_data['non_id_reason'] == $key) ? 'selected' : '';
-                                            echo "<option value='" . $key . "'  $selected>" . $value . "</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
                         </div>
-                        <!-- end third_data_points -->
 
-                    </div>
-                    <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
-                        <?php if (get_role_id() == 5 && isset($ticket_data) && $ticket_data['claim_status_id'] == 8) { ?>
-                            <a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Approve Claim Rejection</a>
-                        <?php } ?>
-                        <!-- <button type="button" class="btn btn-primary waves-effect waves-light mr-1" id="btnApprove" >Approve</button> -->
-                    </div>
+                        <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
+                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
+                            <?php if (get_role_id() == 5 && isset($ticket_data) && $ticket_data['claim_status_id'] == 8) { ?>
+                                <a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Approve Claim Rejection</a>
+                            <?php } ?>
+                            <!-- <button type="button" class="btn btn-primary waves-effect waves-light mr-1" id="btnApprove" >Approve</button> -->
+                        </div>
 
+                </div>
+                </form>
             </div>
-            </form>
         </div>
     </div>
 </div>
 
+
 <!-- Info Modal -->
 <div class="modal fade" id="moreInfoModal" tabindex="-1" role="dialog" aria-labelledby="fullWidthModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl" role="document">
@@ -635,17 +663,17 @@
         console.log('Selected Value:', selectedVal);
         console.log('Element ID:', elementId);
 
-        if(selectedVal == 2 || selectedVal == 14){
+        if (selectedVal == 2 || selectedVal == 14) {
             $field = $('#non_id_reason')
             $field.prop('required', false);
-        }else if(selectedVal == 1){
+        } else if (selectedVal == 1) {
 
-            if($('#tpa_no').val() != ""){
+            if ($('#tpa_no').val() != "") {
                 $field = $('#non_id_reason')
                 $field.prop('required', false);
                 var $parentDiv = $field.closest("div");
                 $parentDiv.find("label[for='non_id_reason'] .text-danger").remove();
-            }else{
+            } else {
                 $field = $('#non_id_reason')
                 $field.prop('required', true);
             }
@@ -805,7 +833,7 @@
         $field.prop('required', false);
         var $parentDiv = $field.closest("div");
         $parentDiv.find("label[for='approved_description'] .text-danger").remove();
-        
+
     });
 
     // function addRequiredFieldSymbol(field_name) {
@@ -1059,11 +1087,11 @@
             if (ticket_type == 1 && item.policy_type_id != 1) {
                 $('#emp_client_policy').append($('<option>', {
                     value: item.client_policy_value,
-                    text: item.client_policy_name, 
-                    'data-insurerid' : item.insurer_id ?? "",
-                    'data-tpaid' : item.tpa_id ?? "",
-                    'data-insurername' : item.insurer_name ?? "",
-                    'data-tpaname' : item.tpa_name ?? "",
+                    text: item.client_policy_name,
+                    'data-insurerid': item.insurer_id ?? "",
+                    'data-tpaid': item.tpa_id ?? "",
+                    'data-insurername': item.insurer_name ?? "",
+                    'data-tpaname': item.tpa_name ?? "",
                 }));
                 $("#policy_no").val("");
                 if (policyCount == 1) {
@@ -1173,7 +1201,6 @@
         $('#tpa_id').val(tap_id);
         $('#tpa_name').val(tap_name);
     }
-
 </script>
 <script>
     $("#infoIcon").click(function() {
diff --git a/app/Views/ticket_history.php b/app/Views/ticket_history.php
index 31ec5ced..505fe971 100644
--- a/app/Views/ticket_history.php
+++ b/app/Views/ticket_history.php
@@ -60,9 +60,13 @@ if (ticketsTable.length) {
 
         // ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
         paging: true, // Enable pagination
         pageLength: 10, // Set default number of rows per page (optional)
         ordering: false,
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index a915f604..e1b306e9 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -54,17 +54,17 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="scroll-horizontal-datatable">  
                     <thead class="bg-light">
                         <tr>
-                            <th>Status</th>
-                            <th>Policy Type</th>
-                            <th>Claim number</th>
-                            <th>TPA ID</th>
-                            <th>Emp ID</th>
-                            <th>Emp name</th>
-                            <th>Insured Name</th>
-                            <th>Corporate name</th>
+                            <th>Status&nbsp;</th>
+                            <th>Policy Type&nbsp;</th>
+                            <th>Claim number&nbsp;</th>
+                            <th>TPA ID&nbsp;</th>
+                            <th>Emp ID&nbsp;</th>
+                            <th>Emp name&nbsp;</th>
+                            <th>Insured Name&nbsp;</th>
+                            <th>Corporate name&nbsp;</th>
                             
                             <th style="display: none;">ACM</th>
                             <th style="display: none;">Insurer</th>
@@ -161,13 +161,13 @@ table.dataTable tbody td {
                                         </span>
                                     </td>
 
-                                    <td><?php echo str_replace("Claim-", "", $ticket_type[$row['ticket_type_id']] ?? ""); ?></td>
-                                    <td><?php echo $row['claim_no']; ?></td>
-                                    <td><?php echo $row['tpa_no']; ?></td>
-                                    <td><?php echo $row['emp_code']; ?></td>
-                                    <td><?php echo $row['emp_name']; ?></td>
-                                    <td><?php echo $row['insured_name']; ?></td>
-                                    <td><?php echo $row['short_name']; ?></td>
+                                    <td><?php echo str_replace("Claim-", "", $ticket_type[$row['ticket_type_id']] ?? 'N/A'); ?></td>
+                                    <td><?php echo $row['claim_no'] ?: 'N/A' ; ?></td>
+                                    <td><?php echo $row['tpa_no'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $row['emp_code'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $row['emp_name'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $row['insured_name'] ?: 'N/A'; ?></td>
+                                    <td><?php echo $row['short_name'] ?: 'N/A'; ?></td>
                                     
                                     <td style="display: none;"><?php echo $row['acm_name']; ?></td>
                                     <td style="display: none;"><?php echo $row['insurer_name']; ?></td>
@@ -271,33 +271,68 @@ $(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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Claim-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'claim-List',
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                },
-                {
-                    text: 'New Claim',
-                    className: 'buttons-html5 addbtnStyle',
-                    action: function(e, dt, node, config) { 
-                        openTicketTypeAskModal()
-                    }
-                }
-            ],
+            // buttons: [{
+            //         extend: 'csv',
+            //         text: 'CSV',
+            //         title: 'Claim-List',
+            //     },
+            //     {
+            //         extend: 'excel',
+            //         text: 'Excel',
+            //         title: 'claim-List',
+            //         exportOptions: {
+            //             orthogonal: 'sort'
+            //         },
+            //     },
+            //     {
+            //         text: 'New Claim',
+            //         className: 'buttons-html5 addbtnStyle',
+            //         action: function(e, dt, node, config) { 
+            //             openTicketTypeAskModal()
+            //         }
+            //     }
+            // ],
+            buttons: [
+              {
+                  text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                  className: 'btn app-btn-primary  mr-2',
+                  action: function(e, dt, node, config) { 
+                      openTicketTypeAskModal()
+                  }
+              },
+              {
+                  extend: 'collection',
+                  text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                  className: 'btn app-btn-secondary ',
+                  buttons: [
+                            {
+                                extend: 'csv',
+                                text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                className: 'app-btn-primary ',
+                                title: 'Claim-List',
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                title: 'claim-List',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                className: 'app-btn-primary ',
+                            }
+                  ]
+              }
+          ],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
             paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
+            pageLength: 10, // Set default number of rows per page (optional)
             ordering: false,
         });
     } else {
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index b5da3f7f..d816f2a3 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -8,10 +8,7 @@
         padding: 4px 4px !important;
     }
 
-    .col-12 {
-
-        max-width: 98% !important;
-    }
+    
 
     .dataTables_filter {
         position: absolute;
@@ -55,8 +52,8 @@
     /* strongest, beats most parent rules and pasted styles on wrappers */
     .jodit-container .jodit-wysiwyg,
     .jodit-container .jodit-wysiwyg * {
-    color: #000 !important;
-    background-color: #fff !important; /* optional: ensure white background */
+        color: #000 !important;
+        background-color: #fff !important; /* optional: ensure white background */
     }
 
 </style>
@@ -193,17 +190,17 @@
                                 <input type="text" readonly id="claim_status_for_template" class="form-control" />
                             </div>
 
-
-                        </div>
-
-                        <div class="form-row">
-                            <div class="form-group col-md-12">
-                                <label for="template_subject">Subject</label>
-                                <input type="text" id="template_subject" name="subject" class="form-control"
-                                    placeholder="Subject" required>
+                            <div class="form-group col-md-6">
+                                    <label for="template_subject">Subject</label>
+                                    <input type="text" id="template_subject" name="subject" class="form-control"
+                                        placeholder="Subject" required>
                             </div>
+
+
                         </div>
 
+
+
                         <hr>
 
                         <div class="form-row">
@@ -264,15 +261,19 @@
                     text: 'Add Template',
                     className: 'buttons-html5 addbtnStyle',
                     action: function(e, dt, node, config) {
-                        openModal()
+                        openModal('new_mail_template')
                     }
                 }],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 paging: true, // Enable pagination
-                pageLength: 25, // Set default number of rows per page (optional)
+                pageLength: 10, // Set default number of rows per page (optional)
                 ordering: false,
             });
         } else {
@@ -507,7 +508,7 @@
                 if (res) {
                     if (res.status == true) {
                         // Open the modal
-                        openModal();
+                        openModal('new_mail_template');
 
                         // Populate the form fields
                         $('#template_subject').val(res.data.subject);
diff --git a/app/Views/ticket_reports.php b/app/Views/ticket_reports.php
index 57c73a2e..08785950 100644
--- a/app/Views/ticket_reports.php
+++ b/app/Views/ticket_reports.php
@@ -1,68 +1,74 @@
-<div class="row">
-    <div class="col-xl-12">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <!-- <div class="text-center"> -->
-                        <div class="form-row">
-                            <div class="form-group col-md-4" id="date_div">
-                                <label>Date<span class="text-danger"></span></label>
-                                <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                    <span></span> <i class="mdi mdi-menu-down"></i>
+<div class="container-fluid-min">
+    <div class="row">
+        <!-- <h3 class="ml-3">Claim Reports</h3> -->
+        <div class="col-xl-12">
+            <div class="card-body">
+                <div id="accordion" class="mb-3">
+                    <div class="card mb-1">
+                        <h4 class="m-1">
+                            <span>Filter</span>
+                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                aria-expanded="true">
+                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                        </h4>
+                        <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                            <div class="card-body">
+                                <!-- <div class="text-center"> -->
+                                <div class="form-row">
+                                    <div class="form-group col-md-4" id="date_div">
+                                        <label>Date<span class="text-danger"></span></label>
+                                        <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+                                            <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                            <span></span> <i class="mdi mdi-menu-down"></i>
+                                        </div>
+                                        <input type="hidden" id="startDate" value=<?= $default_start ?>>
+                                        <input type="hidden" id="endDate" value=<?= $default_end ?>>
+                                    </div>
+
+
+                                    <div class="form-group col-md-4">
+                                        <label>Policy Type<span class="text-danger"> *</span></label> <br />
+                                        <select name="policy_type" class="form-control" id="policy_type" required>
+                                            <option value="">Select</option>
+                                            <?php foreach ($policy_type as $policy => $key) : ?>
+                                                <option value="<?= $policy ?>"><?= $key ?></option>
+                                            <?php endforeach ?>
+                                        </select>
+                                    </div>
+
+
+                                    <div class="form-group col-md-4">
+                                        <label>Report Type<span class="text-danger"> *</span></label> <br />
+                                        <select class="form-control" id="report_type" required>
+                                            <option value="0">Select</option>
+                                            <?php foreach ($report_type as $reports => $key) : ?>
+                                                <option value="<?= $reports ?>"><?= $key ?></option>
+                                            <?php endforeach ?>
+                                        </select>
+                                    </div>
+
+
                                 </div>
-                                <input type="hidden" id="startDate" value=<?= $default_start ?>>
-                                <input type="hidden" id="endDate" value=<?= $default_end ?>>
-                            </div>
+                                <div class="row justify-content-end">
 
-
-                            <div class="form-group col-md-4">
-                                <label>Policy Type<span class="text-danger"> *</span></label> <br />
-                                <select name="policy_type" class="form-control" id="policy_type" required>
-                                    <option value="">Select</option>
-                                    <?php foreach ($policy_type as $policy => $key) : ?>
-                                        <option value="<?= $policy ?>"><?= $key ?></option>
-                                    <?php endforeach ?>
-                                </select>
-                            </div>
-
-
-                            <div class="form-group col-md-4">
-                                <label>Report Type<span class="text-danger"> *</span></label> <br />
-                                <select class="form-control" id="report_type" required>
-                                    <option value="0">Select</option>
-                                    <?php foreach ($report_type as $reports => $key) : ?>
-                                        <option value="<?= $reports ?>"><?= $key ?></option>
-                                    <?php endforeach ?>
-                                </select>
-                            </div>
-
-
-                        </div>
-                        <div class="row justify-content-end">
-
-                            <div class="col-auto">
-                                <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page" onclick="fetchReportPage(event);">Submit</a>
+                                    <div class="col-auto">
+                                        <a href="#" class="btn btn-primary waves-effect waves-light submit-btn" id="get-report-page" onclick="fetchReportPage(event);">Submit</a>
+                                    </div>
+                                </div>
+                                <!-- </div> -->
                             </div>
                         </div>
-                        <!-- </div> -->
                     </div>
                 </div>
             </div>
+
         </div>
     </div>
+    <div class="row" id="report"></div>
 </div>
-<div class="card mb-1">
 
-    <div id="report"></div>
-</div>
+
 
 <script>
     $(function() {
@@ -97,44 +103,43 @@
     });
 </script>
 <script>
+    function fetchReportPage() {
 
-function fetchReportPage() {
+        var fromDate = $('#startDate').val();
+        var toDate = $('#endDate').val();
+        var policy_type = $('#policy_type').val();
+        var report_type = $('#report_type').val();
+        var requestData = {
+            fromDate: fromDate,
+            toDate: toDate,
+            policy_type: policy_type,
+            report_type: report_type
+        };
+        // console.log(requestData);
+        var url = '<?= base_url('/ticket/ticket_reports') ?>';
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+            if (response.status == true) {
+                $('#report').html(response.html);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+            } else {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
+            }
+
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            toastr.error('An error occurred while fetching the report page.', 'ERROR');
 
-    var fromDate = $('#startDate').val();
-    var toDate = $('#endDate').val();
-    var policy_type = $('#policy_type').val();
-    var report_type = $('#report_type').val();
-    var requestData = {
-        fromDate: fromDate,
-        toDate: toDate,
-        policy_type: policy_type,
-        report_type: report_type
-    };
-    // console.log(requestData);
-    var url = '<?= base_url('/ticket/ticket_reports') ?>';
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
-        if (response.status == true) {
-            $('#report').html(response.html);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-
-        }else{
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-            let message = response.message;
-            toastr.error(message,'ERROR');
-        }
-
-
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the report page.', 'ERROR');
-
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-    });
-}
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/ticket_search.php b/app/Views/ticket_search.php
index 8a79e1e9..f59a18d7 100644
--- a/app/Views/ticket_search.php
+++ b/app/Views/ticket_search.php
@@ -1,259 +1,258 @@
 <style>
-.col-12 {
+    .col-12 {
 
-    max-width: 98% !important;
-}
+        max-width: 98% !important;
+    }
 </style>
 
-<div class="row">
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <br>
-                <div class="row ml-4">
-                    <div class="col-md-6">
-                    <h4 style="text-align: left;">Claim Filter</h4>
-                    </div>
-                    <div class="col-md-6">
-                <a style="text-align: right;" id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a></div>
-                </div>
-                </h5>
-                <div id="collapseOne" class="collapse hide" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <div class="form-row">
+<div class="container-fluid-min">
+    <div class="row">
+        <div class="col-12" style="margin-top: -12px;">
+            <div class="card-body">
+                <div id="accordion" class="mb-3">
+                    <div class="card mb-1">
+                        <h4>
+                            Filter
+                            <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                                aria-expanded="true">
+                                <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                            </a>
+                        </h4>
+                        <div id="collapseOne" class="collapse hide" aria-labelledby="headingOne" data-parent="#accordion">
+                            <div class="card-body">
+                                <div class="form-group">
+                                    <div class="form-row">
 
 
-                                <div class="form-group col-md-3">
-                                    <label for="ticket_type"> Claim Type <span class="text-danger"></span></label>
-                                    <select class="form-control" id="ticket_type" name="ticket_type">
-                                        <option value="0">Select claim Type</option>
-                                        <?php
-                                            if (isset($ticket_type) && count($ticket_type)) {
-                                                foreach ($ticket_type as $key => $value) {
-                                                    echo "<option value='" . $key . "'>" . $value . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="ticket_type"> Claim Type <span class="text-danger"></span></label>
+                                            <select class="form-control" id="ticket_type" name="ticket_type">
+                                                <option value="0">Select claim Type</option>
+                                                <?php
+                                                if (isset($ticket_type) && count($ticket_type)) {
+                                                    foreach ($ticket_type as $key => $value) {
+                                                        echo "<option value='" . $key . "'>" . $value . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <!-- <div class="form-group col-md-3">
+                                        <!-- <div class="form-group col-md-3">
                                     <label for="pod_no">POD No<span class="text-danger"></span></label>
                                     <input type="text" class="form-control" id="pod_no" name="pod_no">
                                 </div> -->
 
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_id">Insurer<span class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id">
-                                        <option value="0">Select Insurer</option>
-                                        <?php
-                                            if (isset($insurer_list) && count($insurer_list)) {
-                                                foreach ($insurer_list as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['name'] . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="insurer_id">Insurer<span class="text-danger"></span></label>
+                                            <select class="form-control" id="insurer_id" name="insurer_id">
+                                                <option value="0">Select Insurer</option>
+                                                <?php
+                                                if (isset($insurer_list) && count($insurer_list)) {
+                                                    foreach ($insurer_list as $key => $value) {
+                                                        echo "<option value='" . $value['id'] . "'>" . $value['name'] . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="tpa_id">TPA<span class="text-danger"></span></label>
-                                    <select class="form-control" id="tpa_id" name="tpa_id">
-                                        <option value="0">Select TPA</option>
-                                        <?php
-                                            if (isset($tpa_list) && count($tpa_list)) {
-                                                foreach ($tpa_list as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['name'] . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="tpa_id">TPA<span class="text-danger"></span></label>
+                                            <select class="form-control" id="tpa_id" name="tpa_id">
+                                                <option value="0">Select TPA</option>
+                                                <?php
+                                                if (isset($tpa_list) && count($tpa_list)) {
+                                                    foreach ($tpa_list as $key => $value) {
+                                                        echo "<option value='" . $value['id'] . "'>" . $value['name'] . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="claim_no">Claim No<span class="text-danger"></span></label>
-                                    <input type="text" class="form-control" id="claim_no" name="claim_no">
-                                </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="claim_no">Claim No<span class="text-danger"></span></label>
+                                            <input type="text" class="form-control" id="claim_no" name="claim_no">
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_id"> Corporate Name <span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_id" name="client_id">
-                                        <option value="0">Select Corporate</option>
-                                        <?php
-                                            if (isset($client_list) && count($client_list)) {
-                                                foreach ($client_list as $key => $value) {
-                                                    echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
+                                        <div class="form-group col-md-3">
+                                            <label for="client_id"> Corporate Name <span class="text-danger"></span></label>
+                                            <select class="form-control" id="client_id" name="client_id">
+                                                <option value="0">Select Corporate</option>
+                                                <?php
+                                                if (isset($client_list) && count($client_list)) {
+                                                    foreach ($client_list as $key => $value) {
+                                                        echo "<option value='" . $value['id'] . "'>" . $value['client_name'] . "</option>";
+                                                    }
                                                 }
-                                            }
-                                        ?>
-                                    </select>
-                                </div>
+                                                ?>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="emp_code">Employee ID<span class="text-danger"></span></label>
-                                    <input type="text" class="form-control" id="emp_code" name="emp_code">
-                                </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="emp_code">Employee ID<span class="text-danger"></span></label>
+                                            <input type="text" class="form-control" id="emp_code" name="emp_code">
+                                        </div>
 
-                                <!-- <div class="form-group col-md-3">
+                                        <!-- <div class="form-group col-md-3">
                                     <label for="tpa_id">TPA ID<span class="text-danger"></span></label>
                                     <input type="text" class="form-control" id="tpa_id" name="tpa_id">
                                 </div> -->
 
-                                <div class="form-group col-md-3">
-                                    <label for="emp_mobile_no">Employee Mobile No<span
-                                            class="text-danger"></span></label>
-                                    <input type="text" class="form-control" id="emp_mobile_no" name="emp_mobile_no">
-                                </div>
+                                        <div class="form-group col-md-3">
+                                            <label for="emp_mobile_no">Employee Mobile No<span
+                                                    class="text-danger"></span></label>
+                                            <input type="text" class="form-control" id="emp_mobile_no" name="emp_mobile_no">
+                                        </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="claim_status">Status<span class="text-danger"></span></label>
-                                    <select class="form-control" id="claim_status" name="claim_status">
-                                        <option value="0">Select status</option>
-                                        <?php /*
+                                        <div class="form-group col-md-3">
+                                            <label for="claim_status">Status<span class="text-danger"></span></label>
+                                            <select class="form-control" id="claim_status" name="claim_status">
+                                                <option value="0">Select status</option>
+                                                <?php /*
                                             if (isset($claim_status) && count($claim_status)) {
                                                 foreach ($claim_status as $key => $value) {
                                                     echo "<option value=" . $value['id'] . ">" . $value['status'] . "</option>";
                                                 }
                                             }
                                        */ ?>
-                                    </select>
-                                </div>
+                                            </select>
+                                        </div>
 
-                                <div class="form-group col-md-12 text-right m-b-0" style="margin-bottom: -15px;">
-                                    <a href="#" class="btn btn-secondary" id="clear-filters">Clear</a>
-                                    <a class="btn btn-primary" id="get-emp-list" onclick="fetchTicketListData();">Submit</a>
-                                </div>
+                                        <div class="form-group col-md-12 text-right m-b-0" style="margin-bottom: -15px;">
+                                            <a href="#" class="btn btn-secondary" id="clear-filters">Clear</a>
+                                            <a class="btn btn-primary" id="get-emp-list" onclick="fetchTicketListData();">Submit</a>
+                                        </div>
 
+                                    </div>
+
+                                </div>
                             </div>
-
                         </div>
                     </div>
+
                 </div>
             </div>
 
         </div>
     </div>
+    <div class="row" id="ticket_list_div">
+        <?php include('ticket_list.php'); ?>
+    </div>
 </div>
 
+
 <!-- end page title -->
-<div class="row" id="ticket_list_div">
-    <?php include('ticket_list.php'); ?>
-</div>
+
 
 
 <script>
-
-$(document).ready(function() {
+    $(document).ready(function() {
         // Initialize select2
         $('#client_id').select2();
         $('#claim_status').select2();
         $('#insurer_id').select2();
         $('#tpa_id').select2();
-        
-        
+
+
     });
 
-    $('#ticket_type').on('change',function(){
+    $('#ticket_type').on('change', function() {
         var ticket_type = $('#ticket_type').val();
         var claim_status = <?= json_encode($claim_status) ?>;
         $('#claim_status').empty();
         $('#claim_status').append($('<option>', {
-        value: '',
-        text: 'Select Claim Status'
-    }));
+            value: '',
+            text: 'Select Claim Status'
+        }));
 
         // console.log('Claim Status:', claim_status);
-        for (var i = 0;i<claim_status.length;i++){
-            if(claim_status[i]['ticket_type'] == ticket_type){
+        for (var i = 0; i < claim_status.length; i++) {
+            if (claim_status[i]['ticket_type'] == ticket_type) {
                 $('#claim_status').append($('<option>', {
-                value: claim_status[i]['id'], // Use 'id' as the value
-                text: claim_status[i]['claim_status'] // Use 'claim_status' as the text
+                    value: claim_status[i]['id'], // Use 'id' as the value
+                    text: claim_status[i]['claim_status'] // Use 'claim_status' as the text
                 }));
             }
         }
     })
 
-function fetchTicketListData() {
+    function fetchTicketListData() {
 
-    var ticket_type = $('#ticket_type').val();
-    var pod_no = $('#pod_no').val();
-    var claim_no = $('#claim_no').val();
-    var emp_code = $('#emp_code').val();
-    var claim_status = $('#claim_status').val();
-    var emp_mobile_no = $('#emp_mobile_no').val();
-    var tpa_id = $('#tpa_id').val();
-    var client_id = $('#client_id').val();
-    var insurer_id = $('#insurer_id').val();
-    var tpa_id = $('#tpa_id').val();
+        var ticket_type = $('#ticket_type').val();
+        var pod_no = $('#pod_no').val();
+        var claim_no = $('#claim_no').val();
+        var emp_code = $('#emp_code').val();
+        var claim_status = $('#claim_status').val();
+        var emp_mobile_no = $('#emp_mobile_no').val();
+        var tpa_id = $('#tpa_id').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var tpa_id = $('#tpa_id').val();
 
-    var requestData = {
-        ticket_type_id: ticket_type,
-        pod_no: pod_no,
-        claim_number: claim_no,
-        emp_code: emp_code,
-        claim_status_id: claim_status,
-        emp_mobile: emp_mobile_no,
-        tpa_id: tpa_id,
-        client_id: client_id,
-        insurer_id: insurer_id,
-        tpa_id: tpa_id,
-    };
+        var requestData = {
+            ticket_type_id: ticket_type,
+            pod_no: pod_no,
+            claim_number: claim_no,
+            emp_code: emp_code,
+            claim_status_id: claim_status,
+            emp_mobile: emp_mobile_no,
+            tpa_id: tpa_id,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            tpa_id: tpa_id,
+        };
 
-    let filterData = requestData;
-    localStorage.setItem('filterData', JSON.stringify(filterData));
+        let filterData = requestData;
+        localStorage.setItem('filterData', JSON.stringify(filterData));
 
-    console.log("requestData", requestData);
+        console.log("requestData", requestData);
 
-    var url = '<?= base_url('/ticket/list') ?>';
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+        var url = '<?= base_url('/ticket/list') ?>';
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
 
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
 
-        console.log('Filter Responce', response);
+            console.log('Filter Responce', response);
+
+            if (response.status == true) {
+                $('#ticket_list_div').empty();
+                $('#ticket_list_div').html(response.html);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+            } else {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
+            }
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            toastr.error('An error occurred while fetching the data.', 'ERROR');
 
-        if (response.status == true) {
-            $('#ticket_list_div').empty();
-            $('#ticket_list_div').html(response.html);
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-
-        } else {
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-            let message = response.message;
-            toastr.error(message, 'ERROR');
-        }
-
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the data.', 'ERROR');
-
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-    });
+        });
 
 
-}
-
+    }
 </script>
 
 <script>
-    $(document).ready(function(){
+    $(document).ready(function() {
         let filterData = localStorage.getItem('filterData');
 
         filterData = filterData ? JSON.parse(filterData) : null;
 
         console.log('Filter Data', filterData);
 
-        if(filterData){
+        if (filterData) {
 
             var url = '<?= base_url('/ticket/list') ?>';
             $('.loader').fadeIn();
@@ -261,29 +260,29 @@ function fetchTicketListData() {
 
             sendAjaxRequestForGlobal(url, 'POST', filterData, function(response) {
 
-                    console.log('Filter Responce', response);
-
-                    if (response.status == true) {
-                        $('#ticket_list_div').empty();
-                        $('#ticket_list_div').html(response.html);
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-
-                    } else {
-                        $('.loader').fadeOut();
-                        $('.loader-mask').delay(350).fadeOut('slow');
-                        let message = response.message;
-                        toastr.error(message, 'ERROR');
-                    }
-
-                }, function(xhr, status, error) {
-                    console.error('Error fetching data:', error);
-                    console.error(xhr.responseText);
-                    toastr.error('An error occurred while fetching the data.', 'ERROR');
+                console.log('Filter Responce', response);
 
+                if (response.status == true) {
+                    $('#ticket_list_div').empty();
+                    $('#ticket_list_div').html(response.html);
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                });
+
+                } else {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                    let message = response.message;
+                    toastr.error(message, 'ERROR');
+                }
+
+            }, function(xhr, status, error) {
+                console.error('Error fetching data:', error);
+                console.error(xhr.responseText);
+                toastr.error('An error occurred while fetching the data.', 'ERROR');
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            });
 
             $('#ticket_type').val(filterData.ticket_type_id);
             $('#pod_no').val(filterData.pod_no);
@@ -301,9 +300,9 @@ function fetchTicketListData() {
 </script>
 
 <script>
-    $(document).on('click', '#clear-filters', function (e) {
+    $(document).on('click', '#clear-filters', function(e) {
 
-      e.preventDefault(); // Stops the browser from following the link
+        e.preventDefault(); // Stops the browser from following the link
 
         console.log('Clear Filters Area');
 
@@ -318,9 +317,7 @@ function fetchTicketListData() {
         $('#tpa_id').val('0');
         $('#client_id').val('0');
         $('#insurer_id').val('0');
-        
-        window.location.href = "<?= base_url("/ticket/list")?>";
-});
-
 
+        window.location.href = "<?= base_url("/ticket/list") ?>";
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index ba336120..4237421b 100755
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -446,7 +446,7 @@ $(document).ready(function () {
                      if (data.length === 0) {
                         tpaBranchTableInsert += `
                             <tr>
-                                <td colspan="3" class="text-center app-text-black">No data available in table</td>
+                                <td colspan="3" class="text-center font-color-black">No data available in table</td>
                             </tr>
                         `;
                     } else {
@@ -575,7 +575,7 @@ $(document).ready(function () {
                     if (data.length === 0) {
                         branchTable += `
                             <tr>
-                                <td colspan="3" class="text-center app-text-black ">No data available in table</td>
+                                <td colspan="3" class="text-center font-color-black ">No data available in table</td>
                             </tr>
                         `;
                     } else {
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index ace4ba84..19737cdc 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -1,6 +1,5 @@
 <style>
-
-.custom-dropdown-menu {
+  .custom-dropdown-menu {
     display: none;
     position: absolute;
     background-color: #ffffff !important;
@@ -10,306 +9,319 @@
     min-width: 10rem;
     z-index: 9999;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
+  }
 
-.custom-dropdown-menu .dropdown-item {
+  .custom-dropdown-menu .dropdown-item {
     display: block !important;
     width: 100% !important;
     padding: 0.5rem 1rem !important;
     color: #212529 !important;
     text-decoration: none !important;
     background-color: transparent !important;
-}
+  }
 
-.custom-dropdown-menu .dropdown-item:hover {
+  .custom-dropdown-menu .dropdown-item:hover {
     background-color: #f8f9fa !important;
     color: #16181b !important;
     cursor: pointer !important;
-}   
+  }
 
-.btn-color{
-  background-color: rgba(52, 174, 178, 1);
-  color: white;
-  border:1px solid rgba(52, 174, 178, 1);
-}
+  .btn-color {
+    background-color: rgba(52, 174, 178, 1);
+    color: white;
+    border: 1px solid rgba(52, 174, 178, 1);
+  }
 
-.btn-color:hover{
+  .btn-color:hover {
     background-color: rgba(41, 139, 142, 1);
     color: white;
-    border:1px solid  rgba(41, 139, 142, 1);
-}
-
+    border: 1px solid rgba(41, 139, 142, 1);
+  }
 </style>
-<div class="row" id="tpa_list">
+<div class="container-fluid-min">
+  <div class="row" id="tpa_list">
     <div class="col-12">
-        <div class="card">
-            <div class="card-body maincard">
-                    <div class="row" style="margin-bottom:1rem;">
+      <div class="card">
+        <div class="card-body maincard">
+          <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">TPA</h4>
                         </div>
-                    </div>
-                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">Name</th>
-                            <th class="font-weight-medium">Action</th>
-                        </tr>
-                    </thead>
+                    </div> -->
+          <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+            id="tickets-table">
+            <thead class="bg-light">
+              <tr>
+                <th class="font-weight-medium">Name</th>
+                <th class="font-weight-medium">Action</th>
+              </tr>
+            </thead>
 
-                    <tbody>
-                    <?php if(is_array($tpaList)) {foreach($tpaList as $row){ ?>
-                      <tr>
-                        <td><?php echo $row['name']; ?> ( <?php echo $row['short_name']; ?> ) </td>
-                        <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>
-                            <div class="dropdown-menu dropdown-menu-right">
-                              <a class="dropdown-item" href="<?= base_url("master/tpa/list/"); ?><?= $row['id'];?>"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
-                              <a class="dropdown-item" data-id="<?= $row['id'];?>" onclick="removeTPA(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                    <?php }}?>
+            <tbody>
+              <?php if (is_array($tpaList)) {
+                foreach ($tpaList as $row) { ?>
+                  <tr>
+                    <td><?php echo $row['name']; ?> ( <?php echo $row['short_name']; ?> ) </td>
+                    <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>
+                        <div class="dropdown-menu dropdown-menu-right">
+                          <a class="dropdown-item" href="<?= base_url("master/tpa/list/"); ?><?= $row['id']; ?>"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                          <a class="dropdown-item" data-id="<?= $row['id']; ?>" onclick="removeTPA(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
+                        </div>
+                      </div>
+                    </td>
+                  </tr>
+              <?php }
+              } ?>
 
-                    </tbody>
-                </table>
-            </div>
+            </tbody>
+          </table>
         </div>
+      </div>
     </div><!-- end col -->
+  </div>
 </div>
+
 <!-- end row -->
 <script>
-document.addEventListener("DOMContentLoaded", function () {
+  document.addEventListener("DOMContentLoaded", function() {
     const table = document.getElementById("tickets-table");
-    
+
     // Create custom dropdown
     function createCustomDropdown(row) {
-        // Get the original dropdown items
-        const originalDropdown = row.querySelector('.dropdown-menu');
-        if (!originalDropdown) return null;
-        
-        // Create new dropdown with proper background and spacing
-        const customDropdown = document.createElement('div');
-        customDropdown.className = 'custom-dropdown-menu';
-        
-        // Copy inner content while maintaining icon alignment
-        customDropdown.innerHTML = originalDropdown.innerHTML;
-        
-        return customDropdown;
+      // Get the original dropdown items
+      const originalDropdown = row.querySelector('.dropdown-menu');
+      if (!originalDropdown) return null;
+
+      // Create new dropdown with proper background and spacing
+      const customDropdown = document.createElement('div');
+      customDropdown.className = 'custom-dropdown-menu';
+
+      // Copy inner content while maintaining icon alignment
+      customDropdown.innerHTML = originalDropdown.innerHTML;
+
+      return customDropdown;
     }
 
     let activeDropdown = null;
 
     // Add click event listener to rows
     table.querySelectorAll("tbody tr").forEach(row => {
-        const customDropdown = createCustomDropdown(row);
-        if (!customDropdown) return;
-        
-        document.body.appendChild(customDropdown);
+      const customDropdown = createCustomDropdown(row);
+      if (!customDropdown) return;
 
-        row.addEventListener("click", function(event) {
-            // Ignore clicks on the action column
-            if (event.target.closest('td:last-child')) {
-                return;
-            }
+      document.body.appendChild(customDropdown);
 
-            // Hide any active dropdown
-            if (activeDropdown) {
-                activeDropdown.style.display = 'none';
-            }
+      row.addEventListener("click", function(event) {
+        // Ignore clicks on the action column
+        if (event.target.closest('td:last-child')) {
+          return;
+        }
 
-            // Get click position
-            const rect = event.target.getBoundingClientRect();
-            
-            // Position the dropdown with some offset
-            customDropdown.style.display = 'block';
-            customDropdown.style.position = 'fixed';
-            customDropdown.style.left = `${rect.left}px`;
-            customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
-            
-            // Set as active dropdown
-            activeDropdown = customDropdown;
-            
-            event.stopPropagation();
-        });
-
-        // Preserve click handlers and add auto-close
-        customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
-            item.addEventListener('click', function(e) {
-              e.preventDefault();
-                const onclickAttr = this.getAttribute('onclick');
-                if (onclickAttr) {
-                    eval(onclickAttr);
-                }
-                
-                const href = this.getAttribute('href');
-                if (href && href !== '#') {
-                    window.location.href = href;
-                }
-
-                // Close the dropdown after handling the click
-                if (activeDropdown) {
-                    activeDropdown.style.display = 'none';
-                    activeDropdown = null;
-                }
-                
-                e.stopPropagation();
-            });
+        // Hide any active dropdown
+        if (activeDropdown) {
+          activeDropdown.style.display = 'none';
+        }
+
+        // Get click position
+        const rect = event.target.getBoundingClientRect();
+
+        // Position the dropdown with some offset
+        customDropdown.style.display = 'block';
+        customDropdown.style.position = 'fixed';
+        customDropdown.style.left = `${rect.left}px`;
+        customDropdown.style.top = `${rect.bottom + 5}px`; // Add 5px gap
+
+        // Set as active dropdown
+        activeDropdown = customDropdown;
+
+        event.stopPropagation();
+      });
+
+      // Preserve click handlers and add auto-close
+      customDropdown.querySelectorAll('.dropdown-item').forEach(item => {
+        item.addEventListener('click', function(e) {
+          e.preventDefault();
+          const onclickAttr = this.getAttribute('onclick');
+          if (onclickAttr) {
+            eval(onclickAttr);
+          }
+
+          const href = this.getAttribute('href');
+          if (href && href !== '#') {
+            window.location.href = href;
+          }
+
+          // Close the dropdown after handling the click
+          if (activeDropdown) {
+            activeDropdown.style.display = 'none';
+            activeDropdown = null;
+          }
+
+          e.stopPropagation();
         });
+      });
     });
 
     // Close dropdown when clicking outside
     document.addEventListener("click", function() {
-        if (activeDropdown) {
-            activeDropdown.style.display = 'none';
-            activeDropdown = null;
-        }
+      if (activeDropdown) {
+        activeDropdown.style.display = 'none';
+        activeDropdown = null;
+      }
     });
-});
+  });
 </script>
 
 <script>
+  $(document).ready(function() {
 
- $(document).ready(function(){
-
+    
   $('#tickets-table').DataTable({
-        dom:  "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" + 
-              "<'row'<'col-sm-12'tr>>" + 
-              "<'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-7'p>>",
         buttons: [
-            {
-                extend: 'csv',
-                text: 'CSV', 
-                title: 'TPAList', 
-                exportOptions: {
-                    columns: ':not(:last-child)'
-                }
-            },
-            {
-                text: 'ADD',
-                className: 'btn btn-color',
-                action: function () {
+              {
+                  text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                  className: 'btn app-btn-primary  mr-2',
+                  action: function () {
                     window.location.href = "<?= base_url("master/tpa/create"); ?>";
-                }
-            }
-
-        ],
-
-
+                  }
+              },
+              {
+                  extend: 'collection',
+                  text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                  className: 'btn app-btn-secondary ',
+                  buttons: [
+                            {
+                                extend: 'csv',
+                                text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                title: 'TPAList',
+                                className: 'app-btn-primary ',
+                                exportOptions: {
+                                  columns: ':not(:last-child)'
+                                }
+                            }
+                  ]
+              }
+          ],
         language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
-        paging: true ,
+            search: `
+                    <div class="datatable-search-wrapper">
+                        _INPUT_
+                        <i class="mdi mdi-magnify datatable-search-icon"></i>
+                    </div>`,
+        searchPlaceholder: "Search"
+      },
+      paging: true,
     });
 
- }) 
+  })
 
-const btnExport = document.querySelector("#btnExport");
-const tableElement = document.querySelector("#tickets-table");
+  const btnExport = document.querySelector("#btnExport");
+  const tableElement = document.querySelector("#tickets-table");
 
-btnExport.addEventListener("click", () => {
-  const obj = new csvExport(tableElement);
-  const csvData = obj.exportCsv();
-  const blob = new Blob([csvData], { type: "text/csv" });
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement("a");
-  a.href = url;
-  a.download = "TPAList.csv";
-  a.click();
+  btnExport.addEventListener("click", () => {
+    const obj = new csvExport(tableElement);
+    const csvData = obj.exportCsv();
+    const blob = new Blob([csvData], {
+      type: "text/csv"
+    });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = "TPAList.csv";
+    a.click();
 
-  setTimeout(() => {
-    URL.revokeObjectURL(url);
-  }, 500);
-});
+    setTimeout(() => {
+      URL.revokeObjectURL(url);
+    }, 500);
+  });
 
 
-class csvExport {
-  constructor(table, header = true) {
-    this.table = table;
-    this.rows = Array.from(table.querySelectorAll("tr"));
-    if (!header && this.rows[0].querySelectorAll("th").length) {
-      this.rows.shift();
-    }
-  }
-
-  exportCsv() {
-    const lines = [];
-    const ncols = this._longestRow();
-    for (const row of this.rows) {
-      let line = "";
-      for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
-        if (row.children[i] !== undefined) {
-          line += csvExport.safeData(row.children[i]);
-        }
-        line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+  class csvExport {
+    constructor(table, header = true) {
+      this.table = table;
+      this.rows = Array.from(table.querySelectorAll("tr"));
+      if (!header && this.rows[0].querySelectorAll("th").length) {
+        this.rows.shift();
       }
-      lines.push(line);
     }
-    return lines.join("\n");
+
+    exportCsv() {
+      const lines = [];
+      const ncols = this._longestRow();
+      for (const row of this.rows) {
+        let line = "";
+        for (let i = 0; i < ncols - 1; i++) { // Exclude the last column
+          if (row.children[i] !== undefined) {
+            line += csvExport.safeData(row.children[i]);
+          }
+          line += i !== ncols - 2 ? "," : ""; // Adjusted for the last column exclusion
+        }
+        lines.push(line);
+      }
+      return lines.join("\n");
+    }
+
+    _longestRow() {
+      return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
+    }
+
+    static safeData(td) {
+      let data = td.textContent;
+      //Replace all double quote to two double quotes
+      data = data.replace(/"/g, `""`);
+      //Replace , and \n to double quotes
+      data = /[",\n"]/.test(data) ? `"${data}"` : data;
+      return data;
+    }
   }
 
-  _longestRow() {
-    return this.rows.reduce((length, row) => (row.childElementCount > length ? row.childElementCount : length), 0);
-  }
 
-  static safeData(td) {
-    let data = td.textContent;
-    //Replace all double quote to two double quotes
-    data = data.replace(/"/g, `""`);
-    //Replace , and \n to double quotes
-    data = /[",\n"]/.test(data) ? `"${data}"` : data;
-    return data;
-  }
-}
+  function removeTPA(element) {
 
+    Swal.fire({
+      title: "Are you sure?",
+      text: "You need to remove this TPA",
+      icon: "info",
+      showCancelButton: true,
+      confirmButtonColor: "#3085d6",
+      confirmButtonText: "Yes",
+    }).then((result) => {
 
-function removeTPA(element) {
-
-  Swal.fire({
-            title: "Are you sure?",
-            text: "You need to remove this TPA",
-            icon: "info",
-            showCancelButton: true,
-            confirmButtonColor: "#3085d6",
-            confirmButtonText: "Yes",
-        }).then((result) => {
-
-            if (result.isConfirmed) {
-              var id = element.getAttribute('data-id');
-              var form_action = '<?= base_url("master/tpa/remove/") ?>' + id; 
-              $.ajax({
-                  url: form_action,
-                  type: "GET",
-                  dataType: 'json',
-                  processData: false,
-                  contentType: false,
-                  success: function(res) {
-                    // console.log(res.status == true);
-                      if(res){
-                        if (res.status == true) {
-                          toastr.success('TPA removed successfully', 'success');
-                          location.reload();
-                        } else {
-                          toastr.warning('Failed to remove TPA', 'warning');
-                        }
-                      }
-                  },
-                  error: function (xhr, status, error) {
-                      console.error(xhr.responseText);
-                      console.error(status, error);
-                      $('.loader').fadeOut();
-                      $('.loader-mask').delay(350).fadeOut('slow');
-                      toastr.warning('Failed to remove TPA', 'warning');
-                  }
-              });
+      if (result.isConfirmed) {
+        var id = element.getAttribute('data-id');
+        var form_action = '<?= base_url("master/tpa/remove/") ?>' + id;
+        $.ajax({
+          url: form_action,
+          type: "GET",
+          dataType: 'json',
+          processData: false,
+          contentType: false,
+          success: function(res) {
+            // console.log(res.status == true);
+            if (res) {
+              if (res.status == true) {
+                toastr.success('TPA removed successfully', 'success');
+                location.reload();
+              } else {
+                toastr.warning('Failed to remove TPA', 'warning');
+              }
             }
-
+          },
+          error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+            toastr.warning('Failed to remove TPA', 'warning');
+          }
         });
+      }
+
+    });
   }
-
-
 </script>
\ No newline at end of file
diff --git a/app/Views/tpa_onboarding.php b/app/Views/tpa_onboarding.php
index c12b6d06..9c5edb72 100755
--- a/app/Views/tpa_onboarding.php
+++ b/app/Views/tpa_onboarding.php
@@ -1,33 +1,32 @@
 <style>
+    body {
+        .multiselect-native-select {
+            position: relative;
+
+            /* bottom: 32px; */
+            select {
+                border: 0 !important;
+                clip: rect(0 0 0 0) !important;
+                height: 1px !important;
+                margin: -1px -1px -1px -3px !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                position: absolute !important;
+                width: 1px !important;
+                left: 50%;
+                top: 30px;
+            }
+        }
+
+        .multiselect-container {
+            width: 100% !important;
+        }
+
+        .multiselect-selected-text {
+            float: left !important;
+        }
 
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
     }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
 </style>
 
 <div class="row" id="tpa_add">
@@ -41,7 +40,7 @@ body {
                         </span>
                         <span class="title-text ">TPA</span>
                     </h4>
-            
+
                     <!-- <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">TPA</h4>
                     </div>
@@ -49,21 +48,31 @@ body {
                         <a href="<?= base_url("master/tpa/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div> -->
                 </div>
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active-tab active">
-                            <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="tpa_branch_contacts_id">
-                            <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
-                            <span class="d-none d-sm-inline-block">Branch & Contacts</span>
-                        </a>
-                    </li>
-                </ul>
+                <div class="tab-wrapper position-relative">
+                    <ul class="nav nav-pills navtab-bg" id="myTab">
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <button class="scroll-btn left-btn" type="button">&#9664;</button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
+                                class="nav-link px-3 py-2 active-tab active">
+                                <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+                                <span class="d-none d-sm-inline-block">General</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#branch-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="tpa_branch_contacts_id">
+                                <span class="mr-1"><i class="mdi mdi-source-branch"></i></span>
+                                <span class="d-none d-sm-inline-block">Branch & Contacts</span>
+                            </a>
+                        </li>
+                        <li class="nav-item d-flex justify-content-center align-items-center">
+                            <!-- Right Arrow -->
+                            <button class="scroll-btn right-btn" type="button">&#9654;</button>
+                        </li>
+                    </ul>
+                </div>
+
                 <div class="tab-content">
                     <?php include('tpa_basic_info.php'); ?>
                     <?php include('tpa_branch.php'); ?>
@@ -79,20 +88,21 @@ body {
         var check_tpa_id = $('#tpa_General_PrimaryKey');
 
 
-        if(check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0){
+        if (check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0) {
             $('#btnBranchAdd').hide();
-            toastr.warning('First Add the TPA!', 'warning',{timeOut: 2000});
-        }else{
+            toastr.warning('First Add the TPA!', 'warning', {
+                timeOut: 2000
+            });
+        } else {
             // if ($('#btnBranchBack')[0].style.display == 'none') {
-                $('#btnBranchAdd').show();
+            $('#btnBranchAdd').show();
             // }
         }
-        
+
     }
 
     document.getElementById("tpa_branch_contacts_id").addEventListener("click", function(event) {
         event.preventDefault();
         tpa_branch_contact();
     });
-</script>
-
+</script>
\ No newline at end of file
diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php
index 650e9fa1..476a0439 100644
--- a/app/Views/variance_report_list.php
+++ b/app/Views/variance_report_list.php
@@ -1,188 +1,185 @@
 <style>
-.table th,
-.table td {
-    padding: 8px;
-}
+    .table th,
+    .table td {
+        padding: 8px;
+    }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
-}
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
 
-.col-12 {
 
-    max-width: 98% !important;
-}
 
-.dataTables_filter {
-    position: absolute;
-}
+    .dataTables_filter {
+        position: absolute;
+    }
 
-.right-align-input {
-    text-align: right;
-}
+    .right-align-input {
+        text-align: right;
+    }
 
-.center-align-input {
-    text-align: center;
-}
+    .center-align-input {
+        text-align: center;
+    }
 </style>
 
-<div class="row" id="varience_filter">
+<div class="container-fluid-min">
+    <div class="col-12" id="varience_filter">
+        <div class="card-body">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                    <h4 class="m-1">
+                        <span>Filter</span>
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                            aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h4>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <div class="form-group">
+                                <div class="form-row">
 
-    <div class="col-12" style="margin-top: -12px;">
-        <div id="accordion" class="mb-3">
-            <div class="card mb-1">
-                <h5 class="m-1">
-                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                        aria-expanded="true">
-                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                    </a>
-                </h5>
-                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <div class="form-row">
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Client<span class="text-danger"></span></label>
+                                        <select class="form-control" id="client_id" name="client_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Client</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Client<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_id" name="client_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Client</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch_id">Client Branch<span class="text-danger"></span></label>
+                                        <select class="form-control" id="client_branch_id" name="client_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Client Branch</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch_id">Client Branch<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_branch_id" name="client_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Client Branch</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="insurer_id"> Insurer <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_id" name="insurer_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0" selected>Select Insurer</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_id"> Insurer <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_id" name="insurer_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()" >
-                                        <option value="0" selected>Select Insurer</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="insurer_branch_id"> Insurer Branch <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="insurer_branch_id" name="insurer_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0" selected>Select Insurer Branch</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="insurer_branch_id"> Insurer Branch <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="insurer_branch_id" name="insurer_branch_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0" selected>Select Insurer Branch</option>
-                                    </select>
-                                </div>
-
-                                <div class="form-group col-md-3">
-                                    <label for="email"> Policy Type <span class="text-danger"></span></label>
-                                    <select class="form-control" id="policy_type_id" name="policy_type_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
-                                        <option value="0">Select Policy Type</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="email"> Policy Type <span class="text-danger"></span></label>
+                                        <select class="form-control" id="policy_type_id" name="policy_type_id" onchange="getClientPolicyDataBasedOnClientAndInsuer()">
+                                            <option value="0">Select Policy Type</option>
+                                            <?php
                                             if (isset($policy_types) && count($policy_types)) {
                                                 foreach ($policy_types as $key => $value) {
                                                     echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_policy_id"> Client Policy <span id="base_danger" class="text-danger"></span></label>
-                                    <select class="form-control" id="client_policy_id" name="client_policy_id" >
-                                        <option value="0" selected>Select client policy</option>
-                                    </select>
-                                </div>
+                                    <div class="form-group col-md-3">
+                                        <label for="client_policy_id"> Client Policy <span id="base_danger" class="text-danger"></span></label>
+                                        <select class="form-control" id="client_policy_id" name="client_policy_id">
+                                            <option value="0" selected>Select client policy</option>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Issuer<span class="text-danger">*</span></label>
-                                    <select class="form-control" id="issuer" name="issuer" required>
-                                        <option value="0">Select Issure</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label for="client_branch">Issuer<span class="text-danger">*</span></label>
+                                        <select class="form-control" id="issuer" name="issuer" required>
+                                            <option value="0">Select Issure</option>
+                                            <?php
                                             if (isset($issuer) && count($issuer)) {
                                                 foreach ($issuer as $key => $value) {
                                                     echo "<option value=" . $key . ">" . $value . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
+                                            ?>
+                                        </select>
+                                    </div>
 
-                                <div class="form-group col-md-3">
-                                    <label>Date Type<span class="text-danger"></span></label>
-                                    <select class="form-control" id="date_type" name="date_type"
-                                        onchange="hideDateField()">
-                                        <option value="0">Select Date Type</option>
-                                        <?php
+                                    <div class="form-group col-md-3">
+                                        <label>Date Type<span class="text-danger"></span></label>
+                                        <select class="form-control" id="date_type" name="date_type"
+                                            onchange="hideDateField()">
+                                            <option value="0">Select Date Type</option>
+                                            <?php
                                             if (isset($date_type) && count($date_type)) {
                                                 foreach ($date_type as $key => $value) {
                                                     echo "<option value='" . $key . "'>" . $value . "</option>";
                                                 }
                                             }
-                                        ?>
-                                    </select>
-                                </div>
-
-                                <div class="form-group col-md-3" style="display: none;" id="date_div">
-                                    <label>Date<span class="text-danger"></span></label>
-                                    <div id="reportrange" class="form-control"
-                                        style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                        <span></span> <i class="mdi mdi-menu-down"></i>
+                                            ?>
+                                        </select>
                                     </div>
-                                    <input type="hidden" id="startDate">
-                                    <input type="hidden" id="endDate">
+
+                                    <div class="form-group col-md-3" style="display: none;" id="date_div">
+                                        <label>Date<span class="text-danger"></span></label>
+                                        <div class="input-icon">
+                                            <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                                        </div>
+                                        <input type="hidden" id="startDate">
+                                        <input type="hidden" id="endDate">
+                                    </div>
+
+                                </div>
+
+                                <div class="form-group text-right m-b-0">
+                                    <a href="<?= base_url("/policy_tranction/report/report-varience-list"); ?>"
+                                        class="btn btn-secondary" id="clear-filters">Clear</a>
+                                    <a href="<?= base_url("/policy_tranction/report/report-varience-list"); ?>"
+                                        class="btn btn-primary" id="get-emp-list"
+                                        onclick="fetchEmpolyeeList(event);">Submit</a>
                                 </div>
 
                             </div>
-
-                            <div class="form-group text-right m-b-0">
-                                <a href="<?= base_url("/policy_tranction/report/report-varience-list"); ?>"
-                                    class="btn btn-secondary" id="clear-filters">Clear</a>
-                                <a href="<?= base_url("/policy_tranction/report/report-varience-list"); ?>"
-                                    class="btn btn-primary" id="get-emp-list"
-                                    onclick="fetchEmpolyeeList(event);">Submit</a>
-                            </div>
-
                         </div>
                     </div>
                 </div>
             </div>
-
         </div>
+
     </div>
-</div>
 
-<div class="col-12" id="varience_list">
-    <div class="card">
-        <div class="card-body">
-            <div class="row" style="padding-bottom: 10px;">
-                <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Variance Report</h4>
+    <div class="col-12" id="varience_list">
+        <div class="card">
+            <div class="card-body">
+                <div class="row" style="padding-bottom: 10px;">
+                    <div class="col-6" style="align-self: center;">
+                        <h4 style="position: relative;">Variance Report</h4>
+                    </div>
+
                 </div>
-
-            </div>
             <div class="table-responsive">
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Client</th>
-                            <th>Client Branch</th>
-                            <th>Insurer</th>
-                            <th>Insurer Branch</th>
-                            <th>Policy</th>
-                            <th>Endorsement No</th>
-                            <th>Premium</th>
-                            <th>Statement Premium</th>
-                            <th>Premium Variance</th>
-                            <th>Expected Amount</th>
-                            <th>Statement Amount</th>
-                            <th>Variance</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Client&nbsp;</th>
+                            <th>Client Branch&nbsp;</th>
+                            <th>Insurer&nbsp;</th>
+                            <th>Insurer Branch&nbsp;</th>
+                            <th>Policy&nbsp;</th>
+                            <th>Endorsement No&nbsp;</th>
+                            <th>Premium&nbsp;</th>
+                            <th>Statement Premium&nbsp;</th>
+                            <th>Premium Variance&nbsp;</th>
+                            <th>Expected Amount&nbsp;</th>
+                            <th>Statement Amount&nbsp;</th>
+                            <th>Variance&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody>
                         <?php if (isset($varience_list)) { ?>
                         <?php foreach($varience_list as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1 ?></td>
+                            <td class="text-center"><?= $index + 1 ?></td>
                             <td><?php echo $row['client_name']; ?></td>
                             <td><?php echo $row['client_branch_name']; ?></td>
                             <td><?php echo $row['insurer_name']; ?></td>
@@ -203,78 +200,86 @@ table.dataTable tbody td {
 
                 <div>
                 </div>
-            </div>
-        </div><!-- end col -->
+            </div><!-- end col -->
+        </div>
     </div>
 </div>
 
+
 <script>
+    let client_list = [];
+    let branch_list = [];
+    let policy_list = [];
+    let insurer_list = [];
+    let insurer_branch_list = [];
 
-let client_list = [];
-let branch_list = [];
-let policy_list = [];
-let insurer_list = [];
-let insurer_branch_list = [];
+    // Datatable document ready
+    $(document).ready(function() {
 
-// Datatable document ready
-$(document).ready(function() {
+        var ticketsTable = $('#scroll-horizontal-datatable');
 
-    var ticketsTable = $('#scroll-horizontal-datatable');
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                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-7'p>>", // Pagination at the bottom, without page length selector
+                buttons: [{
+                    extend: 'collection',
+                    text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                    className: 'btn app-btn-secondary ',
+                    buttons: [{
+                            extend: 'csv',
+                            text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                        },
+                        {
+                            extend: 'excel',
+                            text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                            title: 'Policy-Tranction-BDS-List',
+                            customize: function(xlsx) {
+                                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                                var total = 0;
 
-    if (ticketsTable.length) {
-        ticketsTable.DataTable({
-            scrollX: true,
-            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-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'Policy-Tranction-BDS-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'Policy-Tranction-BDS-List',
-                    customize: function(xlsx) {
-                        var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                        var total = 0;
+                                // Find cells in column AB (28th column in Excel)
+                                $('row c[r^="AB"]', sheet).each(function() {
+                                    var value = parseFloat($('v', this)
+                                        .text()); // Get the value inside the cell
+                                    if (!isNaN(value)) {
+                                        total += value;
+                                    }
+                                });
 
-                        // Find cells in column AB (28th column in Excel)
-                        $('row c[r^="AB"]', sheet).each(function() {
-                            var value = parseFloat($('v', this)
-                        .text()); // Get the value inside the cell
-                            if (!isNaN(value)) {
-                                total += value;
+                                // Get the last row index and append the total row
+                                var lastRow = $('row:last', sheet);
+                                var rowIndex = parseInt(lastRow.attr('r')) +
+                                    2; // Find the next row index
+                                var totalRow = '<row r="' + rowIndex + '">' +
+                                    '<c t="inlineStr" r="AA' + rowIndex +
+                                    '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
+                                    '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
+                                    '</v></c>' + // Insert sum in AB
+                                    '</row>';
+
+                                // Append the new total row to the sheet
+                                $(sheet).find('sheetData').append(totalRow);
                             }
-                        });
-
-                        // Get the last row index and append the total row
-                        var lastRow = $('row:last', sheet);
-                        var rowIndex = parseInt(lastRow.attr('r')) +
-                        2; // Find the next row index
-                        var totalRow = '<row r="' + rowIndex + '">' +
-                            '<c t="inlineStr" r="AA' + rowIndex +
-                            '"><is><t>Total</t></is></c>' + // Insert "Total" in AA
-                            '<c t="n" r="AB' + rowIndex + '"><v>' + total.toFixed(2) +
-                            '</v></c>' + // Insert sum in AB
-                            '</row>';
-
-                        // Append the new total row to the sheet
-                        $(sheet).find('sheetData').append(totalRow);
-                    }
-                }
-
-            ],
+                        } 
+                    ]
+                }],
             language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+                },
             paging: true, // Enable pagination
             pageLength: 25 // Set default number of rows per page (optional)
         });
     } else {
-        console.error("Table not found.");
+         console.error("Table not found.");
     }
 });
 
@@ -401,7 +406,7 @@ $(function() {
     // var end = moment();
 
     function cb(start, end) {
-        $('#reportrange span').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+        $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
         $('#startDate').val(start.format('DD-MM-YYYY'));
         $('#endDate').val(end.format('DD-MM-YYYY'));
     }
@@ -409,6 +414,7 @@ $(function() {
     $('#reportrange').daterangepicker({
         startDate: start,
         endDate: end,
+        locale: { format: 'DD-MM-YYYY' },
         ranges: {
             'Today': [moment(), moment()],
             'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
@@ -501,181 +507,398 @@ function getClientAndBranchAndPolicy()
     });
 }
 
-//append clients for filter 
-function appendClients(data) 
-{
-    $('#client_id').empty();
-
-    $('#client_id').append($('<option>', {
-        value: '',
-        text: 'Select Client'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.client_name,
-            'data-cn': item.client_name,
-            'data-ct': item.client_type,
-            class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
-        });
-
-        $('#client_id').append(option);
-    });
-
-}
-
-//append clients branch for filter 
-function appendBranch(data) 
-{
-
-    $('#client_branch_id').empty();
-
-    $('#client_branch_id').append($('<option>', {
-        value: '',
-        text: 'Select Branch'
-    }));
-
-    $.each(data, function(index, item) {
-
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name 
-        });
-        $('#client_branch_id').append(option);
-    });
-}
-
-//append insurer for filter 
-function appendInsurer(data) 
-{
-    $('#insurer_id').empty();
-
-    $('#insurer_id').append($('<option>', {
-        value: '',
-        text: 'Select Insurer'
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.name,
-        });
-
-        $('#insurer_id').append(option);
-    });
-
-}
-
-//append insurer branch for filter 
-function appendInsurerBranch(data) 
-{
-
-    $('#insurer_branch_id').empty();
-
-    $('#insurer_branch_id').append($('<option>', {
-        value: '',
-        text: 'Select Insurer Branch'
-    }));
-
-    $.each(data, function(index, item) {
-
-        var option = $('<option>', {
-            value: item.id,
-            text: item.branch_name 
-        });
-        $('#insurer_branch_id').append(option);
-    });
-}
-
-//append client policy for filter
-function appendPolicies(data)
-{
-    // console.log('appendPolicies', data);
-    // console.log('appendPolicies', $('#client_policy_id'));
-    
-    $('#client_policy_id').empty();
-    $('#client_policy_id').append($('<option>', {
-        value: '',
-        text: 'Select Policy',
-    }));
-
-    $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.policy_type + '-' + item.policy_no,
-        });
-        $('#client_policy_id').append(option);
-    });
-}
-
-// -------------------------------------------------------------------------------------------------
-
-//client branch and insurer branch onchange document ready function
-$(document).ready(function(){
-
-    $('#client_id').change(function(){
-
-        let client_id = $(this).val();
-        console.log('client_id', client_id);
-
-        if(branch_list != '') {
-            // console.log(branch_list[client_id]);
-            let data = branch_list[client_id];
-            appendBranch(data);
-        }
-        
+    $(document).ready(function() {
+        getClientAndBranchAndPolicy()
+        getURLParams()
+        $('#client_id').select2();
+        $('#client_branch_id').select2();
+        $('#insurer_id').select2();
+        $('#insurer_branch_id').select2();
+        $('#client_policy_id').select2();
+        $('#policy_type_id').select2();
     })
 
-    $('#insurer_id').change(function(){
+    function fetchEmpolyeeList(event) {
+        event.preventDefault(); // Prevent default action
 
-        let insurer_id = $(this).val();
-        console.log('insurer_id', insurer_id);
+        var start_date = $('#startDate').val();
+        var end_date = $('#endDate').val();
+        var client_id = $('#client_id').val();
+        var insurer_id = $('#insurer_id').val();
+        var policy_type_id = $('#policy_type_id').val();
+        var date_type = $('#date_type').val();
+        var issuer = $('#issuer').val();
+        var client_branch_id = $('#client_branch_id').val();
+        var insurer_branch_id = $('#insurer_branch_id').val();
+        var client_policy_id = $('#client_policy_id').val();
 
-        if(insurer_branch_list != '') {
-            // console.log(insurer_branch_list[insurer_id]);
-            let data = insurer_branch_list[insurer_id];
-            appendInsurerBranch(data);
-        }
+        console.log(start_date + '-' + end_date);
 
-    })
-
-});
-
-//get policy list based on the client, client_branch, insurer, insurer_branch and policy type
-function getClientPolicyDataBasedOnClientAndInsuer(){
-
-    let client_id = $('#client_id').val() ?? 0;
-    let client_branch_id = $('#client_branch_id').val() ?? 0;
-    let insurer_id = $('#insurer_id').val() ?? 0;
-    let insurer_branch_id = $('#insurer_branch_id').val() ?? 0;
-    let policy_type_id = $('#policy_type_id').val() ?? 0;
-
-    let url = '<?= base_url('util/getClientPolicyDataBasedOnClientAndInsuer/') ?>';
-
-    let requestData = { 
-            client_id: client_id, 
-            client_branch_id: client_branch_id, 
-            insurer_id: insurer_id, 
-            insurer_branch_id: insurer_branch_id, 
-            policy_type_id: policy_type_id, 
+        var queryParams = {
+            start_date: start_date,
+            end_date: end_date,
+            client_id: client_id,
+            insurer_id: insurer_id,
+            policy_type_id: policy_type_id,
+            date_type: date_type,
+            issuer: issuer,
+            client_branch_id: client_branch_id,
+            insurer_branch_id: insurer_branch_id,
+            client_policy_id: client_policy_id,
         };
 
-    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
-        console.log('Data fetched successfully:', response);
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
 
-        if (response.status === true) {
+    function objectToQueryString(obj) {
+        return Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+    }
+
+    function getURLParams() {
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        const startDate = params.get('start_date') || 0; // Default to 0 if not found
+        const endDate = params.get('end_date') || 0; // Default to 0 if not found
+        const client_id = params.get('client_id') || 0; // Default to 0 if not found
+        const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+        const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
+        const date_type = params.get('date_type') || 0; // Default to 0 if not found
+        const issuer = params.get('issuer') || 0; // Default to 0 if not found
+        const client_branch_id = params.get('client_branch_id') || 0; // Default to 0 if not found
+        const insurer_branch_id = params.get('insurer_branch_id') || 0; // Default to 0 if not found
+        const client_policy_id = params.get('client_policy_id') || 0; // Default to 0 if not found
+
+        hideDateField(date_type)
+
+        console.log('startDate', startDate)
+        console.log('endDate', endDate)
+        console.log('client_id', client_id)
+        console.log('insurer_id', insurer_id)
+        console.log('policy_type_id', policy_type_id)
+        console.log('date_type', date_type)
+        console.log('issuer', issuer)
+        console.log('client_branch_id', client_branch_id)
+        console.log('insurer_branch_id', insurer_branch_id)
+        console.log('client_policy_id', client_policy_id)
+
+        // Log the values or use them as needed
+        console.log('Start Date:', startDate);
+        console.log('End Date:', endDate);
+
+        if (startDate != 0 && endDate != 0) {
+            setTimeout(function() {
+                $('#start_date').val(startDate)
+                $('#end_date').val(endDate)
+                $('#client_id').val(client_id).change()
+                $('#insurer_id').val(insurer_id).change()
+                $('#policy_type_id').val(policy_type_id).change()
+                $('#date_type').val(date_type)
+                $('#issuer').val(issuer)
+                setTimeout(function() {
+                    $('#client_branch_id').val(client_branch_id).change()
+                    $('#insurer_branch_id').val(insurer_branch_id).change()
+                    setTimeout(function() {
+                        $('#client_policy_id').val(client_policy_id).change();
+                    }, 1000);
+                }, 2000)
+            }, 2000)
 
-            appendPolicies(response.data)
-            
-        } else {
-            toastr.warning(response.message, 'WARNING');
         }
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
+
+    }
+
+    $(function() {
+
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+
+        // Get start and end dates from URL parameters, or use default values
+        const startDateParam = params.get('start_date') || moment().subtract(29, 'days').format('DD-MM-YYYY');
+        const endDateParam = params.get('end_date') || moment().format('DD-MM-YYYY');
+
+        // Parse the dates to moment objects
+        var start = moment(startDateParam, 'DD-MM-YYYY');
+        var end = moment(endDateParam, 'DD-MM-YYYY');
+
+        // var start = moment().subtract(29, 'days');
+        // var end = moment();
+
+        function cb(start, end) {
+            $('#reportrange').html(start.format('D-MM-YYYY') + ' - ' + end.format('D-MM-YYYY'));
+            $('#startDate').val(start.format('DD-MM-YYYY'));
+            $('#endDate').val(end.format('DD-MM-YYYY'));
+        }
+
+        $('#reportrange').daterangepicker({
+            startDate: start,
+            endDate: end,
+            locale: {
+                format: 'DD-MM-YYYY'
+            },
+            ranges: {
+                'Today': [moment(), moment()],
+                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month')
+                    .endOf('month')
+                ]
+            }
+        }, cb);
+
+        cb(start, end);
+
+        $('#clear-filters').on('click', function() {
+            // Reset all select dropdowns to the first option
+            $('#client_id').val('0').change();
+            $('#insurer_id').val('0').change();
+            $('#policy_type_id').val('0').change();
+            $('#date_type').val('0');
+            $('#issuer').val('0');
+            $('#date_div').hide()
+
+            // Reset the date range picker to default
+            $('#reportrange').data('daterangepicker').setStartDate(moment().subtract(29, 'days'));
+            $('#reportrange').data('daterangepicker').setEndDate(moment());
+            cb(start, end); // Update the displayed date range
+        });
+
     });
 
-}
+    function hideDateField(input = null) {
+        let val = $('#date_type').val();
 
+        if (input) {
+            val = input;
+        }
+
+        if (val != 0) {
+            $('#date_div').show()
+        } else {
+            $('#date_div').hide()
+        }
+    }
+
+    function sendPolicyTransactionID(event, pt_id) {
+        event.preventDefault(); // Prevent default action
+
+        console.log(pt_id);
+
+        var queryParams = {
+            pt_id: pt_id,
+        };
+
+        const queryString = objectToQueryString(queryParams);
+        const apiURL = $('#get-policy-list').attr('href') + "?" + queryString;
+        console.log(apiURL);
+        window.location.href = apiURL;
+    }
+
+    // -------------------------------------------------------------------------------------------------
+
+    //featch client, client branch, insurer, insurer branch and client policy list data
+    function getClientAndBranchAndPolicy() {
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+                if (res.status == true) {
+                    client_list = res.client_data;
+                    branch_list = res.branch_data;
+                    policy_list = res.policy_data;
+                    insurer_list = res.insurer_data;
+                    insurer_branch_list = res.insurer_branch_data;
+                    appendClients(res.client_data);
+                    appendInsurer(res.insurer_data);
+                } else {
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+    //append clients for filter 
+    function appendClients(data) {
+        $('#client_id').empty();
+
+        $('#client_id').append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.client_name,
+                'data-cn': item.client_name,
+                'data-ct': item.client_type,
+                class: (item.client_type == 1) ? 'group' : (item.client_type == 2) ? 'individual' : ''
+            });
+
+            $('#client_id').append(option);
+        });
+
+    }
+
+    //append clients branch for filter 
+    function appendBranch(data) {
+
+        $('#client_branch_id').empty();
+
+        $('#client_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select Branch'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#client_branch_id').append(option);
+        });
+    }
+
+    //append insurer for filter 
+    function appendInsurer(data) {
+        $('#insurer_id').empty();
+
+        $('#insurer_id').append($('<option>', {
+            value: '',
+            text: 'Select Insurer'
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.name,
+            });
+
+            $('#insurer_id').append(option);
+        });
+
+    }
+
+    //append insurer branch for filter 
+    function appendInsurerBranch(data) {
+
+        $('#insurer_branch_id').empty();
+
+        $('#insurer_branch_id').append($('<option>', {
+            value: '',
+            text: 'Select Insurer Branch'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name
+            });
+            $('#insurer_branch_id').append(option);
+        });
+    }
+
+    //append client policy for filter
+    function appendPolicies(data) {
+        // console.log('appendPolicies', data);
+        // console.log('appendPolicies', $('#client_policy_id'));
+
+        $('#client_policy_id').empty();
+        $('#client_policy_id').append($('<option>', {
+            value: '',
+            text: 'Select Policy',
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.policy_type + '-' + item.policy_no,
+            });
+            $('#client_policy_id').append(option);
+        });
+    }
+
+    // -------------------------------------------------------------------------------------------------
+
+    //client branch and insurer branch onchange document ready function
+    $(document).ready(function() {
+
+        $('#client_id').change(function() {
+
+            let client_id = $(this).val();
+            console.log('client_id', client_id);
+
+            if (branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = branch_list[client_id];
+                appendBranch(data);
+            }
+
+        })
+
+        $('#insurer_id').change(function() {
+
+            let insurer_id = $(this).val();
+            console.log('insurer_id', insurer_id);
+
+            if (insurer_branch_list != '') {
+                // console.log(insurer_branch_list[insurer_id]);
+                let data = insurer_branch_list[insurer_id];
+                appendInsurerBranch(data);
+            }
+
+        })
+
+    });
+
+    //get policy list based on the client, client_branch, insurer, insurer_branch and policy type
+    function getClientPolicyDataBasedOnClientAndInsuer() {
+
+        let client_id = $('#client_id').val() ?? 0;
+        let client_branch_id = $('#client_branch_id').val() ?? 0;
+        let insurer_id = $('#insurer_id').val() ?? 0;
+        let insurer_branch_id = $('#insurer_branch_id').val() ?? 0;
+        let policy_type_id = $('#policy_type_id').val() ?? 0;
+
+        let url = '<?= base_url('util/getClientPolicyDataBasedOnClientAndInsuer/') ?>';
+
+        let requestData = {
+            client_id: client_id,
+            client_branch_id: client_branch_id,
+            insurer_id: insurer_id,
+            insurer_branch_id: insurer_branch_id,
+            policy_type_id: policy_type_id,
+        };
+
+        sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+            console.log('Data fetched successfully:', response);
+
+            if (response.status === true) {
+
+                appendPolicies(response.data)
+
+            } else {
+                toastr.warning(response.message, 'WARNING');
+            }
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+        });
+
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/vehicle_docs.php b/app/Views/vehicle_docs.php
index d5d2a83f..28f817d4 100644
--- a/app/Views/vehicle_docs.php
+++ b/app/Views/vehicle_docs.php
@@ -36,7 +36,8 @@
         </div>
     </div>
 
-    <div id="vehicle_file_table" class="card">
+    <div id="collapseOne">
+     <div id="vehicle_file_table" class="card">
         <div class="card-body">
             <div class="row" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
@@ -45,13 +46,13 @@
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="second-table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th>S.No</th>
-                            <th>Docs Name</th>
-                            <th>File Name</th>
-                            <th>Action</th>
+                            <th>S.No&nbsp;</th>
+                            <th>Docs Name&nbsp;</th>
+                            <th>File Name&nbsp;</th>
+                            <th>Action&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody id="vehicle_table_bd">
@@ -61,6 +62,7 @@
                 </div>
             </div>
         </div><!-- end col -->
+     </div>
     </div>
 
 </div>
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index 4456b5f1..9d83d62e 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -66,35 +66,35 @@ table.dataTable tbody td {
     <div class="col-12">
         <div class="card">
             <div class="card-body maincard">
-                <div class="row" style="margin-bottom:1rem;">
+                <!-- <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Vehicle Master</h4>
                     </div>
-                </div>
+                </div> -->
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
-                            <th class="font-weight-medium">S.No.</th>
-                            <th class="font-weight-medium">Owner Type</th>
-                            <th class="font-weight-medium">Owner Name</th>
-                            <th class="font-weight-medium">RC Book No</th>
-                            <th class="font-weight-medium">Vehicle No</th>
-                            <th class="font-weight-medium">Vehicle type</th>
-                            <th class="font-weight-medium">Description</th>
-                            <th class="font-weight-medium">Action</th>
+                            <th class="font-weight-medium">S.No&nbsp;</th>
+                            <th class="font-weight-medium">Owner Type&nbsp;</th>
+                            <th class="font-weight-medium">Owner Name&nbsp;</th>
+                            <th class="font-weight-medium">RC Book No&nbsp;</th>
+                            <th class="font-weight-medium">Vehicle No&nbsp;</th>
+                            <th class="font-weight-medium">Vehicle type&nbsp;</th>
+                            <th class="font-weight-medium">Description&nbsp;</th>
+                            <th class="font-weight-medium">Action&nbsp;</th>
                         </tr>
                     </thead>
 
                     <tbody>
                         <?php foreach($vehicle_Master_Data as $index => $row){ ?>
                         <tr>
-                            <td><?php echo $index+1; ?></td>
-                            <td><?php echo $row['owner_type']; ?></td>
-                            <td><?php echo $row['owner_name']; ?></td>
-                            <td><?php echo $row['rc']; ?></td>
-                            <td><?php echo $row['vehicle_no']; ?></td>
-                            <td><?php echo $row['vehicle_type']; ?></td>
-                            <td><?php echo $vehicle_des[$row['description']] ?? ""; ?></td>
+                            <td class="text-center"><?php echo $index+1; ?></td>
+                            <td><?php echo $row['owner_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['owner_name'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['rc'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['vehicle_no'] ?: 'N/A'; ?></td>
+                            <td><?php echo $row['vehicle_type'] ?: 'N/A'; ?></td>
+                            <td><?php echo $vehicle_des[$row['description']] ?? "N/A"; ?></td>
                             <td>
                                 <div class="btn-group dropdown">
                                     <a href="javascript: void(0);"
@@ -466,40 +466,61 @@ $(document).ready(function() {
 $(document).ready(function() {
 
     $('#scroll-horizontal-datatable').DataTable({
-        scrollX: true,
-        dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
-            "<'row'<'col-sm-12'tr>>" +
-            "<'row'<'col-sm-5'i><'col-sm-7'p>>",
-        buttons: [
-            {
-            extend: 'csv',
-            text: 'CSV',
-            title: 'Vehicle-Master-List',
-            className: 'my_class',
-            exportOptions: {
-                columns: ':not(:last-child)'
-            },
-            },
-            {
-                text: 'ADD',
-                className: 'btn-color',
-                attr: {
-                    id: 'btnAdd',
-                    title: 'Add'
-                },
-                action: function () {
-                    showModal('add')
-                }
-            }
-    ],
-        language: {
-            search: "_INPUT_",
-            searchPlaceholder: "Search..."
-        },
-        paging: true,
-    });
-
-})
+          scrollX: true,
+          dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
+            "<'row'<'col-sm-12'tr>>" + 
+            "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
+            buttons: [  
+              {
+                    text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                    className: 'btn app-btn-primary btn-color mr-2',
+                    attr: {
+                        id: 'btnAdd',
+                        title: 'Add'
+                    },
+                    action: function () {
+                        showModal('add')
+                    }
+              },
+              {
+                  extend: 'collection',
+                  text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                  className: 'btn app-btn-secondary ',
+                  buttons: [
+                            {
+                                extend: 'csv',
+                                title: 'Vehicle-Master-List',
+                                className: 'my_class',
+                                text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                className: 'app-btn-primary my_class',
+                                exportOptions: {
+                                    columns: ':not(:last-child)'
+                                },
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel " ></i><span class="  btn-custom">  EXCEL </span>',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                className: 'app-btn-primary ',
+                            }
+                  ]
+              }
+          ],
+          language: {
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
+          },
+          paging: true,
+          pageLength: 10,
+          order: [[0, 'desc']]
+         });
+});
 
 function getEditVehicleDetailsData(input) {
 
diff --git a/app/Views/view_deposit.php b/app/Views/view_deposit.php
index bf25aeac..606da89e 100755
--- a/app/Views/view_deposit.php
+++ b/app/Views/view_deposit.php
@@ -226,8 +226,8 @@
                 </div> -->
                 
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-primary" id="saveTransactionBtn">Save Transaction</button>
+                    <button type="button" class="btn cancel-btn" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary submit-btn" id="saveTransactionBtn">Submit</button>
                 </div>
 
             </div>
@@ -258,51 +258,101 @@
                 dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + 
                     "<'row'<'col-sm-12'tr>>" + 
                     "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
-
+                // buttons: [
+                //     {
+                //         text: '+ add',
+                //         className: 'btn btn-primary buttons-html5',
+                //         action: function () {
+                //             var myModal = new bootstrap.Modal(document.getElementById('addTransactionModal'));
+                //             myModal.show();
+                //         }
+                //     }
+                //     ,
+                //     {
+                //         extend: 'csv',
+                //         text: 'CSV',
+                //         title: 'CD TransactionDetails',
+                //         exportOptions: {
+                //             columns: ''
+                //         }
+                //     },
+                //     {
+                //         extend: 'pdf',
+                //         text: 'PDF',
+                //         title: 'TransactionDetails',
+                //         exportOptions: {
+                //             columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+                //             format: {
+                //                 body: function (data, row, column, node) {
+                //                     return data.replace(/<.*?>/g, '');
+                //                 }
+                //             }
+                //         },
+                //         customize: function (doc) {
+                //             doc.pageOrientation = 'landscape';
+                //             doc.styles.tableHeader.alignment = 'left';
+                //             doc.defaultStyle.alignment = 'left';
+                //             doc.content[1].table.widths = [
+                //                 '9%', '9%', '8%', '9%', '10%',
+                //                 '9%', '9%', '9%', '9%', '11%', '8%'
+                //             ];
+                //         }
+                //     }
+                // ],
                 buttons: [
                     {
-                        text: '+ add',
-                        className: 'btn btn-primary buttons-html5',
+                        text: '<i class="mdi mdi-plus" ></i><span class=" btn-custom">  Add </span>',
+                        className: 'btn app-btn-primary  mr-2',
                         action: function () {
                             var myModal = new bootstrap.Modal(document.getElementById('addTransactionModal'));
                             myModal.show();
                         }
-                    }
-                    ,
-                    {
-                        extend: 'csv',
-                        text: 'CSV',
-                        title: 'CD TransactionDetails',
-                        exportOptions: {
-                            columns: ''
-                        }
                     },
                     {
-                        extend: 'pdf',
-                        text: 'PDF',
-                        title: 'TransactionDetails',
-                        exportOptions: {
-                            columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-                            format: {
-                                body: function (data, row, column, node) {
-                                    return data.replace(/<.*?>/g, '');
+                        extend: 'collection',
+                        text: '<span class=" btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
+                        className: 'btn app-btn-secondary ',
+                        buttons: [
+                                    {
+                                        extend: 'csv',
+                                        text: '<i class="mdi mdi-file-delimited " ></i><span class="  btn-custom">  CSV </span>',
+                                        title: 'CD TransactionDetails',
+                                        exportOptions: { columns: '' },
+                                        className: 'app-btn-primary ',
+                                    },
+                                    {
+                                extend: 'pdf',
+                                text: 'PDF',
+                                text: '<i class="mdi mdi-file-pdf" ></i><span class="  btn-custom">  EXCEL </span>',
+                                title: 'TransactionDetails',
+                                exportOptions: {
+                                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+                                    format: {
+                                        body: function (data, row, column, node) {
+                                            return data.replace(/<.*?>/g, '');
+                                        }
+                                    }
+                                },
+                                customize: function (doc) {
+                                    doc.pageOrientation = 'landscape';
+                                    doc.styles.tableHeader.alignment = 'left';
+                                    doc.defaultStyle.alignment = 'left';
+                                    doc.content[1].table.widths = [
+                                        '9%', '9%', '8%', '9%', '10%',
+                                        '9%', '9%', '9%', '9%', '11%', '8%'
+                                    ];
                                 }
                             }
-                        },
-                        customize: function (doc) {
-                            doc.pageOrientation = 'landscape';
-                            doc.styles.tableHeader.alignment = 'left';
-                            doc.defaultStyle.alignment = 'left';
-                            doc.content[1].table.widths = [
-                                '9%', '9%', '8%', '9%', '10%',
-                                '9%', '9%', '9%', '9%', '11%', '8%'
-                            ];
-                        }
+                        ]
                     }
                 ],
                 language: {
-                    search: "_INPUT_",
-                    searchPlaceholder: "Search..."
+                        search: `
+                        <div class="datatable-search-wrapper">
+                            _INPUT_
+                            <i class="mdi mdi-magnify datatable-search-icon"></i>
+                        </div>`,
+                        searchPlaceholder: "Search"
                 },
                 ordering: false,
                 paging: true
diff --git a/app/Views/view_policy_terms.php b/app/Views/view_policy_terms.php
index 1b9df63a..944ba3e2 100644
--- a/app/Views/view_policy_terms.php
+++ b/app/Views/view_policy_terms.php
@@ -97,21 +97,17 @@
 ?> -->
 
 <style>
-    .policy-terms-container {
-        border: 1px solid #ddd;
-        border-radius: 8px;
-        background-color: #fafafa;
-        padding: 20px;
-        max-width: 1200px;
-        margin: 20px auto;
-        box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    }
 
     .policy-row {
         display: flex;
         border-bottom: 1px solid #eee;
         padding: 12px 0;
         align-items: center;
+        background-color: #F4FFFF;
+        border:1px solid #A0F0FF;
+        border-radius: 10px;
+        margin-bottom: 10px;
+        padding-left: 40px;
     }
 
     .policy-row:last-child {
@@ -181,6 +177,15 @@
             padding-top: 8px;
             width: 100%;
         }
+
+        .key-value-pair{
+            border:2px solid white !important;
+            background-color: white !important;
+            color: black !important;
+            padding: 5px !important;
+
+        }
+
     }
 </style>
 
@@ -191,8 +196,20 @@
                 <div class="policy-label">
                     <label><?= htmlspecialchars($key) ?></label>
                 </div>
-                <div class="policy-value">
-                    <span><?= $value ?></span>
+                <div class="policy-value d-flex flex-wrap">
+                <?php
+                    if(str_contains($value,":")){
+                            $value_array = explode(",", $value);
+                            foreach($value_array as $val){
+                                echo "<span style='border:2px solid #C3EDEE; border-radius:10px;background-color:white;padding:0 10px 0 10px; margin:10px;'>".
+                                         $val .
+                                    "</span> &nbsp;&nbsp;";
+                            }
+                    }else{ ?>
+                        <span><?= $value ?></span>
+                <?php }
+                ?>
+                    
                 </div>
             </div>
         <?php } ?>
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php
index 3fcbe414..667b6d36 100644
--- a/app/Views/view_rfq.php
+++ b/app/Views/view_rfq.php
@@ -349,7 +349,7 @@
                     <table  id="rfqTable" class="table table-bordered mt-3">
                         <thead>
                             <tr>
-                                <th class="sticky no-border" style="border-right: 2px solid rgb(0, 123, 255) !important; border-left: 2px solid rgb(0, 123, 255) !important; border-top: 2px solid rgb(0, 123, 255) !important; min-width: 72px !important;"><span class="key_name" style="display: none;">Sno</span><span class="display_name">S.No.</span></th>
+                                <th class="sticky no-border" style="border-right: 2px solid rgb(0, 123, 255) !important; border-left: 2px solid rgb(0, 123, 255) !important; border-top: 2px solid rgb(0, 123, 255) !important; min-width: 72px !important;"><span class="key_name" style="display: none;">Sno</span><span class="display_name">S.No&nbsp;</span></th>
                                 <th class="hidden no-border" style="border-right: 2px solid rgb(0, 123, 255) !important;">Item Key</th>
                                 <th class="sticky no-border" style="border-top: 2px solid rgb(0, 123, 255) !important; border-right: 2px solid rgb(0, 123, 255) !important;">Particulars</th>
                                 <th class="sticky no-border" style="background-color: white !important;" contenteditable="false" id="first_proposel_title" ><span class="key_name" style="display: none;">Proposal 1</span><span class="display_name">Proposal Coverage 1</span>
@@ -4714,7 +4714,7 @@ function jsonToTable(json) {
         } else {
             if(["Sno"].includes(header.parentHeader)){
                 let snoKeyName = header.parentHeader;
-                let snoDisplayName = "S.No.";
+                let snoDisplayName = "S.No";
                 parentTh.innerHTML = ` <span class="key_name" style="display: none;">${snoKeyName}</span><span class="display_name">${snoDisplayName}</span>`;
             }else{
                 parentTh.innerText = header.parentHeader;