diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index b7de1d73..e8452cd0 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -223,6 +223,20 @@ table.dataTable tbody td {
     .text-danger {
         color: #dc3545;
     }
+
+    .btn-color{
+        background-color: rgba(52, 174, 178, 1);
+        color: white;
+        border:1px solid rgba(52, 174, 178, 1);
+    }
+
+    .btn-color:hover{
+        background-color: rgba(41, 139, 142, 1);
+        color: white;
+        border:1px solid  rgba(41, 139, 142, 1);
+    }
+
+
 </style>
 
 <!-- End ADD and EDIT Page HTML -->
@@ -234,9 +248,6 @@ table.dataTable tbody td {
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">User List</h4>
                         </div>
-                        <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                            <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="modal" data-target="#con-close-modal" data-placement="top" title="Add" data-trigger="hover">ADD</button>                
-                        </div>
                     </div>
                     <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">
@@ -372,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">
+        <table class="tooltip-table" style="color: black;">
             <thead>
                 <tr>
                     <th>Team</th>
@@ -464,7 +475,7 @@ table.dataTable tbody td {
 
 <div class="tooltip-container" id="roleTooltipContainer">
     <div class="tooltip" id="roleAccessMatrixTooltip">
-        <table class="tooltip-table">
+        <table class="tooltip-table" style="color: black;">
             <thead>
                 <tr>
                     <th>Team</th>
@@ -520,7 +531,20 @@ table.dataTable tbody td {
                     exportOptions: {
                         columns: ':not(:last-child)'
                     }
+                },
+                {
+                    text: 'ADD',
+                    className: 'btn-color',
+                    attr: {
+                        id: 'btnAdd',
+                        title: 'Add'
+                    },
+                    action: function () {
+                        $('#con-close-modal').modal('show');
+                    }
                 }
+
+
             ],
 
 
diff --git a/app/Views/bds_dash.php b/app/Views/bds_dash.php
index 9f27e8a2..52996c3f 100644
--- a/app/Views/bds_dash.php
+++ b/app/Views/bds_dash.php
@@ -158,14 +158,19 @@
 
 
 <div class="tab-pane <?= isset($add_active_calss) ? $add_active_calss : 'fade' ?>" id="bds-dash-tab" >
-    <div class="row">
-        <div class="StatusTileHide" style="display: none; padding-bottom: 10px;padding-left: 17px">
-            <a href="#" onclick="hide_status_show_pending_tile()" ><i class="mdi mdi-arrow-left"></i> Back to Overview</a>
+
+
+    <div class="row d-flex  align-items-center">
+        <div class="StatusTileHide" style="padding-left: 25px;">
+            <a href="#" onclick="hide_status_show_pending_tile()" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
         </div>
-        <div class="StatusTileHide" style="display: none;padding-left: 30px;">
-                <a href="#" id="mainMenuTiles">Current Tile : </a>
+        <div class="StatusTileHide" style="display: none;padding-left: 15px;">
+            <a href="#" id="mainMenuTiles">Current Tile : </a>
         </div>
     </div>
+    <br>
+
+
     <div class="row">
         <div class="col inside-tab-content-div">
                     <?php if (in_array(BUSINESS_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
@@ -310,7 +315,7 @@ function show_business_status_tile(){
 
     $('.businessStatusTile').show()
     $('.StatusTileHide').show()
-    $("#mainMenuTiles").text("Viewing Details of Business Team Pending");
+    $("#mainMenuTiles").text(" Business Team Pending");
 
     $('.businessPendingTile').hide()
     $('.financePendingTile').hide()
@@ -338,7 +343,7 @@ function show_finance_status_tile(){
 
     $('.financePendingTile').hide()
     $('.businessPendingTile').hide()
-    $("#mainMenuTiles").text("Viewing Details of Finance Team Pending");
+    $("#mainMenuTiles").text("Finance Team Pending");
 
 
 }
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index 8e7bb060..1df5c220 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -44,9 +44,7 @@ table.dataTable thead th {
     cursor: pointer !important;
 }   
 
-.addbtnStyle{
-    margin-left: 20px !important;
-}
+
 
 .dataTables_filter {
     position: absolute;
@@ -231,7 +229,7 @@ table.dataTable thead th {
                 }, 
                 {
                     text: 'Add',
-                    className: 'buttons-html5 addbtnStyle',
+                    className: 'buttons-html5 ',
                     action: function (e, dt, node, config) {
                         showCdMasterAddModal();
                     }
diff --git a/app/Views/claims_dash.php b/app/Views/claims_dash.php
index e9b0973d..e5a104a6 100644
--- a/app/Views/claims_dash.php
+++ b/app/Views/claims_dash.php
@@ -139,6 +139,7 @@
         border:2px solid #09B9BF;
         box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.2);
         min-width: 250px;
+        max-width: 250px;
     }
 
     #claims-dash-tab{
@@ -199,20 +200,22 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
     </div>
 
 
-    <div class="row">
-        <div class="goBack" style="padding-bottom: 10px;padding-left: 17px;">
-            <a href="#" onclick="hideAndShowTile('2')" ><i class="mdi mdi-arrow-left"></i> Back to Overview<br></a>
+    <div class="row d-flex  align-items-center">
+        <div class="goBack" style="padding-left: 25px;">
+            <a href="#" onclick="hideAndShowTile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
         </div>
-        <div class="goBack" style="display: none;padding-left: 30px;">
+        <div class="goBack" style="display: none;padding-left: 15px;">
             <a href="#" id="current_tile">Current Tile : </a>
         </div>
     </div>
+    <br>
+    
     <div class="row">
         <div class="col inside-tab-content-div">
-                    <?php
-        $colorSetCount = count($colorShades); // Number of color sets
-        $shadeCount = count($colorShades[0]); // Number of shades per set
-        $index = 0;
+        <?php
+            $colorSetCount  = count($colorShades); // Number of color sets
+            $shadeCount     = count($colorShades[0]); // Number of shades per set
+            $index = 0;
         ?>
 
         <?php foreach ($claim_data as $ticketTypeId => $statuses) : ?>
@@ -239,16 +242,23 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
                 $truncatedStatus = strlen($formattedStatus) > 20 ? substr($formattedStatus, 0, 15) . '...' : $formattedStatus;
                 $showTooltip = strlen($formattedStatus) > 20;
                 ?>
+
+                <?php 
+                     $formattedStatus = explode('-',$formattedStatus);
+                ?>
                 
                 <div class="claimStatusTitle claimStatusTitle_<?=$ticketTypeId?>" style="display: none;">
                     <div class="card dash-card"  onclick="linkRedirectForClaims(<?= $ticketTypeId ?>, '<?= $status ?>','<?= $statuses[$status . '_ids'] ?? '' ?>')">
                         <div class="card-block">
-                            <h5 class="text-right"
-                                <?= $showTooltip ? 'data-toggle="tooltip" title="' . htmlspecialchars($formattedStatus, ENT_QUOTES, 'UTF-8') . '"' : '' ?>>
-                                <span class="f-left"> <?= $truncatedStatus ?> </span>
+                            <h5 class="text-right <?= isset($formattedStatus[1]) ? 'mt-1 mb-0':''?>">
+                                <span class="f-left" style="word-break: break-word; white-space: normal;">
+                                    <?= htmlspecialchars($formattedStatus[0], ENT_QUOTES, 'UTF-8') ?>
+                                </span>
                                 <span class="span-color"><?= $count ?></span>
+                                <p class="text-left mt-1 mb-0" style="font-size: x-small !important;"><?= htmlspecialchars($formattedStatus[1]??'', ENT_QUOTES, 'UTF-8') ?></p>
                             </h5>
                         </div>
+
                         
 
                     </div>
@@ -312,13 +322,13 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
             $('.claimStatusTitle_'+claimType).show();
 
             if (claimType == 1) {
-                $('#current_tile').text("Viewing Details For : GMC");
+                $('#current_tile').text(" GMC");
             } else if (claimType == 2) {
-                $('#current_tile').text("Viewing Details For : GPA");
+                $('#current_tile').text(" GPA");
             } else if (claimType == 3) {
-                $('#current_tile').text("Viewing Details For : EDLI");
+                $('#current_tile').text(" EDLI");
             } else if (claimType == 4) {
-                $('#current_tile').text("Viewing Details For : GTLI");
+                $('#current_tile').text(" GTLI");
             }
         }
     }
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index ea7bc6c5..346f9f10 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -1,3 +1,4 @@
+
 <style>
 .table th,
 .table td {
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 3e9b1d51..d37f28e5 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -287,7 +287,7 @@ body {
                     </li>
                     <li class="nav-item">
                         <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                            <span class="mr-1"><i class="fa fa-file"></i></span>
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
                             <span class="d-none d-sm-inline-block">KYC Docs</span>
                         </a>
                     </li>
@@ -318,7 +318,7 @@ body {
                     <li class="nav-item">
                         <a href="#hr-access-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_access_tab" onclick="appendHrAccessControllHtml(this)">
                             <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
-                            <span class="d-none d-sm-inline-block">HR Access Controll</span>
+                            <span class="d-none d-sm-inline-block">HR Access Control</span>
                         </a>
                     </li>
                     <li class="nav-item">
@@ -357,7 +357,7 @@ body {
                         <div class="row">
                             <div class="col-12">
                                 <div class="card">
-                                    <div class="card-body" id="hr_activity_history_append_area" style="position: relative;bottom: 50px;">
+                                    <div class="card-body" id="hr_activity_history_append_area" style="padding-top:0; margin-top:0;">
                                     </div>
                                 </div>
                             </div> <!-- end col -->
@@ -571,19 +571,19 @@ body {
                 const otherContent = otherCard.querySelector('.card-content');
                 const otherIcon = otherCard.querySelector('.accordion-icon i');
                 otherContent.classList.remove('active');
-                otherIcon.classList.remove('fa-chevron-up');
-                otherIcon.classList.add('fa-chevron-down');
+                otherIcon.classList.remove('mdi mdi-chevron-up');
+                otherIcon.classList.add('mdi mdi-chevron-down');
             }
         });
 
         // Toggle current accordion
         content.classList.toggle('active');
         if (content.classList.contains('active')) {
-            icon.classList.remove('fa-chevron-down');
-            icon.classList.add('fa-chevron-up');
+            icon.classList.remove('mdi mdi-chevron-down');
+            icon.classList.add('mdi mdi-chevron-up');
         } else {
-            icon.classList.remove('fa-chevron-up');
-            icon.classList.add('fa-chevron-down');
+            icon.classList.remove('mdi mdi-chevron-up');
+            icon.classList.add('mdi mdi-chevron-down');
         }
     }
 
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 8dfdcce8..4d5503ec 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -23,8 +23,8 @@
 <div class="tab-pane fade" id="police-tab">
 
     <div class="row float-right" style="padding-bottom: 10px; position: relative;right: 13px;">
-        <button type="button" id="BtnAdd" class="btn btn-primary waves-effect waves-light btnAdd btn-sm" style="position: relative;right: 10px;"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy</button>
-        <button type="button" id="BtnAddSuccess" class="btn btn-success waves-effect waves-light BtnAddSuccess btn-sm" onclick="showModal()"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy From Lead</button>
+        <button type="button" id="BtnAdd" class="btn btn-primary waves-effect waves-light btnAdd btn-sm" style="position: relative;right: 10px;"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy</button>
+        <button type="button" id="BtnAddSuccess" class="btn btn-success waves-effect waves-light BtnAddSuccess btn-sm" onclick="showModal()"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy From Lead</button>
     </div>
 
     <div class="table-responsive" id="table_list">
@@ -669,7 +669,7 @@
                     // Conditionally render the delete option based on the role
                     if (role !== 3 && role !== 4) {
                         policyTable += `
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="fa fa-trash mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
+                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="mdi mdi-delete-outline mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
                     }
 
                     policyTable += `              
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index d88a4619..598c5062 100755
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -73,17 +73,17 @@
                     </div>
                     <div class="col-1">
                         <div id="categoryFilter_11">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="fetchEmpolyeeList(event);" data-toggle="tooltip" data-placement="top" title="Search" id="get-emp-list"><i class="fa fa-search" aria-hidden="true"></i></a>
+                            <a class="btn btn-primary waves-effect waves-light" onclick="fetchEmpolyeeList(event);" data-toggle="tooltip" data-placement="top" title="Search" id="get-emp-list"><i class="mdi mdi-magnify" aria-hidden="true"></i></a>
                         </div>
                     </div>
                     <div class="col-0" style="margin-right: 15px; ">
                         <div id="categoryFilter_12">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)" data-toggle="tooltip" data-placement="top" title="Send Reminder"><i class="fa fa-bell" aria-hidden="true"></i></a>
+                            <a class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)" data-toggle="tooltip" data-placement="top" title="Send Reminder"><i class="mdi mdi-bell" aria-hidden="true"></i></a>
                         </div>
                     </div>
                     <div class="col-0">
                         <div id="categoryFilter_13">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" data-toggle="tooltip" data-placement="top" title="Enrollment File Upload"><i class="fas fa-file-upload" ></i></a>
+                            <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" data-toggle="tooltip" data-placement="top" title="Enrollment File Upload"><i class="mdi mdi-file-export" ></i></a>
                         </div>
                     </div>
                     
@@ -92,7 +92,7 @@
                 <!-- <div class="row" style="margin-bottom: 44px;"> -->
                         <div class="col-1 text-right view-status-btn" style="position: relative;bottom: 7px;">
                         <button type="button" class="btn btn-link visa_status_button" onclick="toggleContent()" style="color: #000;" data-toggle="tooltip" data-placement="top" title="View Status Card">
-                            Status <i id="toggleIcon" class="fas fa-minus"></i>
+                            Status <i id="toggleIcon" class="mdi mdi-minus" style="background-color:white"></i>
                         </button>
                     </div>
                 </div>
@@ -466,13 +466,13 @@
                 },
                 {
                     extend: 'pdf',
-                    text: '<i class="fa fa-file-pdf"></i>',
+                    text: '<i class="mdi mdi-file-pdf"></i>',
                     titleAttr: 'PDF',
                     filename: 'Enrolment List'
                 },
                 {
                     extend: 'csv',
-                    text: '<i class="fa fa-file-csv"></i>',
+                    text: '<i class="mdi mdi-file-csv"></i>',
                     titleAttr: 'CSV',
                     filename: 'Enrolment List'
                 }
diff --git a/app/Views/hr_access_controll.php b/app/Views/hr_access_controll.php
index 033b54cb..877bec10 100644
--- a/app/Views/hr_access_controll.php
+++ b/app/Views/hr_access_controll.php
@@ -24,7 +24,7 @@
                                     <p class="user-email"><?= $value['hr_mail'] ?></p>
                                 </div>
                                 <div class="accordion-icon">
-                                    <i class="fas fa-chevron-down"></i>
+                                    <i class="mdi mdi-chevron-down"></i>
                                 </div>
                             </div>
                             <div class="card-content">
diff --git a/app/Views/import_export.php b/app/Views/import_export.php
index 7f2bc15d..604e9853 100755
--- a/app/Views/import_export.php
+++ b/app/Views/import_export.php
@@ -21,7 +21,7 @@
                 </li>
                 <li class="nav-item">
                     <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">Insurer or TPA Data</span>
                     </a>
                 </li>
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 5168ba4f..e7ce6e82 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -26,6 +26,19 @@
     color: #16181b !important;
     cursor: pointer !important;
 }   
+
+.btn-color{
+  background-color: rgba(52, 174, 178, 1);
+  color: white;
+  border:1px solid rgba(52, 174, 178, 1);
+}
+
+.btn-color:hover{
+    background-color: rgba(41, 139, 142, 1);
+    color: white;
+    border:1px solid  rgba(41, 139, 142, 1);
+}
+
 </style>
 <div class="row" id="insurer_list">
     <div class="col-12">
@@ -35,9 +48,6 @@
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Insurer List</h4>
                         </div>
-                        <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                            <a href="<?= base_url("master/insurer/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"
                     id="tickets-table">
@@ -182,6 +192,13 @@ document.addEventListener("DOMContentLoaded", function () {
                 exportOptions: {
                     columns: ':not(:last-child)'
                 }
+            },
+            {
+                text: 'ADD',
+                className: 'btn btn-color',
+                action: function () {
+                    window.location.href = "<?= base_url("master/insurer/create"); ?>";
+                }
             }
         ],
 
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index c1a72d31..8e8eefd6 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -26,6 +26,19 @@
     color: #16181b !important;
     cursor: pointer !important;
 }   
