diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 070a4c10..baa63298 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -253,10 +253,10 @@ table.dataTable tbody td {
     <div class="row" id="List-page">
         <div class="col-12">
             <div class="card">
-                <div class="card-body">
+                <div class="card-body maincard">
                     <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
-                            <h4 style="position: relative;">User List</h4>
+                            <h4 style="position: relative;">Users</h4>
                         </div>
                     </div>
                     <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0" id="tickets-table">
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index 3e6e0922..b556f4e3 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -55,10 +55,10 @@ table.dataTable thead th {
 <div class="row" id="client_list">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
+            <div class="card-body maincard">
                 <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
-                        <h4 style="position: relative;">CD Master List</h4>
+                        <h4 style="position: relative;">CD Master</h4>
                     </div>
                     <div class="col-6" style="text-align: right; position: relative;top: 56px;">
                         <!-- <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light"
diff --git a/app/Views/insurer_basic_info.php b/app/Views/insurer_basic_info.php
index 88628771..422ae982 100755
--- a/app/Views/insurer_basic_info.php
+++ b/app/Views/insurer_basic_info.php
@@ -1,4 +1,5 @@
 <style>
+    
 .switch {
   position: relative;
   display: inline-block;
@@ -37,11 +38,11 @@
 }
 
 input:checked + .slider {
-  background-color: #2196F3;
+  background-color: #00999E;
 }
 
 input:focus + .slider {
-  box-shadow: 0 0 1px #2196F3;
+  box-shadow: 0 0 1px #00999E;
 }
 
 input:checked + .slider:before {
@@ -60,105 +61,161 @@ input:checked + .slider:before {
 }
 </style>
 
+<style>
+    .form-input-icon {
+        position: relative;
+        width: 100%; /* match Bootstrap's width */
+    }
+
+    .form-input-icon input[type="file"].form-control {
+        padding-right: 40px; /* space for the icon */
+        cursor: pointer;
+    }
+
+    .form-input-icon input[type="file"].form-control::file-selector-button {
+        display: none;
+    }
+
+    .form-input-icon .form-additional-icon {
+        position: absolute;
+        right: 12px;
+        top: 50%;
+        transform: translateY(-50%);
+        font-size: 18px;
+        color: #555;
+        pointer-events: none;
+    }
+
+    input[type="radio"] {
+        accent-color: #40B2B6; /* sets the checked color */
+    }
+
+
+</style>
+
 <div class="tab-pane fade active show" id="general-q-tab">
+
+    <!---- new -----> 
     <div class="row">
         <div class="col-12">
             <div class="card-body">
-                <form role="form" class="parsley-examples" method="post" id="insurer_general_form" enctype="multipart/form-data">
-                    <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
-                    <input type="hidden" name="PrimaryKey" id="insurer_General_PrimaryKey" value="<?= isset($insurer['id']) ? $insurer['id'] : '' ?>" />
-                    <input type="hidden" name="insurer_id" id="insurer_id" />
-                    <div class="form-group">
+            <div class="custom-form">
+            <form role="form" class="parsley-examples" method="post" id="insurer_general_form" enctype="multipart/form-data">
+                <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
+                <input type="hidden" name="PrimaryKey" id="insurer_General_PrimaryKey" value="<?= isset($insurer['id']) ? $insurer['id'] : '' ?>" />
+                <input type="hidden" name="insurer_id" id="insurer_id" />
 
-                        <div class="form-row">
-                            <div class="form-group col-md-4">
-                                <label for="insurer_name">Insurer Name<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="insurer_name" placeholder="Enter Insurer Name" value="<?= isset($insurer['name']) ? $insurer['name'] : '' ?>" name="name" required>
-                            </div>
+                <!-- Insurer Name -->
+                <div class="form-group row">
+                <label for="insurer_name" class="col-md-4 col-form-label">Insurer Name<span class="text-danger">*</span></label>
+                <div class="col-md-5">
+                    <input type="text" class="form-control" id="insurer_name" placeholder="Enter Insurer Name"
+                    value="<?= isset($insurer['name']) ? $insurer['name'] : '' ?>" name="name" required>
+                </div>
+                </div>
+
+                <!-- Short Name -->
+                <div class="form-group row">
+                <label for="short_name" class="col-md-4 col-form-label">Insurer Short Name<span class="text-danger">*</span></label>
+                <div class="col-md-5">
+                    <input type="text" class="form-control" id="short_name" placeholder="Enter Short Name"
+                    value="<?= isset($insurer['short_name']) ? $insurer['short_name'] : '' ?>"  name="short_name" required minlength="3" maxlength="8">
+                </div>
+                </div>
+
+                <!-- Insurer Type -->
+                <div class="form-group row">
+                <label class="col-md-4 col-form-label">Insurer Type</label>
+                <div class="col-md-6 d-flex align-items-center">
+                    <input type="radio" id="type_pvt" name="type" value="pvt" 
+                    <?= isset($insurer['type']) && $insurer['type'] == 'pvt' ? 'checked' : '' ?>>
+                    <label for="type_pvt" class="mr-3 ml-2 mt-1 ">PVT</label>
+                    <input type="radio" id="type_psu" name="type" value="psu"
+                    <?= isset($insurer['type']) && $insurer['type'] == 'psu' ? 'checked' : '' ?>>
+                    <label for="type_psu" class="mr-3 ml-2 mt-1 ">PSU</label>
+                </div>
+                </div>
+
+                <!-- Insurer Category -->
+                <div class="form-group row">
+                <label class="col-md-4 col-form-label">Insurer Category</label>
+                <div class="col-md-6 d-flex align-items-center">
+                    <input type="radio" id="cat_life" name="category" value="life" 
+                    <?= isset($insurer['category']) && $insurer['category'] == 'life' ? 'checked' : '' ?>>
+                    <label for="cat_life" class="mr-3 ml-2 mt-1 ">Life</label>
+                    <input type="radio" id="cat_general" name="category" value="general"
+                    <?= isset($insurer['category']) && $insurer['category'] == 'general' ? 'checked' : '' ?>>
+                    <label for="cat_general" class="mr-3 ml-2 mt-1 ">General (Non Life)</label>
+                </div>
+                </div>
+
+                <!-- Add one day (Addition) -->
+                <div class="form-group row">
+                <label class="col-md-4 col-form-label">Add one day to date of coverage when Addition/Dependent addition</label>
+                <div class="col-md-6 d-flex align-items-center">
+                    <label class="switch">
+                    <input id="addition_add_day" type="checkbox" name="addition_add_day"
+                        <?= (isset($insurer['addition_add_day']) && $insurer['addition_add_day'] == 1) ? 'checked' : '' ?>>
+                    <span class="slider round" style="height: 27px;"></span>
+                    </label>
+                </div>
+                </div>
+
+                <!-- Add one day (Deletion) -->
+                <div class="form-group row">
+                <label class="col-md-4 col-form-label">Add one day to date of Deletion</label>
+                <div class="col-md-6 d-flex align-items-center">
+                    <label class="switch">
+                    <input id="deletion_add_day" type="checkbox" name="deletion_add_day"
+                        <?= (isset($insurer['deletion_add_day']) && $insurer['deletion_add_day'] == 1) ? 'checked' : '' ?>>
+                    <span class="slider round" style="height: 27px;"></span>
+                    </label>
+                </div>
+                </div>
+
+
+                <!-- Multievent Export -->
+                <div class="form-group row">
+                <label class="col-md-4 col-form-label">Multievent Export</label>
+                <div class="col-md-6 d-flex align-items-center">
+                    <label class="switch mb-0">
+                    <input id="is_multi_event" type="checkbox" name="is_multi_event"
+                        <?= (isset($insurer['is_multi_event']) && $insurer['is_multi_event'] == 1) ? 'checked' : '' ?>>
+                    <span class="slider round" style="height: 27px;"></span>
+                    </label>
+                </div>
+                </div>
+
+                <!-- Logo -->
+                <div class="form-group row">
+                <label for="insurer_logo" class="col-md-4 col-form-label">Insurer Logo</label>
+                <div class="col-md-5">
+                        <div class="form-input-icon">
+                            <input type="file" class="form-control" id="insurer_logo" name="insurer_logo" 
+                                accept="image/jpeg, image/jpg, image/png" onchange="PreviewImage();">
+                            <i class="mdi mdi-upload form-additional-icon"></i>
                         </div>
+                </div>
+                <div class="col-md-3">
+                    <img src="<?= isset($insurer['insurer_logo']) && !empty($insurer['insurer_logo']) ? base_url() . "public/uploads/logo/" . $insurer['insurer_logo'] : base_url() . "public/assets/images/avatar_2x.png" ?>" 
+                    width="100" height="100" id="uploadPreview" 
+                    class="avatar img-circle img-thumbnail" alt="avatar" />
+                </div>
+                </div>
 
-                        <div class="form-row">
-
-                            <div class="form-group col-md-2">
-                                <label for="short_name">Insurer Short Name<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="short_name" placeholder="Enter Short Name" value="<?= isset($insurer['short_name']) ? $insurer['short_name'] : '' ?>" name="short_name" required minlength="3" maxlength="8">
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label class="switch" style="position: absolute;top: 32px;left: 17px;">
-                                    <input id="addition_add_day" type="checkbox" name="addition_add_day" <?= (isset($insurer['addition_add_day']) && $insurer['addition_add_day'] == 1) ? 'checked' : '' ?>>
-                                    <span class="slider round" style="height: 27px;"></span>
-                                </label>
-                                <label for="addition_add_day" style="position: relative;top: 30px;left: 82px;">Add one day to date of coverage when <br> Addition/Dependent addition</label>                            
-                            </div>
-
-                            <div class="form-group col-md-2">
-                                <label class="switch" style="position: absolute;top: 32px;left: 17px;">
-                                    <input id="deletion_add_day" type="checkbox" name="deletion_add_day" <?= (isset($insurer['deletion_add_day']) && $insurer['deletion_add_day'] == 1) ? 'checked' : '' ?>>
-                                    <span class="slider round" style="height: 27px;"></span>
-                                </label>
-                                <label for="deletion_add_day" style="position: relative;top: 30px;left: 82px;">Add one day to date of Deletion </label>                            
-                            </div>
-
-                        </div>
-
-                        <div class="form-row">
-
-                            <div class="form-group col-md-2">
-                                <label for="html">Insurer Type</label><br>
-                                <div style="margin-top: 10px;">
-                                    <input type="radio" id="html" name="type" value="pvt" <?= isset($insurer['type']) && $insurer['type'] == 'pvt' ? 'checked' : '' ?>>
-                                    <label for="html">PVT</label>&nbsp;
-                                    <input type="radio" id="css" name="type" value="psu" <?= isset($insurer['type']) && $insurer['type'] == 'psu' ? 'checked' : '' ?>>
-                                    <label for="css">PSU</label>
-                                </div>
-                            </div>
-
-                            <div class="form-group col-md-2">
-                                <label class="switch" style="position: absolute;top: 34px;left: 17px;">
-                                    <input id="is_multi_event" type="checkbox" name="is_multi_event" <?= (isset($insurer['is_multi_event']) && $insurer['is_multi_event'] == 1) ? 'checked' : '' ?>>
-                                    <span class="slider round" style="height: 27px;"></span>
-                                </label>
-                                <label for="deletion_add_day" style="position: relative;top: 30px;left: 82px;">Multievent Export</label>                            
-                            </div>
-
-                        </div>
-
-                        <div class="form-row">
-                            <div class="form-group col-md-4" style="position: relative;right: 0px;">
-                                <label for="html">Insurer Category</label><br>
-                                <div style="margin-top: 10px;">
-                                    <input type="radio" id="html" name="category" value="life" <?= isset($insurer['category']) && $insurer['category'] == 'life' ? 'checked' : '' ?>>
-                                    <label for="html">Life</label>&nbsp;
-                                    <input type="radio" id="css" name="category" value="general" <?= isset($insurer['category']) && $insurer['category'] == 'general' ? 'checked' : '' ?>>
-                                    <label for="css" style="position: absolute;left: 70px;">General(Non Life)</label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="form-row">
-
-                            <div class="form-group col-md-4">
-                                <label for="short_name">Insurer Logo<span class="text-danger"></span></label>
-                                <input type="file" class="form-control" onchange="PreviewImage();" id="insurer_logo" name="insurer_logo" accept="image/jpeg, image/jpg, image/png">
-                            </div>
-
-                            <div class="form-group col-md-4 float-right" style="position: relative;left: 90px;top: 30px;">
-                                <img src="<?= isset($insurer['insurer_logo']) && !empty($insurer['insurer_logo']) ? base_url() . "public/uploads/logo/" . $insurer['insurer_logo'] : base_url() . "public/assets/images/avatar_2x.png" ?>" width="100" height="100" id="uploadPreview" class="avatar img-circle img-thumbnail" alt="avatar" />
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                    <div class="form-group text-right m-b-0">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
-                        <button type="button" class="btn btn-secondary waves-effect btnBack" id="btnBack">Cancel</button>
-                    </div>
-                </form>
+                <!-- Buttons -->
+                <div class="form-group row">
+                <div class="col-md-12 text-right">
+                    <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
+                    <button type="button" class="btn btn-secondary waves-effect btnBack" id="btnBack">Cancel</button>
+                </div>
+                </div>
+            </form>
+            </div>
             </div>
         </div> <!-- end col-->
     </div>
+    <!---- ends ------>
 </div>
 <!-- end -->
 
diff --git a/app/Views/insurer_branch.php b/app/Views/insurer_branch.php
index 15884264..474716cd 100755
--- a/app/Views/insurer_branch.php
+++ b/app/Views/insurer_branch.php
@@ -1,13 +1,46 @@
-<div class="tab-pane fade" id="branch-tab">
+<style>
+.modal-subtitle {
+
+    font-weight: 500;       
+    font-style: normal;     
+    font-size: 18px;
+    line-height: 100%;      
+    letter-spacing: 0%;
+    text-align: center;
+    margin-top: 5px;         
+    color: #6c757d;         
+}
+</style>
+<!-- Optional CSS -->
+<style>
+/* Make modal really XL and scrollable */
+#branchModal .modal-dialog.modal-xl {
+    max-width: 90%;
+    height: 90vh;
+}
+
+#branchModal .modal-content {
+    height: 100%;
+    overflow: hidden;
+}
+
+#branchModal .modal-body {
+    overflow-y: auto;
+    max-height: 80vh;
+}
+</style>
+
+<div class="tab-pane fade" id="branch-tab" style="padding-left: 25px;">
     
