diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 98b2a821..9845210a 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -184,7 +184,7 @@ class ClientController extends AdminController
 
     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 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>';
+        $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 = [
         //     ["filePath" => ROOTPATH."public/sample_excel/sample_addition.xls","fileName" => "sample_addition.xls"],
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index cc084f72..eb0133d1 100755
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -307,7 +307,7 @@ public function convertToPdf($inputFile = null)
     {
         // Customize this based on your needs
         $html = '<h2>' . htmlspecialchars($worksheet->getTitle()) . '</h2>';
-        $html .= '<table border="1" cellpadding="5">';
+        $html .= '<table data-custom-table-css="table" border="1" cellpadding="5">';
         
         foreach ($worksheet->getRowIterator() as $row) {
             $html .= '<tr>';
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 742ca2cf..98202360 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -2747,7 +2747,7 @@ class LeadsController extends BaseController
 
         $subject = $file_type == 'rfq' ? 'Request for Quotation from ' . $lead_data['client_name'] . ' for ' . $lead_data['policy_type'] : 'Quotation Comparison Report for ' . $lead_data['policy_type'];
 
-        $original_message = '<div style="width:100%;max-width:600px;margin:0 auto;padding:20px;border:1px solid #e0e0e0;background-color:#f9f9f9;font-family:Arial,sans-serif;color:#333;line-height:1.6"><div style=background-color:#4a90e2;color:#fff;padding:15px;text-align:center><h1 style=margin:0;font-size:24px>Request for Quotation (RFQ)</h1></div><div style=padding:20px;background-color:#fff><h2 style=color:#4a90e2;font-size:20px;margin-top:0>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 style=color:#4a90e2;font-size:20px;margin-top:20px>RFQ Details</h2><table style=width:100%;border-collapse:collapse;margin-top:20px><tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Client name<td style="border:1px solid #ddd;padding:10px;text-align:left">{{CLIENT_NAME}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Coverage Type<td style="border:1px solid #ddd;padding:10px;text-align:left">{{POLICY_LONG_NAME}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Policy Start Date<td style="border:1px solid #ddd;padding:10px;text-align:left">{{POLICY_START_DATE}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Policy Duration<td style="border:1px solid #ddd;padding:10px;text-align:left">{{DURATION}}</table><div style="margin-top:20px;padding:10px;background-color:#f7f7f7;border-left:4px solid #4a90e2;font-style:italic">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 style=margin-top:20px;font-size:12px;color:#777;text-align:center><p>© Nhance India Pvt Ltd. All rights reserved.</div></div>';
+        $original_message = '<div style="width:100%;max-width:600px;margin:0 auto;padding:20px;border:1px solid #e0e0e0;background-color:#f9f9f9;font-family:Arial,sans-serif;color:#333;line-height:1.6"><div style=background-color:#4a90e2;color:#fff;padding:15px;text-align:center><h1 style=margin:0;font-size:24px>Request for Quotation (RFQ)</h1></div><div style=padding:20px;background-color:#fff><h2 style=color:#4a90e2;font-size:20px;margin-top:0>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 style=color:#4a90e2;font-size:20px;margin-top:20px>RFQ Details</h2><table data-custom-table-css="table" style=width:100%;border-collapse:collapse;margin-top:20px><tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Client name<td style="border:1px solid #ddd;padding:10px;text-align:left">{{CLIENT_NAME}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Coverage Type<td style="border:1px solid #ddd;padding:10px;text-align:left">{{POLICY_LONG_NAME}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Policy Start Date<td style="border:1px solid #ddd;padding:10px;text-align:left">{{POLICY_START_DATE}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Policy Duration<td style="border:1px solid #ddd;padding:10px;text-align:left">{{DURATION}}</table><div style="margin-top:20px;padding:10px;background-color:#f7f7f7;border-left:4px solid #4a90e2;font-style:italic">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 style=margin-top:20px;font-size:12px;color:#777;text-align:center><p>© Nhance India Pvt Ltd. All rights reserved.</div></div>';
 
         //for mail content
         if (!empty($mail_content)) {
@@ -4901,7 +4901,7 @@ class LeadsController extends BaseController
 
                 // Start table with clean styling
                 $html .= "<h3 style='color: #333; font-weight: 500; margin-bottom: 15px;'>{$category}</h3>";
-                $html .= "<table style='width: 100%; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px;'>";
+                $html .= "<table data-custom-table-css="table" style='width: 100%; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px;'>";
 
                 // Table header with light background
                 $html .= "<tr>";
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 61c5aedf..9838492c 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -1798,7 +1798,7 @@ class MasterController extends AdminController
         $email_id = CLI::getOption('to') ? CLI::getOption('to') : $email_id;
         // print_r($email_id);die();
         // $gmailapi = \Config\Services::gmailapi();
-        $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 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>';
+        $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 = [
         //     ["filePath" => WRITEPATH."uploads/excel/sample/correction.xls","fileName" => "correction.xls"],
@@ -1821,7 +1821,7 @@ class MasterController extends AdminController
 
     public function testZeptoSMTP()
     {
-        $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 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>';
+        $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 =  [
             ["filePath" => ROOTPATH . "public/sample_excel/sample_addition.xls", "fileName" => "sample_addition.xls"],
             ["filePath" => ROOTPATH . "public/sample_excel/sample_inception.xls", "fileName" => "sample_inception.xls"],
@@ -1973,7 +1973,7 @@ class MasterController extends AdminController
     public function sendMutipleToEmails()
     {
 
-        $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 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>';
+        $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 =  [
             ["filePath" => ROOTPATH . "public/sample_excel/sample_addition.xls", "fileName" => "sample_addition.xls"],
             ["filePath" => ROOTPATH . "public/sample_excel/sample_inception.xls", "fileName" => "sample_inception.xls"],
diff --git a/app/Helpers/ChatbotHelper.php b/app/Helpers/ChatbotHelper.php
index e1f213d3..b17161c2 100644
--- a/app/Helpers/ChatbotHelper.php
+++ b/app/Helpers/ChatbotHelper.php
@@ -393,18 +393,18 @@ class ChatbotHelper
 <body class="clean-body u_body" style="margin: 0;padding: 0;-webkit-text-size-adjust: 100%;background-color: #F9F9F9;color: #000000">
   <!--[if IE]><div class="ie-container"><![endif]-->
   <!--[if mso]><div class="mso-container"><![endif]-->
-  <table style="border-collapse: collapse;table-layout: fixed;border-spacing: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;vertical-align: top;min-width: 320px;Margin: 0 auto;background-color: #F9F9F9;width:100%" cellpadding="0" cellspacing="0">
+  <table data-custom-table-css="table" style="border-collapse: collapse;table-layout: fixed;border-spacing: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;vertical-align: top;min-width: 320px;Margin: 0 auto;background-color: #F9F9F9;width:100%" cellpadding="0" cellspacing="0">
     <tbody>
       <tr style="vertical-align: top">
         <td style="word-break: break-word;border-collapse: collapse !important;vertical-align: top">
-          <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color: #F9F9F9;"><![endif]-->
+          <!--[if (mso)|(IE)]><table data-custom-table-css="table" width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color: #F9F9F9;"><![endif]-->
 
 
 
           <div class="u-row-container" style="padding: 0px;background-color: transparent">
             <div class="u-row" style="margin: 0 auto;min-width: 320px;max-width: 620px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;">
               <div style="border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;">
-                <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:620px;"><tr style="background-color: transparent;"><![endif]-->
+                <!--[if (mso)|(IE)]><table data-custom-table-css="table" width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table data-custom-table-css="table" cellpadding="0" cellspacing="0" border="0" style="width:620px;"><tr style="background-color: transparent;"><![endif]-->
 
                 <!--[if (mso)|(IE)]><td align="center" width="620" style="width: 620px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;" valign="top"><![endif]-->
                 <div class="u-col u-col-100" style="max-width: 320px;min-width: 620px;display: table-cell;vertical-align: top;">
@@ -412,12 +412,12 @@ class ChatbotHelper
                     <!--[if (!mso)&(!IE)]><!-->
                     <div style="box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;"><!--<![endif]-->
 
-                      <table style="font-family:times new roman,times;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+                      <table data-custom-table-css="table" style="font-family:times new roman,times;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
                         <tbody>
                           <tr>
                             <td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:times new roman,times;" align="left">
 
-                              <table width="100%" cellpadding="0" cellspacing="0" border="0">
+                              <table data-custom-table-css="table" width="100%" cellpadding="0" cellspacing="0" border="0">
                                 <tr>
                                   <td style="padding-right: 0px;padding-left: 0px;" align="center">
 
@@ -449,7 +449,7 @@ class ChatbotHelper
           <div class="u-row-container" style="padding: 0px;background-color: transparent">
             <div class="u-row" style="margin: 0 auto;min-width: 320px;max-width: 620px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;">
               <div style="border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;">
-                <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:620px;"><tr style="background-color: transparent;"><![endif]-->
+                <!--[if (mso)|(IE)]><table data-custom-table-css="table" width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table data-custom-table-css="table" cellpadding="0" cellspacing="0" border="0" style="width:620px;"><tr style="background-color: transparent;"><![endif]-->
 
                 <!--[if (mso)|(IE)]><td align="center" width="620" style="width: 620px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;" valign="top"><![endif]-->
                 <div class="u-col u-col-100" style="max-width: 320px;min-width: 620px;display: table-cell;vertical-align: top;">
@@ -457,7 +457,7 @@ class ChatbotHelper
                     <!--[if (!mso)&(!IE)]><!-->
                     <div style="box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;"><!--<![endif]-->
 
-                      <table style="font-family:times new roman,times;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+                      <table data-custom-table-css="table" style="font-family:times new roman,times;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
                         <tbody>
                           <tr>
                             <td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:times new roman,times;" align="left">
@@ -492,7 +492,7 @@ class ChatbotHelper
           <div class="u-row-container" style="padding: 0px;background-color: transparent">
             <div class="u-row" style="margin: 0 auto;min-width: 320px;max-width: 620px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;">
               <div style="border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;">
-                <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:620px;"><tr style="background-color: transparent;"><![endif]-->
+                <!--[if (mso)|(IE)]><table data-custom-table-css="table" width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table data-custom-table-css="table" cellpadding="0" cellspacing="0" border="0" style="width:620px;"><tr style="background-color: transparent;"><![endif]-->
 
                 <!--[if (mso)|(IE)]><td align="center" width="620" style="width: 620px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;" valign="top"><![endif]-->
                 <div class="u-col u-col-100" style="max-width: 320px;min-width: 620px;display: table-cell;vertical-align: top;">
@@ -500,7 +500,7 @@ class ChatbotHelper
                     <!--[if (!mso)&(!IE)]><!-->
                     <div style="box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;"><!--<![endif]-->
 
-                      <table style="font-family:times new roman,times;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+                      <table data-custom-table-css="table" style="font-family:times new roman,times;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
                         <tbody>
                           <tr>
                             <td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:times new roman,times;" align="left">
@@ -514,7 +514,7 @@ class ChatbotHelper
                         </tbody>
                       </table>
 
-                      <table style="font-family:times new roman,times;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+                      <table data-custom-table-css="table" style="font-family:times new roman,times;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
                         <tbody>
                           <tr>
                             <td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:times new roman,times;" align="left">
diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php
index bd66c776..f9de6b09 100755
--- a/app/Helpers/sendMailNotification.php
+++ b/app/Helpers/sendMailNotification.php
@@ -305,7 +305,7 @@ class sendMailNotification
                         }
                 
                         $table_content .= $policy_name_for_policy_type . '</h4></div>';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         // Add text-align: center to the table head
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -442,7 +442,7 @@ class sendMailNotification
                         }
                 
                         $table_content .= $policy_name_for_policy_type . ' ( Payable By Employee ) </h4></div>';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         // Add text-align: center to the table head
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -479,7 +479,7 @@ class sendMailNotification
                 
                 if (count($Addon_list) > 0) {
                     $table_content .= '<br><div style="text-align: left; font-size: 12px;"><div style="text-align:left;">';
-                    $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                    $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                 
                     // Center align for table header and body
                     $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -655,7 +655,7 @@ class sendMailNotification
                         }
                 
                         $table_content .= $policy_name_for_policy_type . '</h4></div>';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         // Add text-align: center to the table head
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -741,7 +741,7 @@ class sendMailNotification
                         }
                 
                         $table_content .= $policy_name_for_policy_type . ' ( Payable By Employee ) </h4></div>';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         // Add text-align: center to the table head
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -779,7 +779,7 @@ class sendMailNotification
                 
                 if (count($Addon_list) > 0) {
                     $table_content .= '<br><div style="text-align: left; font-size: 12px;"><div style="text-align:left;">';
-                    $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                    $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                 
                     // Center align for table header and body
                     $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -956,7 +956,7 @@ class sendMailNotification
                         }
 
                         $table_content .= $policy_name_for_policy_type . '</h4></div>';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         // Add text-align: center to the table head
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -1042,7 +1042,7 @@ class sendMailNotification
                         }
                 
                         $table_content .= $policy_name_for_policy_type . ' ( Payable By Employee ) </h4></div>';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         // Add text-align: center to the table head
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -1079,7 +1079,7 @@ class sendMailNotification
                 
                 if (count($Addon_list) > 0) {
                     $table_content .= '<br><div style="text-align: left; font-size: 12px;"><div style="text-align:left;">';
-                    $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                    $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                 
                     // Center align for table header and body
                     $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
@@ -1332,7 +1332,7 @@ class sendMailNotification
                 
                     // Start table row
                     $table_content .= $policy_name . '</h4></div>';
-                    $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                    $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                     $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
                     $table_content .= '<tr>';
                     $table_content .= '<th>Name</th>';
@@ -1384,7 +1384,7 @@ class sendMailNotification
                     // Generate summary table for addon if applicable
                     if (count($Addon_list) > 0) {
                         $table_content .= '<br><div style="text-align: left; font-size: 12px;"><div style="text-align:left;">';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
                         $table_content .= '<tr>';
@@ -1482,7 +1482,7 @@ class sendMailNotification
                 
                     // Start table row
                     $table_content .= $policy_name . '</h4></div>';
-                    $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                    $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                     $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
                     $table_content .= '<tr>';
                     $table_content .= '<th>Name</th>';
@@ -1534,7 +1534,7 @@ class sendMailNotification
                     // Generate summary table for addon if applicable
                     if (count($Addon_list) > 0) {
                         $table_content .= '<br><div style="text-align: left; font-size: 12px;"><div style="text-align:left;">';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
                         $table_content .= '<tr>';
@@ -1630,7 +1630,7 @@ class sendMailNotification
                 
                     // Start table row
                     $table_content .= $policy_name . '</h4></div>';
-                    $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                    $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                     $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
                     $table_content .= '<tr>';
                     $table_content .= '<th>Name</th>';
@@ -1683,7 +1683,7 @@ class sendMailNotification
                     if (count($Addon_list) > 0) {
 
                         $table_content .= '<br><div style="text-align: left; font-size: 12px;"><div style="text-align:left;">';
-                        $table_content .= '<table border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
+                        $table_content .= '<table data-custom-table-css="table" border="1" cellpadding="5" cellspacing="0" style="width:100%; border-collapse: collapse; font-size: 12px;">';
                         
                         $table_content .= '<thead style="background-color: #02a8b5; color: #ffffff; text-align: center;">';
                         $table_content .= '<tr>';
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 088b15d0..d9d73f2a 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -249,7 +249,7 @@ table.dataTable tbody td {
                             <h4 style="position: relative;">User List</h4>
                         </div>
                     </div>
-                    <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 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>
@@ -383,7 +383,7 @@ table.dataTable tbody td {
 <!-- Tooltip container separate from trigger -->
 <div class="tooltip-container" id="tooltipContainer">
     <div class="tooltip" id="accessMatrixTooltip">
-        <table class="tooltip-table" style="color: black;">
+        <table data-custom-table-css="table" class="tooltip-table" style="color: black;">
             <thead>
                 <tr>
                     <th>Team</th>
@@ -475,7 +475,7 @@ table.dataTable tbody td {
 
 <div class="tooltip-container" id="roleTooltipContainer">
     <div class="tooltip" id="roleAccessMatrixTooltip">
-        <table class="tooltip-table" style="color: black;">
+        <table data-custom-table-css="table" class="tooltip-table" style="color: black;">
             <thead>
                 <tr>
                     <th>Team</th>
diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php
index 9658053d..05aad57a 100755
--- a/app/Views/add_image_list.php
+++ b/app/Views/add_image_list.php
@@ -30,7 +30,7 @@ table.dataTable thead th {
                             <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>                
                         </div>
                     </div>
-                <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+                <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>
diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php
index c754ecc0..163b33cb 100755
--- a/app/Views/batch_list.php
+++ b/app/Views/batch_list.php
@@ -25,7 +25,7 @@
 
             </div>
             <div class="table-responsive">
-                <table id="datatable-buttons" class="table table-hover m-0 table-centered dt-responsive w-100">
+                <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>
diff --git a/app/Views/bds_multi_report.php b/app/Views/bds_multi_report.php
index 05b38e6c..ce37847e 100644
--- a/app/Views/bds_multi_report.php
+++ b/app/Views/bds_multi_report.php
@@ -33,7 +33,7 @@
                 </div>
 
                 <div class="table-responsive">
-                    <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                    <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                         <thead>
                             <tr>
                                 <?php
diff --git a/app/Views/bds_renewal_report_list.php b/app/Views/bds_renewal_report_list.php
index 524c917f..8079164a 100644
--- a/app/Views/bds_renewal_report_list.php
+++ b/app/Views/bds_renewal_report_list.php
@@ -20,7 +20,7 @@ table.dataTable tbody td {
                 </div>
                 <div>
                     <div class="table-responsive">
-                        <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                        <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                             <thead class="bg-light">
                                 <tr>
                                     <th>
diff --git a/app/Views/bds_report_Insurer_wise_Data.php b/app/Views/bds_report_Insurer_wise_Data.php
index d97e6f18..79159730 100644
--- a/app/Views/bds_report_Insurer_wise_Data.php
+++ b/app/Views/bds_report_Insurer_wise_Data.php
@@ -30,7 +30,7 @@ table.dataTable tbody td {
                 </div>
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>Insurer</th>
diff --git a/app/Views/bds_report_bap_wise_data.php b/app/Views/bds_report_bap_wise_data.php
index 391e6526..c0a69a8b 100644
--- a/app/Views/bds_report_bap_wise_data.php
+++ b/app/Views/bds_report_bap_wise_data.php
@@ -30,7 +30,7 @@ table.dataTable tbody td {
                 </div>
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>Insurer</th>
diff --git a/app/Views/bds_tat_wise_report.php b/app/Views/bds_tat_wise_report.php
index e3c428f4..721cd07c 100644
--- a/app/Views/bds_tat_wise_report.php
+++ b/app/Views/bds_tat_wise_report.php
@@ -33,7 +33,7 @@
                 </div>
 
                 <div class="table-responsive">
-                    <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                    <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                         <thead>
                             <tr>
                                 <?php
diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php
index 7c6e0a97..c6baa89e 100644
--- a/app/Views/business_team_list.php
+++ b/app/Views/business_team_list.php
@@ -179,7 +179,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S.No</th>
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index 1df5c220..3e6e0922 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -66,7 +66,7 @@ table.dataTable thead th {
                             data-trigger="hover">ADD</button> -->
                     </div>
                 </div>
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap" >
+                <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>
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index 52918801..0c1d6906 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -68,7 +68,7 @@
                 </div>
 
             </div>
-            <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 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>
diff --git a/app/Views/claim_files_upload.php b/app/Views/claim_files_upload.php
index 8fa2ad4c..5652432c 100644
--- a/app/Views/claim_files_upload.php
+++ b/app/Views/claim_files_upload.php
@@ -45,7 +45,7 @@
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S.No</th>
diff --git a/app/Views/claims_report_acc_manager_wise.php b/app/Views/claims_report_acc_manager_wise.php
index 3816a419..659646b8 100644
--- a/app/Views/claims_report_acc_manager_wise.php
+++ b/app/Views/claims_report_acc_manager_wise.php
@@ -33,7 +33,7 @@
                 </div>
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <?php if ($policy_type != 1) {?>
                         <tr>
diff --git a/app/Views/claims_report_tpa_wise.php b/app/Views/claims_report_tpa_wise.php
index d473d717..36b3412c 100644
--- a/app/Views/claims_report_tpa_wise.php
+++ b/app/Views/claims_report_tpa_wise.php
@@ -29,7 +29,7 @@
                 </div>
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th style="text-align: center;" colspan="8">OPEN</th>
diff --git a/app/Views/client_api.php b/app/Views/client_api.php
index 8fe995d5..e57051f4 100644
--- a/app/Views/client_api.php
+++ b/app/Views/client_api.php
@@ -44,7 +44,7 @@
                 </div> -->
                     </div>
                     <!-- <div class="table-responsive">
-                <table class="table table-bordered table-striped">
+                <table data-custom-table-css="table" class="table table-bordered table-striped">
                     <tr>
                         <td>Get Individual Employee Data</td>
                         <td><?= base_url("getEmpData") ?></td>
diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index da759709..796f6bba 100755
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -54,7 +54,7 @@
 
     <div class="table-responsive" id="branch_table">
 
-        <table class="table table-borderless table-nowrap mb-0">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0">
             <thead class="thead-light">
                 <tr>
                     <th>Branch Name</th>
diff --git a/app/Views/client_deposit_list.php b/app/Views/client_deposit_list.php
index 79adc7f7..7fcfff6b 100755
--- a/app/Views/client_deposit_list.php
+++ b/app/Views/client_deposit_list.php
@@ -16,7 +16,7 @@
                             <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 class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+                <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>
diff --git a/app/Views/client_info.php b/app/Views/client_info.php
index 485684dc..b4c286d3 100755
--- a/app/Views/client_info.php
+++ b/app/Views/client_info.php
@@ -39,7 +39,7 @@
 <!-- 
                                 <div class="col-6">
 
-                                    <table>
+                                    <table data-custom-table-css="table">
                                         <tr>
                                             <td style="font-size: 18px;"></td>
                                         </tr>
@@ -48,7 +48,7 @@
 
                                 <div class="col-6">
 
-                                    <table>
+                                    <table data-custom-table-css="table">
                                         <tr>
                                             <td style="font-size: 18px;"> <strong> Relationship Manager </strong></td>
                                         </tr>
@@ -63,7 +63,7 @@
                             <div class="row">
 
                                 <!-- <div class="col-6">
-                                    <table>
+                                    <table data-custom-table-css="table">
                                         <tr>
                                             <td style="padding: 3px;"></td>
                                         </tr>
@@ -74,7 +74,7 @@
                                 </div> -->
 
                                 <div class="col-6">
-                                    <table>
+                                    <table data-custom-table-css="table">
                                         <tr>
                                             <td style="padding: 3px;"><label> Account Manager :
                                                 </label> <?= implode(', ', $account_managers) ?></td>
@@ -120,7 +120,7 @@
                     <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                         <div class="card-body" style="position: relative;bottom: 25px;">
                             <div class="row">
-                                <table class="table table-hover m-0 table-centered dt-responsive nowrap w-100"
+                                <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive nowrap w-100"
                                     cellspacing="0">
                                     <thead class="bg-light">
                                         <tr>
@@ -205,7 +205,7 @@
                     <div id="collapseThree" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
                         <div class="card-body" style="position: relative;bottom: 25px;">
                             <div class="row">
-                                <table id="tb1" class="table table-hover m-0 table-centered dt-responsive nowrap w-100"
+                                <table data-custom-table-css="table" id="tb1" class="table table-hover m-0 table-centered dt-responsive nowrap w-100"
                                     cellspacing="0">
                                     <thead class="bg-light">
                                         <tr>
diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php
index eed707a0..aff9953a 100755
--- a/app/Views/client_kyc.php
+++ b/app/Views/client_kyc.php
@@ -9,7 +9,7 @@
         <div class="card">
             <div class="card-body">
                 <div class="table-responsive">
-                    <table id="kyc_table" class="table table-sm mb-0">
+                    <table data-custom-table-css="table" id="kyc_table" class="table table-sm mb-0">
                         <thead>
                             <tr>
                                 <th>Document Name</th>
@@ -70,7 +70,7 @@
         <div class="card">
             <div class="card-body">
                 <div class="table-responsive">
-                    <table id="kyc_table" class="table table-sm mb-0">
+                    <table data-custom-table-css="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 346f9f10..8275c156 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -65,7 +65,7 @@ table.dataTable thead th {
                             <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 class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+                <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>
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 50b7ba14..4f712bca 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -28,7 +28,7 @@
     </div>
 
     <div class="table-responsive" id="table_list">
-        <table class="table table-borderless table mb-0" id="table-client-policy">            
+        <table data-custom-table-css="table" class="table table-borderless table mb-0" id="table-client-policy">            
             <thead class="thead-light">
                 <tr>
                     <th>Insurer</th>
diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php
index b7777bd7..58fd2da3 100644
--- a/app/Views/dms_search.php
+++ b/app/Views/dms_search.php
@@ -99,7 +99,7 @@
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-            <table id="scroll-horizontal-datatable" class="table w-100">
+            <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100">
                 <thead class="bg-light">
                     <tr>
                         <th>S.No</th>
diff --git a/app/Views/drive_file_upload.php b/app/Views/drive_file_upload.php
index 158598ec..275b5c6f 100644
--- a/app/Views/drive_file_upload.php
+++ b/app/Views/drive_file_upload.php
@@ -45,7 +45,7 @@
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S.No</th>
diff --git a/app/Views/ecard_template/default_ecard.php b/app/Views/ecard_template/default_ecard.php
index 0ed04d23..f985a04f 100755
--- a/app/Views/ecard_template/default_ecard.php
+++ b/app/Views/ecard_template/default_ecard.php
@@ -15,7 +15,7 @@
 
 <body>
 
-    <table>
+    <table data-custom-table-css="table">
         <?php if(isset($data))  { ?>
         <?php foreach ($data as $key => $value) { ?>
         <tr>
diff --git a/app/Views/ecard_template/fhpl_tpa.php b/app/Views/ecard_template/fhpl_tpa.php
index 4b849f69..3bb3c0cc 100755
--- a/app/Views/ecard_template/fhpl_tpa.php
+++ b/app/Views/ecard_template/fhpl_tpa.php
@@ -17,7 +17,7 @@
 
 <body>
 
-    <table style="width: 100%;">
+    <table data-custom-table-css="table" style="width: 100%;">
 
     <?php if(isset($data))  { ?>
     <?php foreach ($data as $key => $value) { ?>
@@ -36,7 +36,7 @@
 
                             <div style="display: flex;gap: 20px;">
 
-                                <table>
+                                <table data-custom-table-css="table">
 
                                     <tr>
                                         <td>
diff --git a/app/Views/ecard_template/icici_tpa.php b/app/Views/ecard_template/icici_tpa.php
index a590bdf1..0206d9f5 100755
--- a/app/Views/ecard_template/icici_tpa.php
+++ b/app/Views/ecard_template/icici_tpa.php
@@ -8,7 +8,7 @@
 </head>
 
 <body>
-    <table style="width: 100%;">
+    <table data-custom-table-css="table" style="width: 100%;">
 
     <?php if(isset($data))  { ?>
     <?php foreach ($data as $key => $value) { ?>
@@ -25,7 +25,7 @@
 
                         <div style="display: flex;gap: 20px; padding-top: 10px;">
 
-                            <table>
+                            <table data-custom-table-css="table">
 
                                 <tr>
                                     <td>
diff --git a/app/Views/ecard_template/md_tpa.php b/app/Views/ecard_template/md_tpa.php
index 8cec0a84..36eb359e 100755
--- a/app/Views/ecard_template/md_tpa.php
+++ b/app/Views/ecard_template/md_tpa.php
@@ -12,7 +12,7 @@
                         POLICY</span></div>
             </div>
 
-            <table
+            <table data-custom-table-css="table"
                 style="font-family: sans-serif;font-size: 14px;width: 100%;margin-top: 20px;margin-left: 20px;line-height: 20px;">
                 <tbody>
                     <tr>
@@ -40,7 +40,7 @@
 
         <div style="border: 1px solid black;width: 400px;max-height: 300px;padding: 5px;">
             <div style="font-size: 11px;text-align: center;">The card is for identification purpose only</div>
-            <table style="width: 100%;text-align: center;font-size: 11px;">
+            <table data-custom-table-css="table" style="width: 100%;text-align: center;font-size: 11px;">
                 <tbody>
                     <tr>
                         <td>General & Claim Enquiry Helpline</td>
@@ -50,7 +50,7 @@
             </table>
 
 
-            <table style="font-size: 11px;width: 100%;text-align: center;">
+            <table data-custom-table-css="table" style="font-size: 11px;width: 100%;text-align: center;">
                 <tbody>
                     <tr>
                         <td style="border: 1px solid black;">Toll Free : 1800-209-7777 <br>Email :
@@ -63,7 +63,7 @@
             <div style="font-size: 14px;text-align: center;">CITI MDIndia branch contact</div>
 
             <div>
-                <table style="text-align: center;width: 100%;font-size: 12px;">
+                <table data-custom-table-css="table" style="text-align: center;width: 100%;font-size: 12px;">
                     <thead>
                         <tr>
                             <th style="border: 1px solid black;">Center</th>
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index 08d47835..207f9328 100755
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -89,7 +89,7 @@
                         <h4 style="position: relative;">Employees</h4>
                     </div>
                 </div>
-                <table class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                <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>
@@ -670,7 +670,7 @@
                     let historyTable = `
                         <div class="card-body">
                             <div class="table-responsive">
-                                <table class="table w-100">
+                                <table data-custom-table-css="table" class="table w-100">
                                     <thead class="bg-light">
                                         <tr>
                                             <th>Field</th>
diff --git a/app/Views/endorsement_dash.php b/app/Views/endorsement_dash.php
index adfd445e..1994460a 100755
--- a/app/Views/endorsement_dash.php
+++ b/app/Views/endorsement_dash.php
@@ -374,7 +374,7 @@ function getPendingActionClientDataForDashboard(input, headerName, type)
             var link = '<?=base_url()?>';
 
             if (res.data.length !== 0) {
-           //     table = `<table class="table table-striped table-sm table-centered mb-0"><tbody>`;
+           //     table = `<table data-custom-table-css="table" class="table table-striped table-sm table-centered mb-0"><tbody>`;
                 div = `<div class="row">`;
                 
                 $.each(res.data, function(index, item) {
diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php
index 6ee6ff14..14696fda 100755
--- a/app/Views/endorsement_list.php
+++ b/app/Views/endorsement_list.php
@@ -87,7 +87,7 @@
                     </div>
 
                 </div>
-                <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 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>
@@ -163,7 +163,7 @@
             </div>
             <div class="modal-body" id="modal_body">
                 <div class="table-responsive">
-                    <table class="table table-hover mb-0">
+                    <table data-custom-table-css="table" class="table table-hover mb-0">
                         <thead id="table_head_data">
 
                         </thead>
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index 96da7591..4448f795 100755
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -181,7 +181,7 @@
     <div class="col-12">
         <div class="card">
             <div class="card-body">
-                <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 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>
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 1c094d72..e1d18561 100755
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -86,7 +86,7 @@ $errorId = uniqid('error', true);
                                     <?php $argsId = $errorId . 'args' . $index ?>
                                     ( <a href="#" onclick="return toggle('<?= esc($argsId, 'attr') ?>');">arguments</a> )
                                     <div class="args" id="<?= esc($argsId, 'attr') ?>">
-                                        <table cellspacing="0">
+                                        <table data-custom-table-css="table" cellspacing="0">
 
                                         <?php
                                         $params = null;
@@ -138,7 +138,7 @@ $errorId = uniqid('error', true);
 
                     <h3>$<?= esc($var) ?></h3>
 
-                    <table>
+                    <table data-custom-table-css="table">
                         <thead>
                             <tr>
                                 <th>Key</th>
@@ -168,7 +168,7 @@ $errorId = uniqid('error', true);
                 <?php if (! empty($constants['user'])) : ?>
                     <h3>Constants</h3>
 
-                    <table>
+                    <table data-custom-table-css="table">
                         <thead>
                             <tr>
                                 <th>Key</th>
@@ -197,7 +197,7 @@ $errorId = uniqid('error', true);
             <div class="content" id="request">
                 <?php $request = Services::request(); ?>
 
-                <table>
+                <table data-custom-table-css="table">
                     <tbody>
                         <tr>
                             <td style="width: 10em">Path</td>
@@ -243,7 +243,7 @@ $errorId = uniqid('error', true);
 
                     <h3>$<?= esc($var) ?></h3>
 
-                    <table style="width: 100%">
+                    <table data-custom-table-css="table" style="width: 100%">
                         <thead>
                             <tr>
                                 <th>Key</th>
@@ -281,7 +281,7 @@ $errorId = uniqid('error', true);
 
                     <h3>Headers</h3>
 
-                    <table>
+                    <table data-custom-table-css="table">
                         <thead>
                             <tr>
                                 <th>Header</th>
@@ -307,7 +307,7 @@ $errorId = uniqid('error', true);
                 $response->setStatusCode(http_response_code());
             ?>
             <div class="content" id="response">
-                <table>
+                <table data-custom-table-css="table">
                     <tr>
                         <td style="width: 15em">Response Status</td>
                         <td><?= esc($response->getStatusCode() . ' - ' . $response->getReasonPhrase()) ?></td>
@@ -320,7 +320,7 @@ $errorId = uniqid('error', true);
 
                     <h3>Headers</h3>
 
-                    <table>
+                    <table data-custom-table-css="table">
                         <thead>
                             <tr>
                                 <th>Header</th>
@@ -354,7 +354,7 @@ $errorId = uniqid('error', true);
             <!-- Memory -->
             <div class="content" id="memory">
 
-                <table>
+                <table data-custom-table-css="table">
                     <tbody>
                         <tr>
                             <td>Memory Usage</td>
diff --git a/app/Views/excel_errors.php b/app/Views/excel_errors.php
index 7c09353c..04db844d 100755
--- a/app/Views/excel_errors.php
+++ b/app/Views/excel_errors.php
@@ -68,7 +68,7 @@ table.dataTable tbody td {
 
 <!-- <button><a  href="">download full file</a></button> -->
 <div class="container">
-    <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 table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0" id="tickets-table">
         <thead class="bg-light">
             <tr>
                 <?php foreach ($excel_header as $header): ?>
diff --git a/app/Views/export_import_error_list.php b/app/Views/export_import_error_list.php
index fcadf402..3176ce68 100755
--- a/app/Views/export_import_error_list.php
+++ b/app/Views/export_import_error_list.php
@@ -68,7 +68,7 @@ table.dataTable tbody td {
 
 <!-- <button><a  href="">download full file</a></button> -->
 <div class="container">
-    <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 table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0" id="tickets-table">
         <thead class="bg-light">
             <tr>
                 <?php foreach ($excel_header as $header): ?>
diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index cf7b4d6a..bceb3554 100755
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -19,7 +19,7 @@
                 </div>
 
             </div>
-            <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0"
+            <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>
diff --git a/app/Views/finance_team_list.php b/app/Views/finance_team_list.php
index 9613b9df..ffb991ea 100644
--- a/app/Views/finance_team_list.php
+++ b/app/Views/finance_team_list.php
@@ -179,7 +179,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S.No</th>
diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php
index 15d53361..a6da3ad8 100644
--- a/app/Views/hr_activity_history.php
+++ b/app/Views/hr_activity_history.php
@@ -38,7 +38,7 @@ table.dataTable tbody td {
     </div>
 </div>
 
-<table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+<table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
     <thead class="bg-light">
         <tr>
             <th>S. No</th>
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 7d6ed59d..936d603f 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -99,7 +99,7 @@
                 </div>
 
             </div>
-            <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0"
+            <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0"
                 id="hr_tickets_table">
                 <thead class="bg-light">
                     <tr>
diff --git a/app/Views/insurer_branch.php b/app/Views/insurer_branch.php
index 915114f3..6d4e0309 100755
--- a/app/Views/insurer_branch.php
+++ b/app/Views/insurer_branch.php
@@ -6,7 +6,7 @@
 
     <div class="table-responsive" id="branch_table" >
         
-        <table class="table table-borderless table-nowrap mb-0">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0">
             <thead class="thead-light">
                 <tr>
                     <th>Branch Name</th>
diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php
index 33ed64c8..77a55bee 100755
--- a/app/Views/insurer_export_templete.php
+++ b/app/Views/insurer_export_templete.php
@@ -74,7 +74,7 @@
 
     <div class="table-responsive" id="branch_table" >
         
-        <table class="table table-borderless table-nowrap mb-0">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0">
             <thead class="thead-light">
                 <tr>
                     <th>S.NO</th>
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index e7ce6e82..ff42e50b 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -49,7 +49,7 @@
                             <h4 style="position: relative;">Insurer List</h4>
                         </div>
                     </div>
-                <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+                <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>
diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php
index ae9ef65a..6689488a 100644
--- a/app/Views/insurer_statement_list.php
+++ b/app/Views/insurer_statement_list.php
@@ -175,7 +175,7 @@ table.dataTable tbody td {
                 </div><div class="dataTables_length d-flex align-items-center">
                 </div>
                 <div>
-                    <table class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                    <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>
@@ -425,7 +425,7 @@ table.dataTable tbody td {
                             <button type="button" id="add_row_btn" class="btn btn-secondary float-right"><i class="fa fa-plus"></i></button>
 
 
-                            <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>
diff --git a/app/Views/irda_bap_insurer_report_list.php b/app/Views/irda_bap_insurer_report_list.php
index 116e201d..7d9e9773 100644
--- a/app/Views/irda_bap_insurer_report_list.php
+++ b/app/Views/irda_bap_insurer_report_list.php
@@ -32,7 +32,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th></th>
diff --git a/app/Views/irda_client_report_list.php b/app/Views/irda_client_report_list.php
index 70ba446f..e3006e95 100644
--- a/app/Views/irda_client_report_list.php
+++ b/app/Views/irda_client_report_list.php
@@ -32,7 +32,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S. No</th>
diff --git a/app/Views/kyc_docs.php b/app/Views/kyc_docs.php
index 9bb1ab5a..22636a6d 100755
--- a/app/Views/kyc_docs.php
+++ b/app/Views/kyc_docs.php
@@ -6,7 +6,7 @@
 
     <div class="table-responsive" id="branch_table" >
         
-        <table class="table table-borderless table-nowrap mb-0" id="table-kyc-docs">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0" id="table-kyc-docs">
             <thead class="thead-light">
                 <tr>
                     <th>File Name</th>
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index 8e8eefd6..ff785b59 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -49,7 +49,7 @@
                             <h4 style="position: relative;">KYC List</h4>
                         </div>
                     </div>
-                <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+                <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>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index e0c5b0f2..5783afbf 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -545,7 +545,8 @@ rgba(0, 153, 158, 0.5)  (transparent)
     font-style: normal;     
     font-size: 30px;
     line-height: 1;         
-    letter-spacing: 0;      
+    letter-spacing: 0;  
+    color:black;    
 }
 .sub-title-text {
     font-weight: 500;       
@@ -670,69 +671,66 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus {
     outline: 0;
     box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
 
-.app-table-head th {
+thead th {
     background-color: #00999E;
     color: #fff !important;
     border-top: 0px solid #fff !important;
     border-bottom: 0px solid #fff !important;
 }
 
-.app-table-body td {
+tbody td {
     background: #F5FFFF;   
     padding: 12px;
     border-top: 0px solid #fff !important;
-    border-bottom: 0px solid #fff !important;
+    border-bottom: 2px solid #C3EDEE !important;
 }
 
-.app-table-head th:first-child {
+thead th:first-child {
     border-top-left-radius: 15px !important;
     border-bottom-left-radius: 15px !important;
 }
-.app-table-head th:last-child {
+thead th:last-child {
     border-top-right-radius: 15px !important;
     border-bottom-right-radius: 15px !important;
 }
 
-.app-table-body tr td:first-child {
+tbody tr td:first-child {
     border-top-left-radius: 15px !important;
     border-bottom-left-radius: 15px !important;
 }
-.app-table-body tr td:last-child {
+tbody tr td:last-child {
     border-top-right-radius: 15px !important;
     border-bottom-right-radius: 15px !important;
 }
 
-.app-table-body tr:hover td {
+tbody tr:hover td {
     background-color: #e0e0e0;
 }
 
-.app-datatable {
-    border-collapse: separate !important;
-    border-spacing: 0 8px !important; /* space between rows */
-    width: 100%;
+table[data-custom-table-css="table"] {
+   border-collapse: separate !important;
+   border-spacing: 0 8px !important;
+   width: 100%;
 }
 
+
+
+
     </style>
     
     <style>
+        
         label{
             font-weight: 500 !important;
             font-size:0.875rem !important;
         }
-    </style>
-    <style>
         .dataTables_info , .text , #client_logo{
             font-weight: 500 !important;
             color:#000 !important;
         }
-    </style>
-
-    <style>
         .right-bar{
             right : -300px;
         }
-    </style>
-    <style>
         .dash-tab-font{
             font-weight: 500 !important;
             font-size:0.875rem !important;  
diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php
index 42948856..f15c18b0 100644
--- a/app/Views/leads_list.php
+++ b/app/Views/leads_list.php
@@ -160,7 +160,7 @@ table.dataTable tbody td {
                 </div>
                 <div>
                     <div class="table-responsive">
-                        <table class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                        <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
 
                             <thead class="bg-light">
                                 <tr>
@@ -485,7 +485,7 @@ document.addEventListener("click", function(e) {
                 console.log("******** 1" + response.status);
                 let table = `
                 <div class="table-responsive">
-                        <table id="historytable" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                        <table data-custom-table-css="table" id="historytable" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
 
                             <thead class="bg-light">
                                 <tr>
diff --git a/app/Views/log_view.php b/app/Views/log_view.php
index d7791d34..ebb77fc0 100644
--- a/app/Views/log_view.php
+++ b/app/Views/log_view.php
@@ -20,7 +20,7 @@ table.dataTable tbody td {
     <p style="color: red;"><?= session()->getFlashdata('error') ?></p>
 <?php endif; ?>
 
-<table class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+<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>
diff --git a/app/Views/notification old.php b/app/Views/notification old.php
index c606b064..11cc74ed 100644
--- a/app/Views/notification old.php	
+++ b/app/Views/notification old.php	
@@ -276,7 +276,7 @@
 
                         <input type="file" id="Question_title_fileInput" style="display: none;">
 
-                        <table id="attachment_table" class="table table-sm mb-0" style="margin-top: 30px;">
+                        <table data-custom-table-css="table" id="attachment_table" class="table table-sm mb-0" style="margin-top: 30px;">
                             <thead>
                                 <tr>
                                     <th>Attachments</th>
@@ -446,7 +446,7 @@
 
 
                         <input type="file" id="Question_title_fileInput" style="display: none;">
-                        <table id="attachment_table_ecard" class="table table-sm mb-0" style="margin-top: 30px;">
+                        <table data-custom-table-css="table" id="attachment_table_ecard" class="table table-sm mb-0" style="margin-top: 30px;">
                             <thead>
                                 <tr>
                                     <th>Attachments</th>
diff --git a/app/Views/notification.php b/app/Views/notification.php
index cffe679b..7ab83ccb 100755
--- a/app/Views/notification.php
+++ b/app/Views/notification.php
@@ -271,7 +271,7 @@
 
                         <input type="file" id="Question_title_fileInput" style="display: none;">
 
-                        <table id="attachment_table" class="table table-sm mb-0" style="margin-top: 30px;">
+                        <table data-custom-table-css="table" id="attachment_table" class="table table-sm mb-0" style="margin-top: 30px;">
                             <thead>
                                 <tr>
                                     <th>Attachments</th>
@@ -450,7 +450,7 @@
 
 
                         <input type="file" id="Question_title_fileInput" style="display: none;">
-                        <table id="attachment_table_ecard" class="table table-sm mb-0" style="margin-top: 30px;">
+                        <table data-custom-table-css="table" id="attachment_table_ecard" class="table table-sm mb-0" style="margin-top: 30px;">
                             <thead>
                                 <tr>
                                     <th>Attachments</th>
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index 682180a8..25f89043 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -167,7 +167,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S.No</th>
diff --git a/app/Views/policies.php b/app/Views/policies.php
index 08e8059f..558e5772 100755
--- a/app/Views/policies.php
+++ b/app/Views/policies.php
@@ -6,7 +6,7 @@
 
     <div class="table-responsive" id="branch_table" >
         
-        <table class="table table-borderless table-nowrap mb-0" id="table-policies">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0" id="table-policies">
             <thead class="thead-light">
                 <tr>
                     <th>Insurer</th>
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index 13791cd2..2b6431e7 100755
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -155,7 +155,7 @@
 
                 <div class="col-md-8" style="margin-bottom:10px">
 
-                    <table>
+                    <table data-custom-table-css="table">
                         <tbody>
                             <tr>
                                 <td style="width: 11%;"><span style="margin-right:20px;color:black;">Self:</span></td>
@@ -283,7 +283,7 @@
                     </div>
 
                     <div style="margin-top:10px">
-                        <table>
+                        <table data-custom-table-css="table">
                             <tbody>
                                 <tr>
                                     <td style="width: 22%;">
diff --git a/app/Views/policy_gpa_terms.php b/app/Views/policy_gpa_terms.php
index 513ee345..64395581 100755
--- a/app/Views/policy_gpa_terms.php
+++ b/app/Views/policy_gpa_terms.php
@@ -136,7 +136,7 @@
                     <label for=""></label>
                 </div>
                 <div class="col-md-6">
-                    <table>
+                    <table data-custom-table-css="table">
                         <tbody>
                             <tr>
                                 <td></td>
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index 53c61966..546ff2ab 100755
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -2917,7 +2917,7 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
     
         <div class="form-group col-md-12">
             <label>Choose applicable family members</label>
-            <table style="border-collapse: collapse;">
+            <table data-custom-table-css="table" style="border-collapse: collapse;">
                 <tbody>`;
 
 
diff --git a/app/Views/policy_grid_excel.php b/app/Views/policy_grid_excel.php
index 6634f35a..10ee30b7 100755
--- a/app/Views/policy_grid_excel.php
+++ b/app/Views/policy_grid_excel.php
@@ -339,7 +339,7 @@ function generateTable(unique_id) {
         }
     }
 
-    var table = $('<table class="table table-striped compact-table" />');
+    var table = $('<table data-custom-table-css="table" class="table table-striped compact-table" />');
     var uniqueRows = new Set();
     var emptyCellCount = 0;
 
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 60be9f72..b90bfe5e 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -349,7 +349,7 @@
                                                                         </div>
 
                                                                         <div id="insurerTableContainer" style="overflow: auto;">
-                                                                            <table class="table table-bordered co_share_table" id="insurerTable">
+                                                                            <table data-custom-table-css="table" class="table table-bordered co_share_table" id="insurerTable">
                                                                                 <thead>
                                                                                     <tr>
                                                                                         <th>Premium Details</th>
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index 03530e65..e15ccfd8 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -305,7 +305,7 @@ custom-dropdown-menu {
                     </div>
                 </div>
                 <div>
-                <table class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
                         <tr>
                             <th>Sno</th>
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index ba236dd8..fa46e077 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -642,7 +642,7 @@
                                                                         </div>
 
                                                                         <div id="insurerTableContainer" style="overflow: auto;">
-                                                                            <table class="table table-bordered co_share_table" id="insurerTable">
+                                                                            <table data-custom-table-css="table" class="table table-bordered co_share_table" id="insurerTable">
                                                                                 <thead>
                                                                                     <tr>
                                                                                         <th>Premium Details</th>
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index ff8a98da..0bbb124d 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -274,7 +274,7 @@ table.dataTable tbody td {
                     </div>
                 </div>
                 <div>
-                    <table class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                    <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
                         <thead class="bg-light">
                             <tr>
                                 <th><div class="column-header">S.No.</div></th>
diff --git a/app/Views/policy_type_list.php b/app/Views/policy_type_list.php
index c9ddf181..81a6fbad 100755
--- a/app/Views/policy_type_list.php
+++ b/app/Views/policy_type_list.php
@@ -78,7 +78,7 @@
                             <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> -->
-                <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+                <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>
diff --git a/app/Views/rack_rate_test.php b/app/Views/rack_rate_test.php
index c6c22d0e..cec32c86 100755
--- a/app/Views/rack_rate_test.php
+++ b/app/Views/rack_rate_test.php
@@ -122,7 +122,7 @@
                     <ul id="suggestions"></ul>
             </div>
                 </div>
-                <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="emptable">
+                <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="emptable">
                     <thead class="bg-light">
                         <tr>
                             <th class="small-width">SNO</th>
@@ -159,7 +159,7 @@
                                                     </div>
                                                     <div class="modal-body">
 
-                                                    <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="oldrestable" style="display: none;">
+                                                    <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="oldrestable" style="display: none;">
                                                         <thead class="bg-light">
                                                             <tr>
                                                                 <th class="small-width">SNO</th>
@@ -186,7 +186,7 @@
                                                     </table>
 
 
-                                                    <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="restable">
+                                                    <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="restable">
                                                         <thead class="bg-light">
                                                             <tr>
                                                                 <th class="small-width">SNO</th>
@@ -225,7 +225,7 @@
                                                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                                                     </div>
                                                     <div class="modal-body">
-                                                     <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="restable">
+                                                     <table data-custom-table-css="table" class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="restable">
                                                         <thead class="bg-light">
                                                             <tr>
                                                                 
diff --git a/app/Views/report_bds.php b/app/Views/report_bds.php
index dea26ba3..5978e44f 100644
--- a/app/Views/report_bds.php
+++ b/app/Views/report_bds.php
@@ -40,7 +40,7 @@ table.dataTable tbody td {
     <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>
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S. No</th>
@@ -142,7 +142,7 @@ table.dataTable tbody td {
             </div>
             <div class="modal-body" id="modal_body">
                 <div class="table-responsive">
-                    <table class="table table-hover mb-0">
+                    <table data-custom-table-css="table" class="table table-hover mb-0">
                         <thead  class="bg-light" id="table_head_data">
                             <tr>
                                 <th>Statement No.</th>
diff --git a/app/Views/report_bds_old.php b/app/Views/report_bds_old.php
index 0caa9383..06c84ba2 100644
--- a/app/Views/report_bds_old.php
+++ b/app/Views/report_bds_old.php
@@ -32,7 +32,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S. No</th>
diff --git a/app/Views/tat_report_band_wise_list.php b/app/Views/tat_report_band_wise_list.php
index a41ff23c..7bc6972c 100644
--- a/app/Views/tat_report_band_wise_list.php
+++ b/app/Views/tat_report_band_wise_list.php
@@ -32,7 +32,7 @@
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead>
                         <tr>
                             <?php
diff --git a/app/Views/test_members_list.php b/app/Views/test_members_list.php
index 80e06250..90d153de 100644
--- a/app/Views/test_members_list.php
+++ b/app/Views/test_members_list.php
@@ -122,7 +122,7 @@ th:first-child, td:first-child {
                         <h4 style="position: relative;">Employees</h4>
                     </div>
                 </div>
-                <table class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
+                <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>                            
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 4c38f373..bd1f9984 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -7,17 +7,8 @@
     width: 100%;
 }
 
-/* .table thead th {
-  vertical-align: bottom;
-  border-bottom: 2px solid #fff;
-} */
 
 
-/* Add shadow + spacing row "card" effect */
-tbody tr {
-    /* box-shadow: 0 2px 5px rgba(0,0,0,0.08); */
-}
-
 /* Search input with icon */
 .dataTables_filter {
     position: absolute;
@@ -206,7 +197,7 @@ table thead th {
                 </div>
             </div>
             <div>
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-font-family app-datatable">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-font-family app-datatable">
                     <thead class="app-table-head">
                         <tr>
                             <th>Ticket ID</th>
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index a5bf3ea1..5dc82674 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -612,7 +612,7 @@ function statusHistory(thzId) {
             if (response.status === "success" && response.data.length > 0) {
                 let table = `
                 <div class="table-responsive">
-                    <table class="table w-100 nowrap text-custom-black text-custom app-font-family app-datatable">
+                    <table data-custom-table-css="table" class="table w-100 nowrap text-custom-black text-custom app-font-family app-datatable">
                         <thead class="app-table-head">
                             <tr>
                                 <th class="app-text app-text-white">S.No</th>
diff --git a/app/Views/ticket_feedback_list.php b/app/Views/ticket_feedback_list.php
index f4de0f73..495d59ec 100644
--- a/app/Views/ticket_feedback_list.php
+++ b/app/Views/ticket_feedback_list.php
@@ -50,7 +50,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>Claim Number</th>
diff --git a/app/Views/ticket_history.php b/app/Views/ticket_history.php
index b181408c..31ec5ced 100644
--- a/app/Views/ticket_history.php
+++ b/app/Views/ticket_history.php
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="card-body">
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100">
                     <thead class="bg-light">
                         <tr>
                             <th>Label</th>
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index 07868b35..a915f604 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -54,7 +54,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>Status</th>
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index 5d69d8d9..b5da3f7f 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -71,7 +71,7 @@
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>Template Name</th>
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index 6f5c38b1..e2da677a 100755
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -6,7 +6,7 @@
 
     <div class="table-responsive" id="branch_table" >
         
-        <table class="table table-borderless table-nowrap mb-0">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0">
             <thead class="thead-light">
                 <tr>
                     <th>Branch Name</th>
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index a2a1b5eb..d71009ad 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -49,7 +49,7 @@
                             <h4 style="position: relative;">TPA List</h4>
                         </div>
                     </div>
-                <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+                <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>
diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php
index 71c7c8ac..650e9fa1 100644
--- a/app/Views/variance_report_list.php
+++ b/app/Views/variance_report_list.php
@@ -160,7 +160,7 @@ table.dataTable tbody td {
 
             </div>
             <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S.No</th>
diff --git a/app/Views/vehicle_docs.php b/app/Views/vehicle_docs.php
index 11581e4d..d5d2a83f 100644
--- a/app/Views/vehicle_docs.php
+++ b/app/Views/vehicle_docs.php
@@ -45,7 +45,7 @@
 
             </div>
             <div class="table-responsive" style="overflow-x: auto;">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
                         <tr>
                             <th>S.No</th>
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index 51311552..e51bfe16 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -71,7 +71,7 @@ table.dataTable tbody td {
                         <h4 style="position: relative;">Vehicle Master List</h4>
                     </div>
                 </div>
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                <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>
diff --git a/app/Views/view_deposit.php b/app/Views/view_deposit.php
index 3f18ce81..f60a5e8a 100755
--- a/app/Views/view_deposit.php
+++ b/app/Views/view_deposit.php
@@ -102,7 +102,7 @@
                     </div>
                 </div>
 
-                <table class="table table-sm table-hover m-0 table-centered dt-responsive w-100" cellspacing="0"
+                <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive w-100" cellspacing="0"
                     id="tickets-table">
                     <thead class="bg-light">
                         <tr>
diff --git a/app/Views/view_file_upload_emp_list.php b/app/Views/view_file_upload_emp_list.php
index 918af33c..96ce9b36 100755
--- a/app/Views/view_file_upload_emp_list.php
+++ b/app/Views/view_file_upload_emp_list.php
@@ -13,7 +13,7 @@ table.dataTable tbody td {
 <div class="responsive-table-plugin">
     <div class="table-rep-plugin">
         <div class="table-responsive" data-pattern="priority-columns">
-            <table id="tech-companies-1" class="table table-striped">
+            <table data-custom-table-css="table" id="tech-companies-1" class="table table-striped">
 
                 <thead class="bg-light">
                     <?php foreach ($thead as $header): ?>
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php
index 87085a6d..3d720833 100644
--- a/app/Views/view_rfq.php
+++ b/app/Views/view_rfq.php
@@ -301,7 +301,7 @@
 
                 <div class="save-indicator" id="saveIndicator">Saved</div>
                 <div class="table-container" id="first_table">
-                    <table id="rfqTable" class="table table-bordered mt-3">
+                    <table data-custom-table-css="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>
@@ -355,7 +355,7 @@
                 <!-- <button id="getjson" class="btn btn-primary" onclick="generateJSONFromTable()">getjson</button> -->
 
                 <div class="table-container" id="second_table" style="display: none;">
-                    <table id="rfqTable_for_calc" class="table table-bordered mt-3">
+                    <table data-custom-table-css="table" id="rfqTable_for_calc" class="table table-bordered mt-3">
                     </table>
                 </div>
             </div>