+
+.btn-color{
+  background-color: rgba(52, 174, 178, 1);
+  color: white;
+  border:1px solid rgba(52, 174, 178, 1);
+}
+
+.btn-color:hover{
+    background-color: rgba(41, 139, 142, 1);
+    color: white;
+    border:1px solid  rgba(41, 139, 142, 1);
+}
+
 </style>
 <div class="row" id="kyc_list">
     <div class="col-12">
@@ -35,9 +48,6 @@
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">KYC List</h4>
                         </div>
-                        <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                            <a href="<?= base_url("master/kyc/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"
                     id="tickets-table">
@@ -176,6 +186,13 @@
                 exportOptions: {
                     columns: ':not(:last-child)'
                 }
+            },
+            {
+                text: 'ADD',
+                className: 'btn btn-color',
+                action: function () {
+                    window.location.href = "<?= base_url("master/kyc/create"); ?>";
+                }
             }
         ],
 
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 674143e1..f148d77b 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -246,6 +246,13 @@
                 flex: 1 1 auto; */
             padding: 2rem !important;
         }
+
+        /* Force all text across the entire app to black */
+        html, body, * {
+            color: #000 !important;
+        }
+
+
     </style>
 
     <style>
@@ -489,11 +496,21 @@
 
     <style>
         *{
-            font-family: 'Poppins', sans-serif !important;
+            font-family:  Inter, sans-serif !important;
         }
         .content{
             min-height: 70vh;
         }