-    <div class="row float-right" style="padding-bottom: 10px;position: relative;right: 13px;">
-            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</button>                
+    <div class="row float-right" style="padding-bottom: 10px;position: relative;">
+            <a href="#" id="btnBranchAdd" class="btn app-btn-primary app-btn-border-radius  mr-2"><span class="mdi mdi-plus" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</a>
     </div>
 
     <div class="table-responsive" id="branch_table" >
         
-        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0" id="branch-datatable">
             <thead class="">
+
                 <tr>
                     <th>Branch Name</th>
                     <th>Branch Code</th>
@@ -19,7 +52,7 @@
         </table>
     </div>
 
-    <div class="row" id="add_branch">
+    <!-- <div class="row" id="add_branch">
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
@@ -132,10 +165,139 @@
                 </form>
             </div>
         </div>
-    </div> <!-- end col-->
+    </div> !-- end col-- -->
 </div>
 <!-- end -->
 
+<!-- Modal -->
+<div class="modal fade" id="branchModal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered modal-xl" style="max-width: 1140px !important;">
+    <div class="modal-content">      
+      <!-- Modal Header -->
+      <div class="modal-header flex-column">
+        <div class="d-flex w-100 justify-content-between align-items-center">
+          <h4 class="modal-title mb-0" id="modalLabel">New Branch</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        </div>
+      </div>
+      
+      <!-- Modal Body -->
+      <div class="modal-body" style="overflow-y:auto; max-height:80vh;">
+        <form id="insurer_branch_form" class="parsley-examples" method="post" enctype="multipart/form-data">
+          <div class="row">
+
+            <!-- Left Section: Branch Details -->
+            <div class="col-md-8 d-flex flex-column" style="max-height: calc(80vh - 50px);">
+              <!-- Branch Name & Code -->
+              <div class="form-row">
+                <div class="form-group col-md-6">
+                  <label for="branch_name">Branch Name <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="branch_name" name="branch_name" required>
+                </div>
+                <div class="form-group col-md-6">
+                  <label for="branch_code">Branch Code <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="branch_code" name="branch_code" required>
+                </div>
+              </div>
+
+              <!-- Address Lines -->
+              <div class="form-row">
+                <div class="form-group col-md-6">
+                  <label for="address1">Address Line 1 <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="address1" name="address1" required>
+                </div>
+                <div class="form-group col-md-6">
+                  <label for="address2">Address Line 2</label>
+                  <input type="text" class="form-control" id="address2" name="address2">
+                </div>
+              </div>
+
+              <!-- State & District -->
+              <div class="form-row">
+                <div class="form-group col-md-6">
+                  <label for="state">State <span class="text-danger">*</span></label>
+                  <select class="form-control" id="state" name="state" required>
+                    <option value="">Select State</option>
+                    <?php foreach($state as $value) { ?>
+                      <option value="<?= $value['id'] ?>"><?= $value['state'] ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+                <div class="form-group col-md-6">
+                  <label for="district">District <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="district" name="district" required>
+                </div>
+              </div>
+
+              <!-- City & Pincode -->
+              <div class="form-row">
+                <div class="form-group col-md-6">
+                  <label for="branch_city">City <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="branch_city" name="city" required>
+                </div>
+                <div class="form-group col-md-6">
+                  <label for="pincode">Pincode <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="pincode" name="pincode" required>
+                </div>
+              </div>
+
+              <!-- Submit / Cancel -->
+                <div class="form-row">
+                <!-- <div class="form-group col-md-12 mt-2"> -->
+                  <div class="mt-2">
+                    <button type="submit" class="btn app-btn-secondary app-btn-border-radius  mr-2" id="btnSubmit">Submit</button>
+                    <button type="button" class="btn app-btn-outline-secondary app-btn-border-radius btnBack" id="btnBack" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                  </div>
+                <!-- </div> -->
+                </div>
+            </div>
+
+            <!-- Right Section: Contact Details -->
+            <div class="col-md-4" style="background:#f8f9fa; max-height: calc(80vh - 50px); overflow-y:auto; border-radius:8px; padding:10px;">
+              
+              <!-- First Contact -->
+              <div class="bg-white p-2 mb-2 rounded">
+                <div class="d-flex justify-content-between align-items-center mb-2">
+                  <h6 class="modal-subtitle mb-0">Contact 1</h6>
+                  <div class="d-flex align-items-center">
+                    <i class="mdi mdi-plus text-primary ac me-3" style="cursor:pointer; font-size:24px !important;" onclick="appendContactHtml()" id="add"></i>
+                    <i class="mdi mdi-trash-can text-danger" style="cursor:pointer; font-size:24px !important;" onclick="removeContact(this)" id="contact_1_remove"></i>
+                  </div>
+                </div>
+
+                <!-- Contact Form Fields -->
+                <input type="hidden" name="primarykey[]" id="contact_id_1" value=""/>
+                <div class="form-group mb-2">
+                  <label for="name_1">Name <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" placeholder="Enter Contact Name" name="name[]" id="name_1" required>
+                </div>
+                <div class="form-group mb-2">
+                  <label for="designation_1">Designation <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" placeholder="Enter Designation Name" name="designation[]" id="designation_1" required>
+                </div>
+                <div class="form-group mb-2">
+                  <label for="email_1">Email <span class="text-danger">*</span></label>
+                  <input type="email" class="form-control" placeholder="Enter Contact Email" name="email[]" id="email_1" required>
+                </div>
+                <div class="form-group mb-2">
+                  <label for="mobile_1">Mobile <span class="text-danger">*</span></label>
+                  <input type="tel" class="form-control" placeholder="Enter Contact Mobile" pattern="[0-9]{10}" name="mobile[]" id="mobile_1" required>
+                </div>
+              </div>
+
+              <!-- Container for dynamically added contacts -->
+              <div id="container"></div>
+
+            </div>
+
+          </div>
+        </form>
+      </div>
+
+    </div>
+  </div>
+</div>
+
 
 <script>
 
@@ -146,8 +308,10 @@
     $(document).ready(function () {
 
         insurer_Branch_PrimaryKey = $('#insurer_id_branch').val();
+        var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+        myModal.hide();
             
-        $('#add_branch').hide();
+        // $('#add_branch').hide();
         $('.btnBack').hide();    
 
         if(insurer_Branch_PrimaryKey !== ''){
@@ -169,6 +333,10 @@
             $('#insurer_branch_list').append(branchTable); 
         }
 
+                $('#branch-datatable').DataTable({
+                    paging: true ,
+                    searching: true
+                });        
     }); 
 
 
@@ -177,10 +345,12 @@
         $("#insurer_branch_form")[0].reset();
         contactCount = 1
         insurer_branch_form_action = '<?= base_url("master/insurer/branch/create"); ?>';
-        $('#add_branch').show();
-        $('#branch_table').hide();
+        var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+        myModal.show();
+        // $('#add_branch').show();
+        // $('#branch_table').hide();
         $('.btnBack').show();
-        $('#btnBranchAdd').hide();
+        // $('#btnBranchAdd').hide();
 
         $('#branch_name').val('');
         $('#branch_code').val('');
@@ -220,10 +390,12 @@
 
         $("#insurer_branch_form")[0].reset();
         contactCount = 1
-        $('#add_branch').hide();
-        $('#branch_table').show();
+        var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+        myModal.hide();
+        // $('#add_branch').hide();
+        // $('#branch_table').show();
         $('.btnBack').hide();
-        $('#btnBranchAdd').show();
+        // $('#btnBranchAdd').show();
 
         $('#branch_name').val('');
         $('#branch_code').val('');
@@ -279,10 +451,13 @@
                     });
 
                     $('#insurer_branch_list').append(insurerBranchTableInsert); 