+        .tooltip-inner {
+            color: #fff !important;   /* restore white text */
+            background-color: #000 !important; /* keep background black */
+        }
+
+        #current_tile , #main_tile , #mainMenuTiles{
+            font-size: 25px!important;
+            font-weight: 600!important;
+        }
+
     </style>
 
 
diff --git a/app/Views/leads_dash.php b/app/Views/leads_dash.php
index a44c2759..e6874de1 100644
--- a/app/Views/leads_dash.php
+++ b/app/Views/leads_dash.php
@@ -187,14 +187,20 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
 
 
     </div>
-    <div class="row">
-        <div class="status_tile" style="padding-bottom: 10px;padding-left: 17px; margin-left:10px;">
-            <a href="#" onclick="hide_and_show_tile(2)"><i class="mdi mdi-arrow-left"></i> Back to Overview</a>
+
+
+
+
+    <div class="row d-flex  align-items-center">
+        <div class="status_tile" style="padding-left: 25px;">
+            <a href="#" onclick="hide_and_show_tile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
         </div>
-        <div class="status_tile" style="padding-left: 30px;">
+        <div class="status_tile" style="padding-left: 15px;">
             <a href="#" id="main_tile">Current Tile : </a>
         </div>
     </div>
+    <br>
+    
     <div class="row">
         <div class="col inside-tab-content-div">
             <?php