-                    $('#add_branch').hide();
-                    $('#branch_table').show();
+                    var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+                    myModal.hide();
+
+                    // $('#add_branch').hide();
+                    // $('#branch_table').show();
                     $('.btnBack').hide();
-                    $('#btnBranchAdd').show();
+                    // $('#btnBranchAdd').show();
 
                 },
                 error: function (xhr, status, error) {
@@ -324,10 +499,12 @@
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
                 }, 1000);
-                $('#add_branch').show();
-                $('#branch_table').hide();
+                var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+                myModal.show();
+                // $('#add_branch').show();
+                // $('#branch_table').show();
                 $('.btnBack').show();
-                $('#btnBranchAdd').hide();
+                // $('#btnBranchAdd').hide();
                 $('#branch_name').val(res.insurerbranch.branch_name);
                 $('#branch_code').val(res.insurerbranch.branch_code);
                 $('#state option[value="' + res.insurerbranch.state + '"]').prop('selected', true);
@@ -377,35 +554,42 @@
         var uniqueId = Date.now().toString(); 
 
         var html = `
-        <div id="${uniqueId}">
-            <hr>
-            <h6 class="header-title">Contact ${contactCount}</h6>
+        <div id="${uniqueId}" class="bg-white p-2 m-1 rounded">
+         <div class="bg-white p-2 mb-2 rounded">
+            <div class="d-flex justify-content-between align-items-center mb-2">
+                  <h6 class="modal-subtitle mb-0">Contact ${contactCount}</h6>
+                  <div class="d-flex align-items-center">
+                    <i class="mdi mdi-plus text-primary ac me-3" style="cursor:pointer; font-size:24px !important;" onclick="appendContactHtml()" id="${uniqueId}_add"></i>
+                    <i class="mdi mdi-trash-can text-danger" style="cursor:pointer; font-size:24px !important;" onclick="removeContact(this)" id="${uniqueId}_remove"></i>
+                  </div>
+            </div>
             <br>
             <div class="form-row">
                 <input type="hidden" name="primarykey[]" id="contact_id_1" value="${contact !== undefined && contact !== false ? contact.id : ''}"/>
-                <div class="form-group col-md-6">
+                <div class="form-group col-md-12">
                     <label for="${uniqueId}_first_name">Name<span class="text-danger">*</span></label>
                     <input value="${contact !== undefined && contact !== false ? contact.name : ''}" type="text" class="form-control" placeholder="Enter Contact Name" name="name[]" id="${uniqueId}_name" required>
                 </div>
-                <div class="form-group col-md-6">
+            </div>
+            <div class="form-row">
+                <div class="form-group col-md-12">
                     <label for="${uniqueId}_last_name">Email<span class="text-danger">*</span></label>
                     <input data-parsley-type="email" value="${contact !== undefined && contact !== false ? contact.email : ''}" type="email" class="form-control" placeholder="Enter Contact Email" name="email[]" id="${uniqueId}_email" required>
                 </div>
             </div>
             <div class="form-row">
-                <div class="form-group col-md-6">
+                <div class="form-group col-md-12">
                     <label for="${uniqueId}_mobile">Mobile<span class="text-danger">*</span></label>
                     <input data-parsley-type="number" data-parsley-length="[10,10]" pattern="[0-9]{10}" value="${contact !== undefined && contact !== false ? contact.mobile : ''}" type="tel" class="form-control" placeholder="Enter Contact Mobile" name="mobile[]" id="${uniqueId}_mobile" required>
                 </div>
-                <div class="form-group col-md-6">
+            </div>
+            <div class="form-row">
+                <div class="form-group col-md-12">
                     <label for="${uniqueId}_designation">Designation<span class="text-danger">*</span></label>
                     <input value="${contact !== undefined && contact !== false ? contact.designation : ''}" type="text" class="form-control" placeholder="Enter Designation Name" name="designation[]" id="${uniqueId}_designation" required>
                 </div>
             </div>
-            <div class="form-group" style="display: flex;">
-                <button style="margin-right: 10px;" type="button" class="btn btn-primary btn-sm ac" onclick="appendContactHtml()" id="${uniqueId}_add">Add Contact</button>
-                <button type="button" class="btn btn-danger btn-sm" onclick="removeContact(this)" id="${uniqueId}_remove">Remove</button>
-            </div>
+         </div>
         </div>
         `;
 
diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php
index 5f97ebf0..2f735cd2 100755
--- a/app/Views/insurer_export_templete.php
+++ b/app/Views/insurer_export_templete.php
@@ -45,37 +45,40 @@
     }
 </style>
 
-<div class="tab-pane fade" id="template-tab">
+<div class="tab-pane fade" id="template-tab" style="padding-left: 25px;">
 
     <input type="hidden" id="insurer_templete_count" value="<?= isset($insurer_templete_count) ? $insurer_templete_count : ''?>">
     <input type="hidden" id="insurer_id" value="<?= isset($insurer['id']) ? $insurer['id'] : '' ?>">
  
     <div class="row">
         <div class="form-group col-md-4">
+            <div class="custom-form">
             <label for="email">Existing Insurer Export<span class="text-danger">*</span></label>
             <select class="form-control" id="insurer" name="insurer" required>
                 <option value="">Select Insurer</option>
             </select>
+            </div>
         </div>
 
         <div class="form-group col-md-6" style="position: relative;top: 28px;">
             <label for="email"><span class="text-danger"></span></label>
-            <a href="#" class="btn btn-primary waves-effect waves-light" onclick="checkInsurerTemplete(this)">Copy</a>
+            <a href="#" class="btn app-btn-secondary app-btn-border-radius mr-2" onclick="checkInsurerTemplete(this)">Copy</a>
         </div>
         
-        <div class="form-group col-md-2" style="position: relative;top: 28px;left: 80px;">
-            <label for="email"><span class="text-danger"></span></label>
-            <a href="#" class="btn btn-primary waves-effect waves-light" onclick="addNewJsonExportTemplate(this)">Add New</a>
+        <div class="form-group col-md-2" style="position: relative;top: 28px;">
+            <div class="float-right">
+                <label for="email"><span class="text-danger"></span></label>
+                <a href="#" class="btn app-btn-primary app-btn-border-radius" onclick="addNewJsonExportTemplate(this)"><i class="mdi mdi-plus"></i> Add </a>
+            </div>
         </div>
-
+      
     </div>
 
-    <hr>
-
     <div class="table-responsive" id="branch_table" >
         
-        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0" id="insurer_datatable">
             <thead class="">
+
                 <tr>
                     <th>S.NO</th>
                     <th>Policy Type</th>
@@ -164,7 +167,7 @@
 
                     </div>
 
-                    <hr>
+                    <hr class="mb-0">
 
                     <!-- <div class="form-row dynamic-form-row">
                         <div class="form-group col-md-5">
@@ -191,7 +194,7 @@
 
                     </div>
                 <div class="form-group text-right m-b-0" id="hide_smbt_btn">
-                    <button type="submit" class="btn btn-primary waves-effect waves-light mr-1">Submit</button>
+                    <button type="submit" class="btn btn-primary app-btn-border-radius waves-effect waves-light mr-1">Submit</button>
                 </div>
             </form>
             </div>