@@ -337,12 +343,12 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
 
         if (type == 1 && leadType != null && leadType == 1) {
             $('.leadStatusTitle_1').show();
-            $('#main_tile').text("Viewing Details For : Leads");
+            $('#main_tile').text(" Leads");
 
         }
         if (type == 1 && leadType != null && leadType == 2) {
             $('.leadStatusTitle_2').show();
-            $("#main_tile").text("Viewing Details For : BDS Renewals");
+            $("#main_tile").text(" BDS Renewals");
 
         }
 
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index 6408f18f..596f7a21 100755
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -138,8 +138,16 @@
                 </div>
 
                 <div class="col-md-6">
-                    <input type="radio" id="familyFloaterYes" name="family_floater" class="family_floater" value="1"> Yes
-                    <input type="radio" id="familyFloaterNo" name="family_floater" class="family_floater" value="0" style="margin-left:10px">No
+                    
+                  &nbsp;&nbsp;  <input type="radio" id="familyFloaterYes" name="family_floater" class="family_floater" value="1"> 
+                    <label for="familyFloaterYes">Yes</label>
+
+                    <br>
+
+                    <input type="radio" id="familyFloaterNo" name="family_floater" class="family_floater" value="0" style="margin-left:10px">
+                    <label for="familyFloaterNo">No</label>
+
+                    
                 </div>
 
                 <div class="col-md-4">