@@ -255,7 +258,15 @@
     $(document).ready(function(){
         $('#insurer').select2();
         // $('#event').select2();
-        featchInsurerList()
+        featchInsurerList();
+
+        setTimeout(() => {
+                $('#insurer_datatable').DataTable({
+                    paging: true ,
+                    searching: true
+                });
+        }, 2000);
+
     })
     
     $('#templateForm').submit(function(event) {
@@ -471,7 +482,12 @@
         const newRow = document.createElement('div');
         newRow.className = 'form-row dynamic-form-row';
         newRow.innerHTML = `
-
+        <div class="mt-3 p-3" style="width: 100%; background: #F7F7F7; 
+            border-radius: 30px !important;  
+            display: flex; 
+            gap: 10px;
+            opacity: 1;
+        ">
             <div class="form-group col-md-3">
                 <label for="db_column_name">DataBase Column Name<span class="text-danger"></span></label>
                 <select class="form-control db-column-name-select dbColumn" name="db_column_name[]" onchange="checkForDuplicates(this); handleDbColumnChange(this)" ${data !== null && data !== undefined && data !== '' && data.default_value != "" && data.default_value != null ? 'disabled' : ''}>
@@ -494,10 +510,11 @@
                 <input id="default_value" value="${data != null && data != undefined && data != '' && data.default_value != "" && data.default_value != null ? data.default_value : ''}" class="form-control" type="text" name="default_value[]" placeholder="Excel Default value">
             </div>
 
-            <div class="form-group col-md-2" style="position: relative;top: 28px;">
-                <a class="btn btn-primary waves-effect waves-light mr-1" onclick="addHTMLInput(this)">+</a>
-                <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)">x</a>
+            <div class="form-group col-md-2" style="position: relative;left: 28px;">
+                <a class="btn app-btn-secondary app-btn-border-radius waves-effect waves-light mr-1" onclick="addHTMLInput(this)"><i class="mdi mdi-plus text-white" style="cursor:pointer; font-size:15px !important;"></i></a>
+                <a class="btn btn-danger app-btn-border-radius waves-effect waves-light" onclick="removeHTMLInput(this)"><i class="mdi mdi-trash-can text-white" style="cursor:pointer; font-size:15px !important;"></i></a>
             </div>
+        </div>
         `;
         container.appendChild(newRow);
         if (data != null && data.db_column_name != undefined) {
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index ff42e50b..9b52aa41 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -43,10 +43,10 @@
 <div class="row" id="insurer_list">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
+            <div class="card-body maincard">
                     <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
-                            <h4 style="position: relative;">Insurer List</h4>
+                            <h4 style="position: relative;">Insurers</h4>
                         </div>
                     </div>
                 <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index 68c10e80..f56c92ef 100755
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -1,8 +1,8 @@
 <div class="row" id="insurer_add">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
-                <div class="row" style="padding-bottom: 10px;">
+            <div class="card-body maincard">
+                <!-- <div class="row" style="padding-bottom: 10px;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Insurer</h4>
                     </div>
@@ -11,12 +11,19 @@
                             <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> 
                         </a>
                     </div>
-
+                </div> -->
+                <div class="row" style="padding-bottom: 10px;padding-left: 20px;">
+                    <h4 class="d-flex align-items-center" style="gap: 8px;">
+                        <span onclick="history.back()" style="cursor: pointer;">
+                            <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                        </span>
+                        <span class="title-text ">Insurer</span>
+                    </h4>
                 </div>
                 <ul class="nav nav-pills navtab-bg">
                     <li class="nav-item">
                         <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active">
+                            class="nav-link px-3 py-2 active-tab active">
                             <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
                             <span class="d-none d-sm-inline-block">General</span>
                         </a>
diff --git a/app/Views/kyc_docs.php b/app/Views/kyc_docs.php
index 4275c712..623087d3 100755
--- a/app/Views/kyc_docs.php
+++ b/app/Views/kyc_docs.php
@@ -1,4 +1,4 @@
-<div class="tab-pane fade" id="branch-tab">
+<div class="tab-pane fade" id="branch-tab" style="padding-left: 22px;">
     
     <div class="row float-right" style="padding-bottom: 10px;position: relative;right: 13px;">
             <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add KYC Docs</button>                
@@ -18,7 +18,7 @@
         </table>
     </div>
 
-    <div class="row" id="add_branch">
+    <!-- <div class="row" id="add_branch">
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
@@ -52,19 +52,68 @@
                 </form>
             </div>
         </div>
-    </div> <!-- end col-->
+    </div> end col -->
 </div>
 <!-- end -->
 
+<div class="modal fade" id="kycdocsModal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">      
+
+      <!-- Modal Header -->
+      <div class="modal-header flex-column">
+        <div class="d-flex w-100 justify-content-between align-items-center">
+          <h4 class="modal-title mb-0" id="modalLabel">KYC Docs</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+        </div>
+      </div>
+      
+      <!-- Modal Body -->
+      <div class="modal-body" style="overflow-y:auto; max-height:80vh;">
+        <form role="form" class="parsley-examples" method="post" id="kyc_docs_form" enctype="multipart/form-data">
+          
+          <!-- CSRF + hidden inputs -->
+          <input type="hidden" class="form-control" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />    
+          <input type="hidden" name="PrimaryKey" id="kyc_Docs_PrimaryKey" />
+          <input type="hidden" name="kyc_type_id" id="kyc_type_id" value="<?= isset($kyc['id']) ? $kyc['id'] : '' ?>"/>
+
+          <!-- Form fields -->
+          <div class="form-row">
+            <div class="form-group col-md-12">
+              <label for="file_name">KYC Docs File Name <span class="text-danger">*</span></label>
+              <input type="text" class="form-control" id="file_name" name="file_name" placeholder="Enter File Name" required>
+            </div>
+          </div>
+
+          <!-- Form Actions -->
+          <div class="form-group text-right mb-0">
+            <button type="button" class="btn app-btn-outline-secondary app-btn-border-radius waves-effect btnBack" id="btnBack" data-dismiss="modal">
+              Cancel
+            </button>
+            <button type="submit" class="btn app-btn-secondary app-btn-border-radius waves-effect waves-light mr-1" id="btnSubmit">
+              Submit
+            </button>
+          </div>
+          
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+
+
 <script>
 
 $(document).ready(function () {
 
     var kyc_Docs_PrimaryKey = $('#kyc_General_PrimaryKey').val();
     var kyc_docs_form_action = '';
-    
-    $('#add_branch').hide();
-    $('.btnBack').hide();
+    var myModal = new bootstrap.Modal(document.getElementById('kycdocsModal'));
+        myModal.hide();
+    // $('#add_branch').hide();
+    // $('.btnBack').hide();
 
     loadKYCDocsList();
 
@@ -72,11 +121,12 @@ $(document).ready(function () {
     $('#btnBranchAdd').click(function(){
 
         kyc_docs_form_action = '<?= base_url("master/kyc/kycdocs/createpost"); ?>';
-
-        $('#add_branch').show();
-        $('#branch_table').hide();
-        $('.btnBack').show();
-        $('#btnBranchAdd').hide();
+        var myModal = new bootstrap.Modal(document.getElementById('kycdocsModal'));
+        myModal.show();
+        // $('#add_branch').show();
+        // $('#branch_table').hide();
+        // $('.btnBack').show();
+        // $('#btnBranchAdd').hide();
 
         $('#file_name').val('');
         $('#state').val('');
@@ -100,11 +150,12 @@ $(document).ready(function () {
     })    
 
     $('.btnBack').click(function(){
-
-        $('#add_branch').hide();
-        $('#branch_table').show();
-        $('.btnBack').hide();
-        $('#btnBranchAdd').show();
+        var myModal = new bootstrap.Modal(document.getElementById('kycdocsModal'));
+        myModal.hide();
+        // $('#add_branch').hide();
+        // $('#branch_table').show();
+        // $('.btnBack').hide();
+        // $('#btnBranchAdd').show();
 
         $('#file_name').val('');
         $('#state').val('');
@@ -189,10 +240,12 @@ $(document).ready(function () {
                         `;   
                     });
                     $('#kyc_docs_list').append(insurerBranchTableInsert); 
-                    $('#add_branch').hide();
-                    $('#branch_table').show();
-                    $('.btnBack').hide();
-                    $('#btnBranchAdd').show();
+                    var myModal = new bootstrap.Modal(document.getElementById('kycdocsModal'));
+                    myModal.hide();
+                    // $('#add_branch').hide();
+                    // $('#branch_table').show();
+                    // $('.btnBack').hide();
+                    // $('#btnBranchAdd').show();
                 },
                 error: function (xhr, status, error) {
                     console.error(xhr.responseText);
@@ -223,10 +276,12 @@ $(document).ready(function () {
                     $('.loader-mask').delay(350).fadeOut('slow');
                 }, 1000);
                 console.log("right.........");
-                $('#add_branch').show();
-                $('#branch_table').hide();
-                $('.btnBack').show();
-                $('#btnBranchAdd').hide();
+                var myModal = new bootstrap.Modal(document.getElementById('kycdocsModal'));
+                myModal.show();
+                // $('#add_branch').show();
+                // $('#branch_table').hide();
+                // $('.btnBack').show();
+                // $('#btnBranchAdd').hide();
                 $('#file_name').val(res.policies.file_name);
                 $('#kyc_Docs_PrimaryKey').val(res.policies.id);
                 
@@ -314,7 +369,7 @@ $(document).ready(function () {
     setTimeout(() => {
         $('#table-kyc-docs').DataTable({
             paging: true ,
-            searching: false
+            searching: true
         });
     }, 2000);
 }); 
diff --git a/app/Views/kyc_entity_type_basic_info.php b/app/Views/kyc_entity_type_basic_info.php
index 2a0980f6..84a58bc8 100755
--- a/app/Views/kyc_entity_type_basic_info.php
+++ b/app/Views/kyc_entity_type_basic_info.php
@@ -2,6 +2,7 @@
     <div class="row">
         <div class="col-12">
             <div class="card-body">
+                <div class="custom-form">
                 <form role="form" class="parsley-examples" method="post" id="kyc_general_form" enctype="multipart/form-data">
                 <input type="hidden"  value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />    
                 <input type="hidden" name="PrimaryKey" id="kyc_General_PrimaryKey" value="<?= isset($kyc['id']) ? $kyc['id'] : '' ?>"/>
@@ -16,16 +17,17 @@
                             </div>
                         </div>
 
-                        <hr>
+                        <br>
                     </div>
 
                     <div class="form-group text-right m-b-0">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
+                        <button type="submit" class="btn btn-primary app-btn-border-radius waves-effect waves-light mr-1"
                             id="btnSubmit">Submit</button>
                         <button type="button" class="btn btn-secondary waves-effect btnBack"
                             id="btnBack">Cancel</button>
                     </div>
                 </form>
+                </div>
             </div>
         </div> <!-- end col-->
     </div>
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index ff785b59..c1b10112 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -43,10 +43,10 @@
 <div class="row" id="kyc_list">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
+            <div class="card-body maincard">
                     <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
-                            <h4 style="position: relative;">KYC List</h4>
+                            <h4 style="position: relative;">KYC</h4>
                         </div>
                     </div>
                 <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php
index 7ddeefb4..4e1ffd8d 100755
--- a/app/Views/kyc_onboarding.php
+++ b/app/Views/kyc_onboarding.php
@@ -33,19 +33,27 @@ body {
 <div class="row" id="insurer_add">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
-                <div class="row" style="padding-bottom: 10px;">
+            <div class="card-body maincard">
+                <div class="row" style="padding-bottom: 10px;padding-left: 20px;">
+                    <h4 class="d-flex align-items-center" style="gap: 8px;">
+                        <span onclick="history.back()" style="cursor: pointer;">
+                            <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                        </span>
+                        <span class="title-text ">KYC Entity Type</span>
+                    </h4>
+                </div>
+                <!-- <div class="row" style="padding-bottom: 10px;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">KYC Entity Type</h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
                         <a href="<?= base_url("master/kyc/list"); ?>" ><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div>
-                </div>
+                </div> -->
                 <ul class="nav nav-pills navtab-bg">
                     <li class="nav-item">
                         <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active">
+                            class="nav-link px-3 py-2 active-tab active">
                             <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
                             <span class="d-none d-sm-inline-block">General</span>
                         </a>
diff --git a/app/Views/policy_type_basic_info.php b/app/Views/policy_type_basic_info.php
index 6dd82480..3ef7a288 100755
--- a/app/Views/policy_type_basic_info.php
+++ b/app/Views/policy_type_basic_info.php
@@ -2,6 +2,7 @@
     <div class="row">
         <div class="col-12">
             <div class="card-body">
+                <div class="custom-form">
                 <form role="form" class="parsley-examples" method="post" id="policytype_general_form" enctype="multipart/form-data">
                 <input type="hidden"  value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />    
                 <input type="hidden" name="PrimaryKey" id="policytype_General_PrimaryKey" value="<?= isset($policytype['id']) ? $policytype['id'] : '' ?>"/>
@@ -70,16 +71,18 @@
 
                         </div>
 
-                        <hr>
+                        <!-- <hr> -->
+                         <br>
                     </div>
                     
                     <div class="form-group text-right m-b-0">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
+                        <button type="submit" class="btn btn-primary app-btn-border-radius waves-effect waves-light mr-1"
                             id="btnSubmit">Submit</button>
                         <button type="button" class="btn btn-secondary waves-effect btnBack"
                             id="btnBack">Cancel</button>
                     </div>
                 </form>
+                </div>
             </div>
         </div> <!-- end col-->
     </div>
diff --git a/app/Views/policy_type_list.php b/app/Views/policy_type_list.php
index 81a6fbad..b79fc7f2 100755
--- a/app/Views/policy_type_list.php
+++ b/app/Views/policy_type_list.php
@@ -69,7 +69,7 @@
 <div class="row" id="policy_list">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
+            <div class="card-body maincard">
                     <!-- <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Policy Type List</h4>
@@ -78,6 +78,11 @@
                             <a href="<?= base_url("master/policy/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
                         </div>
                     </div> -->
+                    <div class="row" style="margin-bottom:1rem;">
+                        <div class="col-6" style="align-self: center;">
+                            <h4 style="position: relative;">Policy</h4>
+                        </div>
+                    </div>
                 <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
                     id="tickets-table">
                     <thead class="bg-light">
diff --git a/app/Views/policy_type_onboarding.php b/app/Views/policy_type_onboarding.php
index 88a0c68e..c219583c 100755
--- a/app/Views/policy_type_onboarding.php
+++ b/app/Views/policy_type_onboarding.php
@@ -30,23 +30,32 @@ body {
 
 </style>
 
-<div class="row" id="policy_add">
+<div id="policy_add">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
-                <div class="row" style="padding-bottom: 10px;">
+            <div class="card-body maincard">
+                <!-- <div class="row" style="padding-bottom: 10px;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Policy Type</h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
                         <a href="<?= base_url("master/policy/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div>
+                </div> -->
+                <div class="row" style="padding-bottom: 10px;padding-left: 20px;">
+                    <h4 class="d-flex align-items-center" style="gap: 8px;">
+                        <span onclick="history.back()" style="cursor: pointer;">
+                            <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                        </span>
+                        <span class="title-text ">Policy Type</span>
+                    </h4>
                 </div>
                 <ul class="nav nav-pills navtab-bg">
                     <li class="nav-item">
                         <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active">
+                            class="nav-link px-3 py-2 active-tab active">
                             <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
+
                             <span class="d-none d-sm-inline-block">General</span>
                         </a>
                     </li>
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 56dc6134..73e1641f 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -1,11 +1,5 @@
 <style>
 
-
-.maincard{
-    margin-top:0 !important;
-    padding-top: 0 !important;
-}
-
 .col-12 {
 
     max-width: 98% !important;
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 99d76048..0446f52f 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -69,11 +69,6 @@
   transform: scale(1.5); 
 }
 
-.maincard{
-    margin-top:0 !important;
-    padding-top: 0 !important;
-}
-
 .conversation-card,
 .conversation-card .card-header,
 .conversation-card .card-body {
diff --git a/app/Views/tpa_basic_info.php b/app/Views/tpa_basic_info.php
index 575c1c32..6294d4d2 100755
--- a/app/Views/tpa_basic_info.php
+++ b/app/Views/tpa_basic_info.php
@@ -1,7 +1,65 @@
+<style>
+.image-preview {
+    
+    border: 1px solid #00999E;
+    border-radius: 12px;
+    width: 70px;
+    height: 70px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    /* margin-right: 15px; */
+}
+
+.image-preview img {
+    width: 50px;
+    height: 50px;
+    object-fit: contain;
+}
+
+.upload-btn {
+    background-color: #00999E;
+    color: #fff;
+    border: none;
+    border-radius: 25px;
+    padding: 6px 20px;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 14px;
+}
+
+.delete-btn {
+    background-color: #e5f7f6;
+    color: #00999E;
+    border: none;
+    border-radius: 25px;
+    padding: 6px 20px;
+    cursor: pointer;
+    font-size: 14px;
+}
+
+.helper-text {
+    font-size: 12px;
+    color: #666;
+    margin-top: 8px;
+
+    /* wrapping fixes */
+    word-wrap: break-word;     /* old browsers */
+    overflow-wrap: break-word; /* modern browsers */
+    white-space: normal;       /* allow wrapping */
+    max-width: 285px;          /* adjust to your design width */
+}
+
+.hidden-input {
+    display: none;
+}
+</style>
+
 <div class="tab-pane fade active show" id="general-q-tab">
     <div class="row">
         <div class="col-12">
-            <div class="card-body">
+            <div class="card-body" style="padding-top: 0px;">
+                <div class="custom-form">
                 <form role="form" class="parsley-examples" method="post" id="tpa_general_form" enctype="multipart/form-data">
                     <input type="hidden" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
                     <input type="hidden" name="PrimaryKey" id="tpa_General_PrimaryKey" value="<?= isset($tpa['id']) ? $tpa['id'] : '' ?>" />
@@ -22,7 +80,7 @@
                             </div>
                         </div>
 
-                        <hr>
+                        <br>
 
                         <div class="form-row">
                             <div class="form-group col-md-12">
@@ -37,7 +95,7 @@
                             </div>
                         </div>
 
-                        <div class="form-row">
+                        <!-- <div class="form-row">
                             <div class="form-group col-md-4">
                                 <label for="tpa_logo">TPA Logo<span class="text-danger"></span></label>
                                 <input type="file" class="form-control" onchange="PreviewImage();" id="tpa_logo" name="tpa_logo" accept="image/jpeg, image/jpg, image/png">
@@ -50,9 +108,9 @@
                                 <label for="tpa_back_card_image">Back card Image<span class="text-danger"></span></label>
                                 <input type="file" class="form-control" onchange="PreviewImage3();" id="bc" name="bc" accept="image/jpeg, image/jpg, image/png">
                             </div>
-                        </div>
+                        </div> -->
 
-                        <div class="form-row">
+                        <!-- <div class="form-row">
                             <div class="form-group col-md-4">
                                 <label for="tpa_logo_preview">TPA Logo Preview<span class="text-danger"></span></label>
                                 <img src="<?= isset($tpa['tpa_logo']) && !empty($tpa['tpa_logo']) ? base_url() . "public/uploads/logo/" . $tpa['tpa_logo'] : base_url() . "public/assets/images/avatar_2x.png" ?>" width="100" height="100" id="uploadPreview" class="avatar img-circle img-thumbnail" alt="avatar" />
@@ -65,15 +123,118 @@
                                 <label for="tpa_back_card_preview">Back card Preview<span class="text-danger"></span></label>
                                 <img src="<?= isset($tpa['back_card']) && !empty($tpa['back_card']) ? base_url() . "public/uploads/template_bg/" . $tpa['back_card'] : base_url() . "public/assets/images/avatar_2x.png" ?>" width="100" height="100" id="uploadPreview3" class="avatar img-circle img-thumbnail" alt="avatar" />
                             </div>
-                        </div>
+                        </div> -->
+
+                            <div class="form-row">
+                                    <!-- TPA Logo -->
+                                    <div class="form-group col-md-4">
+                                        <label for="tpa_logo">TPA Logo</label>
+                                        <div class="row align-items-center">
+                                            <!-- Left column: Image -->
+                                            <div class="col-auto">
+                                                <div class="image-preview">
+                                                    <img src="<?= isset($tpa['tpa_logo']) && !empty($tpa['tpa_logo']) ? base_url() . "public/uploads/logo/" . $tpa['tpa_logo'] : base_url() . "public/assets/images/avatar_2x.png" ?>" 
+                                                        id="uploadPreview0" 
+                                                        class="avatar img-circle img-thumbnail" 
+                                                        alt="TPA Logo" />
+                                                </div>
+                                            </div>
+
+                                            <!-- Right column: Buttons + text -->
+                                            <div class="col">
+                                                <div class="d-flex">
+                                                    <button type="button" class="upload-btn" onclick="document.getElementById('tpa_logo').click();">Upload</button>
+                                                    <button type="button" class="delete-btn" onclick="removeImage0();">Delete</button>
+                                                </div>
+                                                <div class="helper-text" id="fileNameText0">
+                                                    <?= isset($tpa['tpa_logo']) && !empty($tpa['tpa_logo']) ? $tpa['tpa_logo'] : '( Upload Your TPA Logo )' ?>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <!-- Hidden File Input -->
+                                        <input type="file" class="hidden-input" 
+                                                id="tpa_logo" name="tpa_logo" 
+                                                accept="image/jpeg, image/jpg, image/png" 
+                                                onchange="PreviewImage0(event);" />
+                                    </div>
+                                    <!-- TPA Logo Ends -->
+                                    <!-- Front Image -->
+                                    <div class="form-group col-md-4">
+                                        <label for="tpa_logo">Front card Image</label>
+                                        <div class="row align-items-center">
+                                            <!-- Left column: Image -->
+                                            <div class="col-auto">
+                                                <div class="image-preview">
+                                                    <img src="<?= isset($tpa['front_card']) && !empty($tpa['front_card']) ? base_url() . "public/uploads/template_bg/" . $tpa['front_card'] : base_url() . "public/assets/images/avatar_2x.png" ?>" 
+                                                        id="uploadPreview1" 
+                                                        class="avatar img-circle img-thumbnail" 
+                                                        alt="avatar" />
+                                                </div>
+                                            </div>
+
+                                            <!-- Right column: Buttons + text -->
+                                            <div class="col">
+                                                <div class="d-flex">
+                                                    <button type="button" class="upload-btn" onclick="document.getElementById('fc').click();">Upload</button>
+                                                    <button type="button" class="delete-btn" onclick="removeImage1();">Delete</button>
+                                                </div>
+                                                <div class="helper-text" id="fileNameText1">
+                                                    <?= isset($tpa['front_card']) && !empty($tpa['front_card']) ? $tpa['front_card'] : '( Upload Your Front card Image )' ?>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <!-- Hidden File Input -->
+                                        <input type="file" class="hidden-input" 
+                                                id="fc" name="fc"
+                                                accept="image/jpeg, image/jpg, image/png" 
+                                                onchange="PreviewImage1(event);" />
+                                    </div>                            
+                                    <!-- Front Image Ends -->
+                                    <!-- Back Image -->
+                                    <div class="form-group col-md-4">
+                                        <label for="tpa_logo">Back card Image</label>
+                                        <div class="row align-items-center">
+                                            <!-- Left column: Image -->
+                                            <div class="col-auto">
+                                                <div class="image-preview">
+                                                    <img src="<?= isset($tpa['back_card']) && !empty($tpa['back_card']) ? base_url() . "public/uploads/template_bg/" . $tpa['back_card'] : base_url() . "public/assets/images/avatar_2x.png" ?>"  
+                                                        id="uploadPreview4" 
+                                                        class="avatar img-circle img-thumbnail" 
+                                                        alt="avatar" />
+                                                </div>
+                                            </div>
+
+                                            <!-- Right column: Buttons + text -->
+                                            <div class="col">
+                                                <div class="d-flex">
+                                                    <button type="button" class="upload-btn" onclick="document.getElementById('bc').click();">Upload</button>
+                                                    <button type="button" class="delete-btn" onclick="removeImage4();">Delete</button>
+                                                </div>
+                                                <div class="helper-text" id="fileNameText4">
+                                                    <?= isset($tpa['back_card']) && !empty($tpa['back_card']) ? $tpa['back_card'] : '( Upload Your Back card Image )' ?>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <!-- Hidden File Input -->
+                                        <input type="file" class="hidden-input" 
+                                                id="bc" name="bc" 
+                                                accept="image/jpeg, image/jpg, image/png" 
+                                                onchange="PreviewImage4(event);" />
+                                    </div>
+                                    <!-- Back Image Ends -->
+                            </div>
 
                     </div>
 
                     <div class="form-group text-right m-b-0">
-                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
+                        <button type="submit" class="btn app-btn-secondary app-btn-border-radius waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
                         <button type="button" class="btn btn-secondary waves-effect btnBack" id="btnBack">Cancel</button>
                     </div>
                 </form>
+                </div>
             </div>
         </div> <!-- end col-->
     </div>
@@ -213,7 +374,6 @@
         };
     };
 
-
     function PreviewImage2() {
         var oFReader = new FileReader();
         oFReader.readAsDataURL(document.getElementById("fc").files[0]);
@@ -232,6 +392,75 @@
         };
     };
 
+    function PreviewImage0(event) {
+        const input = event.target;
+        const file = input.files[0];
+        if (file) {
+            // Show preview
+            const reader = new FileReader();
+            reader.onload = function(e) {
+                document.getElementById('uploadPreview0').src = e.target.result;
+            };
+            reader.readAsDataURL(file);
+
+            // Show file name
+            document.getElementById('fileNameText0').innerText = file.name;
+        }
+    }
+
+    function removeImage0() {
+        // Reset preview to default
+        document.getElementById('uploadPreview0').src = "<?= base_url() . 'public/assets/images/avatar_2x.png' ?>";
+        document.getElementById('fileNameText0').innerText = '( Upload Your TPA Logo )';
+        document.getElementById('tpa_logo').value = ""; // clear file input
+    }
+
+    function PreviewImage1(event) {
+        const input = event.target;
+        const file = input.files[0];
+        if (file) {
+            // Show preview
+            const reader = new FileReader();
+            reader.onload = function(e) {
+                document.getElementById('uploadPreview1').src = e.target.result;
+            };
+            reader.readAsDataURL(file);
+
+            // Show file name
+            document.getElementById('fileNameText1').innerText = file.name;
+        }
+    }
+
+    function removeImage1() {
+        // Reset preview to default
+        document.getElementById('uploadPreview1').src = "<?= base_url() . 'public/assets/images/avatar_2x.png' ?>";
+        document.getElementById('fileNameText1').innerText = '( Upload Your Front card Image )';
+        document.getElementById('fc').value = ""; // clear file input
+    }
+
+    function PreviewImage4(event) {
+        const input = event.target;
+        const file = input.files[0];
+        if (file) {
+            // Show preview
+            const reader = new FileReader();
+            reader.onload = function(e) {
+                document.getElementById('uploadPreview4').src = e.target.result;
+            };
+            reader.readAsDataURL(file);
+
+            // Show file name
+            document.getElementById('fileNameText4').innerText = file.name;
+        }
+    }
+
+    function removeImage4() {
+        // Reset preview to default
+        document.getElementById('uploadPreview4').src = "<?= base_url() . 'public/assets/images/avatar_2x.png' ?>";
+        document.getElementById('fileNameText4').innerText = '( Upload Your Back card Image )';
+        document.getElementById('bc').value = ""; // clear file input
+    }
+
     $('#preview').click(function() {
         var ecardContent = $('#ecard_content').val();
         $('#Preview_data').html(ecardContent);
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index 62af2f65..0ca3769e 100755
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -1,13 +1,45 @@
-<div class="tab-pane fade" id="branch-tab">
+<style>
+.modal-subtitle {
+
+    font-weight: 500;       
+    font-style: normal;     
+    font-size: 18px;
+    line-height: 100%;      
+    letter-spacing: 0%;
+    text-align: center;
+    margin-top: 5px;         
+    color: #6c757d;         
+}
+</style>
+<!-- Optional CSS -->
+<style>
+/* Make modal really XL and scrollable */
+#branchModal .modal-dialog.modal-xl {
+    max-width: 90%;
+    height: 90vh;
+}
+
+#branchModal .modal-content {
+    height: 100%;
+    overflow: hidden;
+}
+
+#branchModal .modal-body {
+    overflow-y: auto;
+    max-height: 80vh;
+}
+</style>
+<div class="tab-pane fade" id="branch-tab" style="padding-left: 22px;">
     
-    <div class="row float-right" style="padding-bottom: 10px;position: relative;right: 13px;">
-            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</button>                
+    <div class="row float-right" style="padding-bottom: 10px;position: relative;">
+            <a href="#" id="btnBranchAdd" class="btn app-btn-primary app-btn-border-radius  mr-2"><span class="mdi mdi-plus" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</a>
     </div>
 
     <div class="table-responsive" id="branch_table" >
         
-        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0">
+        <table data-custom-table-css="table" class="table table-borderless table-nowrap mb-0" id="tpa-branch-datatable">
             <thead class="">
+
                 <tr>
                     <th>Branch Name</th>
                     <th>Branch Code</th>
@@ -19,7 +51,7 @@
         </table>
     </div>
 
-    <div class="row" id="add_branch">
+    <!-- <div class="row" id="add_branch">
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
@@ -130,9 +162,137 @@
                 </form>
             </div>
         </div>
-    </div> <!-- end col-->
+    </div> !-- end col-- -->
 </div>
 <!-- end -->
+ <!-- Modal -->
+<div class="modal fade" id="branchModal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered modal-xl" style="max-width: 1140px !important;">
+    <div class="modal-content">      
+      <!-- Modal Header -->
+      <div class="modal-header flex-column">
+        <div class="d-flex w-100 justify-content-between align-items-center">
+          <h4 class="modal-title mb-0" id="modalLabel">New Branch</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        </div>
+      </div>
+      
+      <!-- Modal Body -->
+      <div class="modal-body" style="overflow-y:auto; max-height:80vh;">
+        <form id="insurer_branch_form" class="parsley-examples" method="post" enctype="multipart/form-data">
+          <div class="row">
+
+            <!-- Left Section: Branch Details -->
+            <div class="col-md-8 d-flex flex-column" style="max-height: calc(80vh - 50px);">
+              <!-- Branch Name & Code -->
+              <div class="form-row">
+                <div class="form-group col-md-6">
+                  <label for="branch_name">Branch Name <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="branch_name" name="branch_name" required>
+                </div>
+                <div class="form-group col-md-6">
+                  <label for="branch_code">Branch Code <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="branch_code" name="branch_code" required>
+                </div>
+              </div>
+
+              <!-- Address Lines -->
+              <div class="form-row">
+                <div class="form-group col-md-6">
+                  <label for="address1">Address Line 1 <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="address1" name="address1" required>
+                </div>
+                <div class="form-group col-md-6">
+                  <label for="address2">Address Line 2</label>
+                  <input type="text" class="form-control" id="address2" name="address2">
+                </div>
+              </div>
+
+              <!-- State & District -->
+              <div class="form-row">
+                <div class="form-group col-md-6">
+                  <label for="state">State <span class="text-danger">*</span></label>
+                  <select class="form-control" id="state" name="state" required>
+                    <option value="">Select State</option>
+                    <?php foreach($state as $value) { ?>
+                      <option value="<?= $value['id'] ?>"><?= $value['state'] ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+                <div class="form-group col-md-6">
+                  <label for="district">District <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="district" name="district" required>
+                </div>
+              </div>
+
+              <!-- City & Pincode -->
+              <div class="form-row">
+                <div class="form-group col-md-6">
+                  <label for="branch_city">City <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="branch_city" name="city" required>
+                </div>
+                <div class="form-group col-md-6">
+                  <label for="pincode">Pincode <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="pincode" name="pincode" required>
+                </div>
+              </div>
+
+              <!-- Submit / Cancel -->
+                <div class="form-row">
+                <!-- <div class="form-group col-md-12 mt-2"> -->
+                  <div class="mt-2">
+                    <button type="submit" class="btn app-btn-secondary app-btn-border-radius  mr-2" id="btnSubmit">Submit</button>
+                    <button type="button" class="btn app-btn-outline-secondary app-btn-border-radius btnBack" id="btnBack" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                  </div>
+                <!-- </div> -->
+                </div>
+            </div>
+
+            <!-- Right Section: Contact Details -->
+            <div class="col-md-4" style="background:#f8f9fa; max-height: calc(80vh - 50px); overflow-y:auto; border-radius:8px; padding:10px;">
+              
+              <!-- First Contact -->
+              <div class="bg-white p-2 mb-2 rounded">
+                <div class="d-flex justify-content-between align-items-center mb-2">
+                  <h6 class="modal-subtitle mb-0">Contact 1</h6>
+                  <div class="d-flex align-items-center">
+                    <i class="mdi mdi-plus text-primary ac me-3" style="cursor:pointer; font-size:24px !important;" onclick="appendContactHtml()" id="add"></i>
+                    <i class="mdi mdi-trash-can text-danger" style="cursor:pointer; font-size:24px !important;" onclick="removeContact(this)" id="contact_1_remove"></i>
+                  </div>
+                </div>
+
+                <!-- Contact Form Fields -->
+                <input type="hidden" name="primarykey[]" id="contact_id_1" value=""/>
+                <div class="form-group mb-2">
+                  <label for="name_1">Name <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" placeholder="Enter Contact Name" name="name[]" id="name_1" required>
+                </div>
+                <div class="form-group mb-2">
+                  <label for="designation_1">Designation <span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" placeholder="Enter Designation Name" name="designation[]" id="designation_1" required>
+                </div>
+                <div class="form-group mb-2">
+                  <label for="email_1">Email <span class="text-danger">*</span></label>
+                  <input type="email" class="form-control" placeholder="Enter Contact Email" name="email[]" id="email_1" required>
+                </div>
+                <div class="form-group mb-2">
+                  <label for="mobile_1">Mobile <span class="text-danger">*</span></label>
+                  <input type="tel" class="form-control" placeholder="Enter Contact Mobile" pattern="[0-9]{10}" name="mobile[]" id="mobile_1" required>
+                </div>
+              </div>
+
+              <!-- Container for dynamically added contacts -->
+              <div id="container"></div>
+
+            </div>
+
+          </div>
+        </form>
+      </div>
+
+    </div>
+  </div>
+</div>
 
 <script>
 
@@ -140,23 +300,29 @@ var contactCount = 1;
 
 $(document).ready(function () {
 
+    $('#tpa-branch-datatable').DataTable({
+                    paging: true ,
+                    searching: true
+    });        
+
     var tpa_Branch_PrimaryKey = $('#tpa_id_branch').val();
     var tpa_branch_form_action = '';
-    
-    $('#add_branch').hide();
+    var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+        myModal.hide();
+    // $('#add_branch').hide();
     $('.btnBack').hide();
     
-    
     loadBranchList();
 
     $('#btnBranchAdd').click(function(){
 
         tpa_branch_form_action = '<?= base_url("master/tpa/branch/create"); ?>';
-
-        $('#add_branch').show();
-        $('#branch_table').hide();
+        var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+        myModal.show();
+        // $('#add_branch').show();
+        // $('#branch_table').hide();
         $('.btnBack').show();
-        $('#btnBranchAdd').hide();
+        // $('#btnBranchAdd').hide();
 
         $('#branch_name').val('');
         $('#branch_code').val('');
@@ -196,10 +362,12 @@ $(document).ready(function () {
 
     $('.btnBack').click(function(){
 
-        $('#add_branch').hide();
-        $('#branch_table').show();
+        var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+        myModal.hide();
+        // $('#add_branch').hide();
+        // $('#branch_table').show();
         $('.btnBack').hide();
-        $('#btnBranchAdd').show();
+        // $('#btnBranchAdd').show();
 
         $('#branch_name').val('');
         $('#branch_code').val('');
@@ -257,24 +425,34 @@ $(document).ready(function () {
                     console.log(res);
                     $('#tpa_branch_list tr').remove();
                     var tpaBranchTableInsert = ''
-                    $.each(res.data, function(index, item) {
+                     if (data.length === 0) {
                         tpaBranchTableInsert += `
                             <tr>
-                                <td>${item.branch_name}</td>
-                                <td>${item.branch_code}</td>
-                                <td>
-                                <a class="mdi mdi-lead-pencil btnBranchEdit" href="#" data-id="${item.id}" style="font-size:18px;"></a>
-                                <a style="color:#02a8b5" data-id="${item.id}" onclick="removeTPABranch(this)"><i data-id="${item.id}" class="mdi mdi-delete"  style="font-size:18px;"></i></a>
-                                </td>
-
+                                <td colspan="3" class="text-center app-text-black">No data available in table</td>
                             </tr>
-                        `;   
-                    });
+                        `;
+                    } else {
+                        $.each(res.data, function(index, item) {
+                            tpaBranchTableInsert += `
+                                <tr>
+                                    <td>${item.branch_name}</td>
+                                    <td>${item.branch_code}</td>
+                                    <td>
+                                    <a class="mdi mdi-lead-pencil btnBranchEdit" href="#" data-id="${item.id}" style="font-size:18px;"></a>
+                                    <a style="color:#02a8b5" data-id="${item.id}" onclick="removeTPABranch(this)"><i data-id="${item.id}" class="mdi mdi-delete"  style="font-size:18px;"></i></a>
+                                    </td>
+
+                                </tr>
+                            `;   
+                        });
+                    }
                     $('#tpa_branch_list').append(tpaBranchTableInsert); 
-                    $('#add_branch').hide();
-                    $('#branch_table').show();
+                    var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+                        myModal.hide();
+                    // $('#add_branch').hide();
+                    // $('#branch_table').show();
                     $('.btnBack').hide();
-                    $('#btnBranchAdd').show();
+                    // $('#btnBranchAdd').show();
                 },
                 error: function (xhr, status, error) {
                     console.error(xhr.responseText);
@@ -307,10 +485,12 @@ $(document).ready(function () {
                 }, 1000);
                 console.log("tpa.............");
                 console.log(res)
-                $('#add_branch').show();
-                $('#branch_table').hide();
+                var myModal = new bootstrap.Modal(document.getElementById('branchModal'));
+                    myModal.show();
+                // $('#add_branch').show();
+                // $('#branch_table').hide();
                 $('.btnBack').show();
-                $('#btnBranchAdd').hide();
+                // $('#btnBranchAdd').hide();
                 $('#branch_name').val(res.tpabranch.branch_name);
                 $('#branch_code').val(res.tpabranch.branch_code);
                 $('#state option[value="' + res.tpabranch.state + '"]').prop('selected', true);
@@ -367,18 +547,26 @@ $(document).ready(function () {
                         $('.loader-mask').delay(350).fadeOut('slow');
                     }, 1000);
                     var branchTable = '';
-                    $.each(response.tpa_branch, function(index, item) {
+                    if (data.length === 0) {
                         branchTable += `
                             <tr>
-                                <td>${item.branch_name}</td>
-                                <td>${item.branch_code}</td>
-                                <td>
-                                    <a class="mdi mdi-lead-pencil btnBranchEdit" href="#" data-id="${item.id}" style="font-size:18px;"></a>
-                                    <a style="color:#02a8b5" data-id="${item.id}" onclick="removeTPABranch(this)"><i data-id="${item.id}" class="mdi mdi-delete"  style="font-size:18px;"></i></a>
-                                </td>
+                                <td colspan="3" class="text-center app-text-black ">No data available in table</td>
                             </tr>
-                        `;   
-                    });
+                        `;
+                    } else {
+                        $.each(response.tpa_branch, function(index, item) {
+                            branchTable += `
+                                <tr>
+                                    <td>${item.branch_name}</td>
+                                    <td>${item.branch_code}</td>
+                                    <td>
+                                        <a class="mdi mdi-lead-pencil btnBranchEdit" href="#" data-id="${item.id}" style="font-size:18px;"></a>
+                                        <a style="color:#02a8b5" data-id="${item.id}" onclick="removeTPABranch(this)"><i data-id="${item.id}" class="mdi mdi-delete"  style="font-size:18px;"></i></a>
+                                    </td>
+                                </tr>
+                            `;   
+                        });
+                    }
                     $('#tpa_branch_list').html(branchTable);
                 },
                 error: function(xhr, status, error) {
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index d71009ad..ace4ba84 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -43,10 +43,10 @@
 <div class="row" id="tpa_list">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
+            <div class="card-body maincard">
                     <div class="row" style="margin-bottom:1rem;">
                         <div class="col-6" style="align-self: center;">
-                            <h4 style="position: relative;">TPA List</h4>
+                            <h4 style="position: relative;">TPA</h4>
                         </div>
                     </div>
                 <table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
diff --git a/app/Views/tpa_onboarding.php b/app/Views/tpa_onboarding.php
index 107d61f9..f674e048 100755
--- a/app/Views/tpa_onboarding.php
+++ b/app/Views/tpa_onboarding.php
@@ -34,18 +34,25 @@ body {
     <div class="col-12">
         <div class="card">
             <div class="card-body">
-                <div class="row" style="padding-bottom: 10px;">
-                    <div class="col-6" style="align-self: center;">
+                <div class="row" style="padding-bottom: 10px;padding-left: 20px;">
+                    <h4 class="d-flex align-items-center" style="gap: 8px;">
+                        <span onclick="history.back()" style="cursor: pointer;">
+                            <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                        </span>
+                        <span class="title-text ">TPA</span>
+                    </h4>
+            
+                    <!-- <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">TPA</h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
                         <a href="<?= base_url("master/tpa/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
-                    </div>
+                    </div> -->
                 </div>
                 <ul class="nav nav-pills navtab-bg">
                     <li class="nav-item">
                         <a href="#general-q-tab" data-toggle="tab" aria-expanded="false"
-                            class="nav-link px-3 py-2 active">
+                            class="nav-link px-3 py-2 active-tab active">
                             <span class="mr-1"><i class="mdi mdi-contacts"></i></span>
                             <span class="d-none d-sm-inline-block">General</span>
                         </a>
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index 15f7678e..a64b0646 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -65,10 +65,10 @@ table.dataTable tbody td {
 <div class="row" id="client_list">
     <div class="col-12">
         <div class="card">
-            <div class="card-body">
+            <div class="card-body maincard">
                 <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
-                        <h4 style="position: relative;">Vehicle Master List</h4>
+                        <h4 style="position: relative;">Vehicle Master</h4>
                     </div>
                 </div>
                 <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">