@@ -150,25 +158,25 @@
                     <table>
                         <tbody>
                             <tr>
-                                <td style="width: 11%;"><span style="margin-right: 20px;">Self:</span></td>
-                                <td style="width: 11%;"><input type="checkbox" style="margin-right: 70px;"
+                                <td style="width: 11%;"><span style="margin-right:20px;color:black;">Self:</span></td>
+                                <td style="width: 11%;"><input type="checkbox" style="margin-right: 70px;color:black;"
                                         name="family_floaters[]" value="self" id="self" checked> </td>
                                 <td style="width: 28%;">
-                                    <div class="self-age"><span style="margin-right: 20px;">Min Age:</span><input
+                                    <div class="self-age"><span style="margin-right:20px;color:black;;">Min Age:</span><input
                                             class="underline-input min_age"
                                             value="<?php echo (isset($self_min_age) && $self_min_age > 0) ? $self_min_age : '18'; ?>"
                                             style="width: 35%;;" type="number" name="self_min_age" id="self_min_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
                                 <td style="width: 28%;">
-                                    <div class="self-age"><span style="margin-right: 20px;">Max Age:</span><input
+                                    <div class="self-age"><span style="margin-right:20px;color:black;">Max Age:</span><input
                                             class="underline-input max_age"
                                             value="<?php echo  isset($self_max_age) ? $self_max_age : '60'; ?>"
                                             style="width: 35%;;" type="number" name="self_max_age" id="self_max_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
                                 <!-- <td style="width: 11%;"><span class="self-age"
-                                        style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
+                                        style="margin-right:20px;color:black;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="self-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_self"
                                         id="is_payable_employee_for_self"> </td> -->
@@ -183,25 +191,25 @@
                                 <td></td>
                             </tr>
                             <tr>
-                                <td style="width: 11%;"><span style="margin-right: 20px;">Spouse:</span></td>
+                                <td style="width: 11%;"><span style="margin-right:20px;color:black;">Spouse:</span></td>
                                 <td style="width: 11%;"><input type="checkbox" style="margin-right: 70px;"
                                         name="family_floaters[]" value="spouse" id="spouse"></td>
                                 <td style="width: 28%;">
-                                    <div class="spouse-age"><span style="margin-right: 20px;">Min Age:</span><input
+                                    <div class="spouse-age"><span style="margin-right:20px;color:black;">Min Age:</span><input
                                             class="underline-input min_age"
                                             value="<?php echo  isset($spouse_min_age) ? $spouse_min_age : '18'; ?>"
                                             style="width: 35%;;" type="number" name="spouse_min_age" id="spouse_min_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
                                 <td style="width: 28%;">
-                                    <div class="spouse-age"><span style="margin-right: 20px;">Max Age:</span><input
+                                    <div class="spouse-age"><span style="margin-right:20px;color:black;">Max Age:</span><input
                                             class="underline-input max_age"
                                             value="<?php echo  isset($spouse_max_age) ? $spouse_max_age : '60'; ?>"
                                             style="width: 35%;;" type="number" name="spouse_max_age" id="spouse_max_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
                                 <!-- <td style="width: 11%;"><span class="spouse-age"
-                                        style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
+                                        style="margin-right:20px;color:black;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="spouse-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_spouse"
                                         id="is_payable_employee_for_spouse"> </td> -->
@@ -226,21 +234,21 @@
                                     </select>
                                 </td>
                                 <td style="width: 28%;">
-                                    <div class="child-age"><span style="margin-right: 20px;">Min Age:</span><input
+                                    <div class="child-age"><span style="margin-right:20px;color:black;">Min Age:</span><input
                                             class="underline-input min_age"
                                             value="<?php echo  isset($child_min_age) ? $child_min_age : '0'; ?>"
                                             style="width: 35%;;" type="number" name="child_min_age" id="child_min_age"
                                             oninput="this.value = this.value.replace(/\D/g, '').substring(0, 2)"></div>
                                 </td>
                                 <td style="width: 28%;">
-                                    <div class="child-age"><span style="margin-right: 20px;">Max Age:</span><input
+                                    <div class="child-age"><span style="margin-right:20px;color:black;">Max Age:</span><input
                                             class="underline-input max_age"
                                             value="<?php echo  isset($child_max_age) ? $child_max_age : '25'; ?>"
                                             style="width: 35%;;" type="number" name="child_max_age" id="child_max_age"
                                             oninput="this.value = this.value.replace(/\D/g, '').substring(0, 2)"></div>
                                 </td>
                                 <!-- <td style="width: 11%;"><span class="child-age"
-                                        style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
+                                        style="margin-right:20px;color:black;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="child-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_child"
                                         id="is_payable_employee_for_child"> </td> -->
@@ -261,7 +269,7 @@
                     <div style="margin-top:10px"></div>
 
                     <div style="margin-top:10px">
-                        <span for="family_floaters">Select Other Members:</span>
+                        <span for="family_floaters" style="color:black;">Select Other Members:</span>
                         <select name="family_floaters[]" id="family_floaters" style="margin-left: 10px;">
                             <option value="0">None</option>
                             <option value="1P">Only one parent (Either Father / Mother)</option>
@@ -279,14 +287,14 @@
                             <tbody>
                                 <tr>
                                     <td style="width: 22%;">
-                                        <div class="other-member-age"><span style="margin-right: 20px;">Elders
+                                        <div class="other-member-age"><span style="margin-right:20px;color:black;">Elders
                                                 Count:</span><input class="underline-input" id="member_count"
                                                 style="width: 30%; width: 30%;background: lightgray;" type="number"
                                                 name="elder_member_count" id="member_count" readonly></div>
                                     </td>
                                     <td style="width: 28%;">
                                         <div class="other-member-age" style="margin-left: 32px;"><span
-                                                style="margin-right: 20px;">Min Age:</span><input
+                                                style="margin-right:20px;color:black;">Min Age:</span><input
                                                 class="underline-input min_age"
                                                 value="<?php echo  isset($other_member_min_age) ? $other_member_min_age : '18'; ?>"
                                                 style="width: 35%;;" type="number" class="underline-input min_age"
@@ -295,7 +303,7 @@
                                     </td>
                                     <td style="width: 28%;">
                                         <div class="other-member-age" style="margin-left: 17px;"><span
-                                                style="margin-right: 20px;">Max Age:</span><input
+                                                style="margin-right:20px;color:black;">Max Age:</span><input
                                                 class="underline-input max_age"
                                                 value="<?php echo  isset($other_member_max_age) ? $other_member_max_age : '60'; ?>"
                                                 style="width: 35%;;" type="number" class="underline-input max_age"
@@ -303,7 +311,7 @@
                                                 onchange="lowerIsEighteen(this)"></div>
                                     </td>
                                     <!-- <td style="width: 11%;"><span class="other-member-age"
-                                            style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span>
+                                            style="margin-right:20px;color:black;font-size: 12px;">Is Payable by employee:</span>
                                     </td>
                                     <td style="width: 11%;"><input class="other-member-age" type="checkbox"
                                             style="margin-right: 70px;" name="is_payable_employee_for_elders"
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 8fd2eea3..f4752614 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -836,7 +836,7 @@
 
                             <div class="form-group col-md-3">
                                 <label for="new_vehicle_switch">New Vehicle</label>
-                                <input id="new_vehicle_switch" type="checkbox" name="new_vehicle" value="1"  data-toggle="toggle" data-on="Yes" data-off="No" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218">
+                                <input id="new_vehicle_switch" type="checkbox" name="new_vehicle" value="1"  data-toggle="toggle" data-on="Yes" data-off="No" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218">
                             </div>
                             
                             <div class="form-group col-md-6">
diff --git a/app/Views/pt_form_file_upload_tab.php b/app/Views/pt_form_file_upload_tab.php
index e7c35190..9390d848 100644
--- a/app/Views/pt_form_file_upload_tab.php
+++ b/app/Views/pt_form_file_upload_tab.php
@@ -10,19 +10,19 @@
                 </li>
                 <li class="nav-item">
                     <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab2">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">KYC Docs</span>
                     </a>
                 </li>
                 <li class="nav-item" id="hide_file_upload" style="display: none;">
                     <a href="#fileupload" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">File Upload</span>
                     </a>
                 </li>
                 <li class="nav-item" id="hide_vehicle_tab" style="display: none;">
                     <a href="#vehicle-docs-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="vehicle_tab">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">Vehicle Docs</span>
                     </a>
                 </li>
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index 9f67a034..5d69d8d9 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -23,6 +23,7 @@
 
     .addbtnStyle {
         margin-left: 20px !important;
+        color: #000;
     }
 
     .custom-dropdown-menu {
@@ -51,6 +52,13 @@
         color: #16181b !important;
         cursor: pointer !important;
     }
+    /* strongest, beats most parent rules and pasted styles on wrappers */
+    .jodit-container .jodit-wysiwyg,
+    .jodit-container .jodit-wysiwyg * {
+    color: #000 !important;
+    background-color: #fff !important; /* optional: ensure white background */
+    }
+
 </style>
 
 <div class="col-12">
@@ -279,6 +287,9 @@
             toolbarAdaptive: false,
             saveHeightInStorage: true,
             minHeight: 400,
+            defaultStyle: {
+                color: '#000000'  // 👈 force black text
+            },
             extraButtons: [{
                 name: 'info',
                 iconURL: '<?= base_url() . "public"; ?>/assets/images/image-solid.svg', // Replace with the actual icon URL
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index d6d44e58..a2a1b5eb 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -25,7 +25,21 @@
     background-color: #f8f9fa !important;
     color: #16181b !important;
     cursor: pointer !important;
-}   </style>
+}   
+
+.btn-color{
+  background-color: rgba(52, 174, 178, 1);
+  color: white;
+  border:1px solid rgba(52, 174, 178, 1);
+}
+
+.btn-color:hover{
+    background-color: rgba(41, 139, 142, 1);
+    color: white;
+    border:1px solid  rgba(41, 139, 142, 1);
+}
+
+</style>
 <div class="row" id="tpa_list">
     <div class="col-12">
         <div class="card">
@@ -34,9 +48,6 @@
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">TPA List</h4>
                         </div>
-                        <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                            <a href="<?= base_url("master/tpa/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"
                     id="tickets-table">
@@ -176,7 +187,15 @@ document.addEventListener("DOMContentLoaded", function () {
                 exportOptions: {
                     columns: ':not(:last-child)'
                 }
+            },
+            {
+                text: 'ADD',
+                className: 'btn btn-color',
+                action: function () {
+                    window.location.href = "<?= base_url("master/tpa/create"); ?>";
+                }
             }
+
         ],
 
 
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index af49272b..51311552 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -48,6 +48,18 @@ table.dataTable tbody td {
     cursor: pointer !important;
 }   
 
+    .btn-color{
+        background-color: rgba(52, 174, 178, 1);
+        color: white;
+        border:1px solid rgba(52, 174, 178, 1);
+    }
+
+    .btn-color:hover{
+        background-color: rgba(41, 139, 142, 1);
+        color: white;
+        border:1px solid  rgba(41, 139, 142, 1);
+    }
+
 </style>
 
 <div class="row" id="client_list">
@@ -58,10 +70,6 @@ table.dataTable tbody td {
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Vehicle Master List</h4>
                     </div>
-                    <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                        <button type="button" id="btnAdd" class="btn btn-primary"
-                            onclick="showModal('add')">ADD</button>
-                    </div>
                 </div>
                 <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
@@ -461,7 +469,8 @@ $(document).ready(function() {
         dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
             "<'row'<'col-sm-12'tr>>" +
             "<'row'<'col-sm-5'i><'col-sm-7'p>>",
-        buttons: [{
+        buttons: [
+            {
             extend: 'csv',
             text: 'CSV',
             title: 'Vehicle-Master-List',
@@ -469,7 +478,19 @@ $(document).ready(function() {
             exportOptions: {
                 columns: ':not(:last-child)'
             },
-        }],
+            },
+            {
+                text: 'ADD',
+                className: 'btn-color',
+                attr: {
+                    id: 'btnAdd',
+                    title: 'Add'
+                },
+                action: function () {
+                    showModal('add')
+                }
+            }
+    ],
         language: {
             search: "_INPUT_",
             searchPlaceholder: "Search..."
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php
index 9e906235..87085a6d 100644
--- a/app/Views/view_rfq.php
+++ b/app/Views/view_rfq.php
@@ -567,7 +567,7 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_cd_switch">CD Entry</label>
-                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218" <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
+                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218" <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
                         </div>
 
                         <div class="form-group col-md-3">
@@ -591,7 +591,7 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_installment_switch">Installment </label>
-                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
+                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
                         </div>
 
                         <div class="form-group col-md-3" style="<?= (!empty($lead_data['is_installment']) && $lead_data['is_installment'] == 1) ? 'display: block;' : 'display: none;' ?>">
diff --git a/app/Views/view_rfq_non_eb.php b/app/Views/view_rfq_non_eb.php
index 8e75cf94..89cf7748 100644
--- a/app/Views/view_rfq_non_eb.php
+++ b/app/Views/view_rfq_non_eb.php
@@ -461,7 +461,7 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_cd_switch">CD Entry</label>
-                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218"  <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
+                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218"  <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
                         </div>
 
                         <div class="form-group col-md-3">
@@ -485,7 +485,7 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_installment_switch">Installemnt </label>
-                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218" style="height: 37.53px;" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
+                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218" style="height: 37.53px;" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
                         </div>
 
                         <div class="form-group col-md-3" style="<?= (!empty($lead_data['is_installment']) && $lead_data['is_installment'] == 1) ? 'display: block;' : 'display: none;' ?>">
diff --git a/public/assets/js/pages/treeview.init.js b/public/assets/js/pages/treeview.init.js
index 400c7029..33a26040 100755
--- a/public/assets/js/pages/treeview.init.js
+++ b/public/assets/js/pages/treeview.init.js
@@ -1 +1 @@
-$(document).ready(function(){$("#basicTree").jstree({core:{themes:{responsive:!1}},types:{default:{icon:"mdi mdi-folder-star text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["types"]}),$("#checkTree").jstree({core:{themes:{responsive:!1}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"fa fa-file text-primary"}},plugins:["types","checkbox"]}),$("#dragTree").jstree({core:{check_callback:!0,themes:{responsive:!1}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"fa fa-file text-primary"}},plugins:["types","dnd"]}),$("#ajaxTree").jstree({core:{check_callback:!0,themes:{responsive:!1},data:{url:function(e){return"#"===e.id?"../assets/data/ajax_roots.json":"../assets/data/ajax_children.json"},data:function(e){return{id:e.id}}}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"fa fa-file text-primary"}},plugins:["contextmenu","dnd","search","state","types","wholerow"]})});
\ No newline at end of file
+$(document).ready(function(){$("#basicTree").jstree({core:{themes:{responsive:!1}},types:{default:{icon:"mdi mdi-folder-star text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["types"]}),$("#checkTree").jstree({core:{themes:{responsive:!1}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["types","checkbox"]}),$("#dragTree").jstree({core:{check_callback:!0,themes:{responsive:!1}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["types","dnd"]}),$("#ajaxTree").jstree({core:{check_callback:!0,themes:{responsive:!1},data:{url:function(e){return"#"===e.id?"../assets/data/ajax_roots.json":"../assets/data/ajax_children.json"},data:function(e){return{id:e.id}}}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["contextmenu","dnd","search","state","types","wholerow"]})});
\ No newline at end of file