diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index aa40bc28..2807ce7e 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -81,6 +81,17 @@
         visibility: visible;
         opacity: 1;
     }
+
+    /* dont forgot it keep it safe card and card body space remover */ /* bcoz in design */ 
+    .card-body{ margin-top: 0px !important; } 
+
+    /* this css as per design so not declare in golbal */ /* bcoz in design */ 
+    #collapseOne{
+        border: 1px solid #BFF3F5 !important;
+        border-radius: 10px !important;
+        border-width: 1px !important;
+    }
+
 </style>
 
 <div class="row" id="leads_form">
@@ -89,269 +100,301 @@
             <div class="card-body">
                 <div class="row" style="margin-bottom:1rem;">
 
-                    <div class="col-6" style="align-self: center;">
+                    <!-- <div class="col-6" style="align-self: center;">
                         <h4 id="page_title" style="position: relative;">Add Lead</h4>
                     </div>
                     <div class="col-3" style="text-align: right; position: relative; left: 211px;">
-                        <!-- <button class="btn btn-primary waves-effect waves-light" onclick="fileupload(this)">file upload</button> -->
+                        <!-- <button class="btn btn-primary waves-effect waves-light" onclick="fileupload(this)">file upload</button> ->
                     </div>
                     <div class="col-1" style="text-align: right; position: relative; left: 193px;">
                         <a href="<?= base_url('leads/list') ?>" type="button" id="btnAdd"
                             class="btn btn-primary waves-effect waves-light">Back</a>
-                    </div>
+                    </div> -->
+                    <h4 class="d-flex align-items-center" style="gap: 8px;">
+                        <a href="<?= base_url('leads/list') ?>" style="cursor: pointer;">
+                            <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                        </a>
+                        <span class="title-text" id="page_title" style="position: relative;">Add Lead</span>
+                    </h4>
                 </div>
                 <form role="form" class="parsley-examples" method="post" id="leads_form_id"
                     enctype="multipart/form-data">
 
                     <input type="hidden" name="id" id="leads_primarykey">
 
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                     <div class="card-body">
+                        <div class="form-row">
 
-                        <div class="form-group col-md-3">
-                            <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_type" name="lead_type" required>
-                                <option value="">Select Lead Type</option>
-                                <?php
-                                if (isset($lead_type) && count($lead_type)) {
-                                    foreach ($lead_type as $key => $value) {
-                                        if ($key == 1) {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
+                            <div class="form-group col-md-4">
+                                <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
+                                <select class="form-control" id="lead_type" name="lead_type" required>
+                                    <option value="">Select Lead Type</option>
+                                    <?php
+                                    if (isset($lead_type) && count($lead_type)) {
+                                        foreach ($lead_type as $key => $value) {
+                                            if ($key == 1) {
+                                                echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                            } else {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
+                                            }
+                                        }
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label for="issuer">Issuer<span class="text-danger">*</span></label>
+                                <select class="form-control" id="issuer" name="issuer" required>
+                                    <option value="">Select Issuer</option>
+                                    <?php
+                                    if (isset($issuer) && count($issuer)) {
+                                        foreach ($issuer as $key => $value) {
                                             echo "<option value=" . $key . ">" . $value . "</option>";
                                         }
                                     }
-                                }
-                                ?>
-                            </select>
-                        </div>
+                                    ?>
+                                </select>
+                            </div>
 
-                        <div class="form-group col-md-3">
-                            <label for="issuer">Issuer<span class="text-danger">*</span></label>
-                            <select class="form-control" id="issuer" name="issuer" required>
-                                <option value="">Select Issuer</option>
-                                <?php
-                                if (isset($issuer) && count($issuer)) {
-                                    foreach ($issuer as $key => $value) {
-                                        echo "<option value=" . $key . ">" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
                         </div>
-
+                     </div>
                     </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- client row -->
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
 
-                        <div class="form-group col-md-3 freshFields">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="exixting_client" type="checkbox" name="exixting_client">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
+                                <div class="form-group offset-md-10 col-md-2 freshFields" style="float:right;">
+                                    <label class="switch">
+                                        <input id="exixting_client" type="checkbox" name="exixting_client">
+                                        <span class="slider round" style="height: 27px;"></span>
+                                    </label>
 
-                            <label for="exixting_client" style="position: relative;top: 39px;left: 20px;">Existing Client</label>
+                                    <label for="exixting_client" style="position: relative;top: 2px;">Existing Client</label>
+                                </div>
+
+                            </div>
+                            <div class="form-row">
+
+                                <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="client_id">Client<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_id" name="client_id">
+                                        <option value="">Select Client</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_branch_id" name="client_branch_id"
+                                        onchange="getBranchData(this,1)">
+                                        <option value="">Select Branch</option>
+                                    </select>
+                                </div>
+
+                                <!-- <div class="form-group col-md-3 freshFields">
+                                    <label for="client_type">Client Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_type" name="client_type" required>
+                                        <option value="">Select Client type</option>
+                                        <?php
+                                        if (isset($client_type) && count($client_type)) {
+                                            foreach ($client_type as $key => $value) {
+                                                echo "<option value='" . $key . "' >" . $value . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div> -->
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="entity_type_id" name="entity_type_id" required>
+                                        <option value="" selected>Select Entity</option>
+                                        <?php
+                                        if (isset($entity) && count($entity)) {
+                                            foreach ($entity as $key => $value) {
+                                                echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_name">Client Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="client_name" name="client_name"
+                                        placeholder="Enter Client Name" required>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="client_short_name" name="client_short_name"
+                                        placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
+                                </div>
+
+                                <!-- <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_id"> Source Policy <span id="base_danger"
+                                            class="text-danger">*</span></label>
+                                    <select class="form-control" id="source_policy_id" name="source_policy_id">
+                                        <option value="" selected>Select Source Policy</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
+                                </div>
+
+                                <div class="form-group col-md-3 renewalFields" style="display: none;">
+                                    <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
+                                </div> -->
+
+                                <!-- <div class="form-group col-md-3">
+                                    <label for="pan">PAN<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
+                                        data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
+                                        data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
+                                </div> -->
+
+                            </div>
                         </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_id">Client<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_id" name="client_id">
-                                <option value="">Select Client</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_branch_id" name="client_branch_id"
-                                onchange="getBranchData(this,1)">
-                                <option value="">Select Branch</option>
-                            </select>
-                        </div>
-
-                        <!-- <div class="form-group col-md-3 freshFields">
-                            <label for="client_type">Client Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_type" name="client_type" required>
-                                <option value="">Select Client type</option>
-                                <?php
-                                if (isset($client_type) && count($client_type)) {
-                                    foreach ($client_type as $key => $value) {
-                                        echo "<option value='" . $key . "' >" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div> -->
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="entity_type_id" name="entity_type_id" required>
-                                <option value="" selected>Select Entity</option>
-                                <?php
-                                if (isset($entity) && count($entity)) {
-                                    foreach ($entity as $key => $value) {
-                                        echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_name">Client Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_name" name="client_name"
-                                placeholder="Enter Client Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_short_name" name="client_short_name"
-                                placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
-                        </div>
-
-                        <!-- <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_id"> Source Policy <span id="base_danger"
-                                    class="text-danger">*</span></label>
-                            <select class="form-control" id="source_policy_id" name="source_policy_id">
-                                <option value="" selected>Select Source Policy</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
-                        </div> -->
-
-                        <!-- <div class="form-group col-md-3">
-                            <label for="pan">PAN<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
-                                data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
-                                data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
-                        </div> -->
-
                     </div>
                     <!-- end client row -->
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- branch row-->
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
 
-                        <div class="form-group col-md-3">
-                            <label for="gst">GST<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
-                                data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
-                                data-parsley-trigger="change"
-                                data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
+                                <div class="form-group col-md-4">
+                                    <label for="gst">GST<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
+                                        data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
+                                        data-parsley-trigger="change"
+                                        data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="branch_name" name="branch_name"
+                                        placeholder="Enter Branch Name" required>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="branch_code" name="branch_code"
+                                        placeholder="Enter Branch Code" required>
+                                </div>
+
+                                <div class="form-group col-md-4 renewalFields">
+                                    <label for="contact_person_summary">Contact Person</label>
+                                    <select class="form-control" name="contact_person_summary" id="contact_person_summary">
+                                        <option value="">Select a Contact</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
+                                        placeholder="Enter Contact Name" required>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="contact_person_mobile">Contact Person Mobile<span
+                                            class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="contact_person_mobile"
+                                        name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="contact_person_email">Contact Person Email<span
+                                            class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="contact_person_email"
+                                        name="contact_person_email" placeholder="Enter Contact Email" required>
+                                </div>
+
+                            </div>
                         </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="branch_name" name="branch_name"
-                                placeholder="Enter Branch Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="branch_code" name="branch_code"
-                                placeholder="Enter Branch Code" required>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields">
-                            <label for="contact_person_summary">Contact Person</label>
-                            <select class="form-control" name="contact_person_summary" id="contact_person_summary">
-                                <option value="">Select a Contact</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
-                                placeholder="Enter Contact Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="contact_person_mobile">Contact Person Mobile<span
-                                    class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_mobile"
-                                name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="contact_person_email">Contact Person Email<span
-                                    class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="contact_person_email"
-                                name="contact_person_email" placeholder="Enter Contact Email" required>
-                        </div>
-
                     </div>
 
                     <!-- policy row -->
-                    <div id="dynamic-form-container"></div>
-
-                    <hr>
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div id="dynamic-form-container"></div>
+                        </div>
+                    </div>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- other row -->
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
 
-                        <div class="form-group col-md-3">
-                            <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
-                            <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
-                                <option value="">Select Sales Person</option>
-                                <?php if (isset($salse_team)) { ?>
-                                    <?php foreach ($salse_team as $value) { ?>
-                                        <option value="<?= $value['id']; ?>">
-                                            <?= $value['first_name']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
-                            </select>
-                        </div>
+                                <div class="form-group offset-md-9 col-md-3" style="float:right;">
+                                    <label class="switch">
+                                        <input id="is_insurer_auto_mail" type="checkbox" name="is_insurer_auto_mail">
+                                        <span class="slider round" style="height: 27px;"></span>
+                                    </label>
+                                    <label for="is_insurer_auto_mail" style="position: relative;top: 2px;">Insurer Auto Mail</label>
+                                </div>
 
-                        <div class="form-group col-md-3">
-                            <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_status" name="status" required>
-                                <option value="" selected>Select Status</option>
-                                <?php
-                                if (isset($lead_status) && count($lead_status)) {
-                                    foreach ($lead_status as $key => $value) {
-                                        if ($key == 'queued') {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
-                                            echo "<option value=" . $key . ">" . $value . "</option>";
+                            </div>
+                            <div class="form-row">
+
+                                <div class="form-group col-md-4">
+                                    <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
+                                        <option value="">Select Sales Person</option>
+                                        <?php if (isset($salse_team)) { ?>
+                                            <?php foreach ($salse_team as $value) { ?>
+                                                <option value="<?= $value['id']; ?>">
+                                                    <?= $value['first_name']; ?>
+                                                </option>
+                                            <?php } ?>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
+                                    <select class="form-control" id="lead_status" name="status" required>
+                                        <option value="" selected>Select Status</option>
+                                        <?php
+                                        if (isset($lead_status) && count($lead_status)) {
+                                            foreach ($lead_status as $key => $value) {
+                                                if ($key == 'queued') {
+                                                    echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                } else {
+                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                }
+                                            }
                                         }
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
+                                        ?>
+                                    </select>
+                                </div>
 
-                        <div class="form-group col-md-3">
-                            <label for="">Next Reminder Date<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="next_reminder_date" name="next_reminder_date" placeholder="DD/MM/YYYY">
-                        </div>
+                                <div class="form-group col-md-4">
+                                    <label for="">Next Reminder Date<span class="text-danger"></span></label>
+                                    <div class="input-icon">
+                                        <input type="text" class="form-control" id="next_reminder_date" name="next_reminder_date" placeholder="DD/MM/YYYY">
+                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                                    </div>
+                                </div>
 
-                         <div class="form-group col-md-3">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="is_insurer_auto_mail" type="checkbox" name="is_insurer_auto_mail">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
-
-                            <label for="is_insurer_auto_mail" style="position: relative;top: 35px;left: 20px;">Insurer Auto Mail</label>
-                        </div>
-
-                    </div>
-
-                    <div class="form-row">
-                        <div class="form-group col-md-12">
-                            <label for="notes">Remarks</label>
-                            <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-12">
+                                    <label for="notes">Remarks</label>
+                                    <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                                </div>
+                            </div>
                         </div>
                     </div>
 
@@ -1073,31 +1116,32 @@
         const newRow = document.createElement('div');
         newRow.className = 'form-row dynamic-form-row';
 
+        if (increment > 1) {
         const hrElement = document.createElement('hr');
         container.appendChild(hrElement);
+        }
 
         // Main div
         newRow.innerHTML += `
-
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_id"> Source Policy <span id="base_danger"
-                        class="text-danger">*</span></label>
+                        class="text-danger">* </span></label>
                 <select class="form-control" id="source_policy_id" name="source_policy_id">
                     <option value="" selected>Select Source Policy</option>
                 </select>
             </div>
 
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_start_date">Source Policy Start Date<span class="text-danger"></span></label>
                 <input type="text" class="form-control readonly-select" id="source_policy_start_date" name="source_policy_start_date" readonly>
             </div>
 
-            <div class="form-group col-md-3 renewalFields" style="display: none;">
+            <div class="form-group col-md-4 renewalFields" style="display: none;">
                 <label for="source_policy_end_date">Source Policy End Date<span class="text-danger"></span></label>
                 <input type="text" class="form-control" id="source_policy_end_date" name="source_policy_end_date" readonly>
             </div>
 
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="policy_type_id">Policy Type <span class="text-danger">*</span></label>
                 <select class="form-control" id="policy_type_id_${increment}" name="policy_type_id[]" onchange="getCustomFields(this, ${increment})" required>
                     <option value="">Select Policy Type</option>
@@ -1113,7 +1157,7 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3 proposed_div">
+            <div class="form-group col-md-4 proposed_div">
                 <label for="insurer">Insurer <span class="text-danger"></span></label>
                 <select class="form-control" id="insurer_${increment}" name="insurer[]" onchange="insurerChange(this, ${increment})">
                     <option value="">Select Insurer</option>
@@ -1127,7 +1171,7 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3 proposed_div">
+            <div class="form-group col-md-4 proposed_div">
                 <label for="tpa">TPA <span class="text-danger"></span></label>
                 <select class="form-control" id="tpa_${increment}" name="tpa[]" onchange="tpaChange(this, ${increment})">
                     <option value="">Select TPA</option>
@@ -1141,19 +1185,31 @@
                 </select>
             </div>
             
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="">Date of Commencement <span class="text-danger"></span></label>
-                <input type="text" class="form-control policy_start_date" id="policy_start_date_${increment}" name="policy_start_date[]" placeholder="Enter DOC" onchange="calculatePolicyMetrics(this)">
+                <div class="input-icon">
+                        <input type="text" class="form-control policy_start_date" id="policy_start_date_${increment}" name="policy_start_date[]" placeholder="Enter DOC" onchange="calculatePolicyMetrics(this)">
+                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                </div>
+                
             </div>
 
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-4">
                 <label for="">Date of Expiry <span class="text-danger"></span></label>
-                <input type="text" class="form-control policy_end_date" id="policy_end_date_${increment}" name="policy_end_date[]" placeholder="Enter DOE">
+                <div class="input-icon">
+                            <input type="text" class="form-control policy_end_date" id="policy_end_date_${increment}" name="policy_end_date[]" placeholder="Enter DOE">
+                            <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                </div>
             </div>
 
+            
             <div id="appendArea_${increment}" class = "form-group col-md-12 appendArea"></div>
 
-            <div id="multiFileAppendArea_${increment}"></div>
+            <div class="card" style="width:100%; background-color: transparent;">
+                <div class="card-body" style="background-color: #fff !important; border: 0px !important;">
+                    <div id="multiFileAppendArea_${increment}"></div>
+                </div>
+            </div>
                 
              <div class="form-group col-md-12 btnDiv" style="position: relative;top: 28px;float: right;text-align: end;">
                 <a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)">x</a>
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 484a5f2f..740eb842 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -474,7 +474,7 @@ if (isset($selected_lead_type)) {
 
     // --------------------------------------------------------------------------------------------------------
 
-    function addFileField(increment) {
+    function addFileFieldold(increment) {
 
         console.log('addFileField function called');
 
@@ -519,6 +519,71 @@ if (isset($selected_lead_type)) {
         fileIndex++;
     }
 
+    function addFileField(increment) {
+
+        console.log('addFileField function called');
+
+        const container = document.getElementById(`multiFileAppendArea_${increment}`);
+        if (!container) return;
+
+        // Remove previous "+" buttons if any
+        // const prevAddBtns = container.querySelectorAll('.add-file-btn');
+        // prevAddBtns.forEach(btn => btn.remove());
+
+
+        const div = document.createElement("div");
+        div.className = "form-row d-flex align-items-end";
+        div.setAttribute("id", `fileField_${fileIndex}`);
+
+        let isFirstField = container.childElementCount === 0; // Check if it's the first field
+        let placeholder = isFirstField ? 'First file must be Demography.' : '';
+        let accept = isFirstField ? '.xls,.xlsx' : '';
+
+        
+        if(selected_lead_form_type != 1){
+            placeholder =  '';
+            accept = '';
+        }
+
+        let sample_dwn_btn = "";
+        if(selected_lead_form_type == 1 && isFirstField == 1){
+            sample_dwn_btn = '<button type="button" class="btn app-btn-secondary float-end"  onclick="addFileField(${increment})">Sample Excel</button>';
+        }
+
+        let add_btn = `<button type="button" class="btn app-btn-secondary mr-1 add-file-btn" onclick="addFileField(${increment})">+</button>`;
+
+        div.innerHTML = `
+            <div class="form-group row" id="fileField_${fileIndex}" style="width: 100%;">
+                
+                <div class="col-auto" style="align-content: center;">
+                    <label class="col-form-label">Document Name</label>
+                </div>
+                <div class="col-md-3">
+                    <input type="text" class="form-control" name="docs_name_${increment}[]" placeholder="${placeholder}" style="background: #F5FFFF !important;">
+                </div>
+
+                <div class="col-auto" style="align-content: center;">
+                    <label>File Upload </label>
+                </div>
+                <div class="col-md-3">
+                    <div class="input-icon">
+                        <input type="file" class="form-control" id="file_name_${fileIndex}" name="file_name_${increment}[]" accept="${accept}" style="background: #F5FFFF !important;">
+                        <i class="mdi mdi-upload additional-icon"></i>
+                    </div>
+                </div>
+
+                <div class="col-auto">
+                    <button type="button" class="btn btn-danger mr-1" onclick="removeFileField(${fileIndex})"><span class="mdi mdi-trash-can"></span></button>
+                    ${add_btn}
+                    ${sample_dwn_btn}
+                </div>
+
+            </div>`;
+        
+        container.appendChild(div);
+        fileIndex++;
+    }
+
     function removeFileField(index, lead_file_id = null) {
 
         if(index  == 1){
diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php
index 04e0a15d..df5d5a9a 100644
--- a/app/Views/leads_non_eb.php
+++ b/app/Views/leads_non_eb.php
@@ -36,6 +36,16 @@
         color: white !important;
         margin-right: 5px;
     }
+
+    /* dont forgot it keep it safe card and card body space remover */ /* bcoz in design */ 
+    .card-body{ margin-top: 0px !important; } 
+
+    /* this css as per design so not declare in golbal */ /* bcoz in design */ 
+    #collapseOne{
+        border: 1px solid #BFF3F5 !important;
+        border-radius: 10px !important;
+        border-width: 1px !important;
+    }
 </style>
 
 
@@ -45,13 +55,19 @@
             <div class="card-body">
                 <div class="row" style="margin-bottom:1rem;">
 
-                    <div class="col-6" style="align-self: center;">
+                    <!-- <div class="col-6" style="align-self: center;">
                         <h4 id="page_title" style="position: relative;">Add Lead</h4>
                     </div>
                     <div class="col-6" style="text-align: right; position: relative;">
                         <a href="<?= base_url('leads/list') ?>" type="button" id="btnAdd"
                             class="btn btn-primary waves-effect waves-light">Back</a>
-                    </div>
+                    </div> -->
+                    <h4 class="d-flex align-items-center" style="gap: 8px;">
+                        <a href="<?= base_url('leads/list') ?>" style="cursor: pointer;" type="button" id="btnAdd">
+                            <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                        </a>
+                        <span class="title-text" id="page_title" style="position: relative;">Add Lead</span>
+                    </h4>
                 </div>
                 <form role="form" class="parsley-examples" method="post" id="leads_non_eb_form_id"
                     enctype="multipart/form-data">
@@ -59,135 +75,147 @@
                     <input type="hidden" name="id" id="leads_primarykey">
                     <input type="hidden" name="lead_form_type" id="lead_form_type_id" value="2">
 
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                     <div class="card-body">
+                        <div class="form-row">
 
-                        <div class="form-group col-md-3">
-                            <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_type" name="lead_type" required>
-                                <option value="">Select Lead Type</option>
-                                <?php
-                                if (isset($lead_type) && count($lead_type)) {
-                                    foreach ($lead_type as $key => $value) {
-                                        if ($key == 1) {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
+                            <div class="form-group col-md-4">
+                                <label for="lead_type">Lead Type<span class="text-danger">*</span></label>
+                                <select class="form-control" id="lead_type" name="lead_type" required>
+                                    <option value="">Select Lead Type</option>
+                                    <?php
+                                    if (isset($lead_type) && count($lead_type)) {
+                                        foreach ($lead_type as $key => $value) {
+                                            if ($key == 1) {
+                                                echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                            } else {
+                                                echo "<option value=" . $key . ">" . $value . "</option>";
+                                            }
+                                        }
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label for="issuer">Issuer<span class="text-danger">*</span></label>
+                                <select class="form-control" id="issuer" name="issuer" required>
+                                    <option value="">Select Issuer</option>
+                                    <?php
+                                    if (isset($issuer) && count($issuer)) {
+                                        foreach ($issuer as $key => $value) {
                                             echo "<option value=" . $key . ">" . $value . "</option>";
                                         }
                                     }
-                                }
-                                ?>
-                            </select>
-                        </div>
+                                    ?>
+                                </select>
+                            </div>
 
-                        <div class="form-group col-md-3">
-                            <label for="issuer">Issuer<span class="text-danger">*</span></label>
-                            <select class="form-control" id="issuer" name="issuer" required>
-                                <option value="">Select Issuer</option>
-                                <?php
-                                if (isset($issuer) && count($issuer)) {
-                                    foreach ($issuer as $key => $value) {
-                                        echo "<option value=" . $key . ">" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
                         </div>
-
+                      </div>
                     </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- client row -->
-                    <div class="form-row">
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
 
-                        <div class="form-group col-md-3 freshFields">
-                            <label class="switch" style="position: relative;top: 33px;left: 0px;">
-                                <input id="exixting_client" type="checkbox" name="exixting_client">
-                                <span class="slider round" style="height: 27px;"></span>
-                            </label>
+                                <div class="form-group offset-md-10 col-md-2 freshFields" style="float:right;">
+                                    <label class="switch">
+                                        <input id="exixting_client" type="checkbox" name="exixting_client">
+                                        <span class="slider round" style="height: 27px;"></span>
+                                    </label>
 
-                            <label for="exixting_client" style="position: relative;top: 39px;left: 20px;">Existing Client</label>
+                                    <label for="exixting_client" style="position: relative;top: 2px;">Existing Client</label>
+                                </div>
+
+                            </div>
+                            <div class="form-row">
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="client_id">Client<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_id" name="client_id">
+                                        <option value="">Select Client</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_branch_id" name="client_branch_id"
+                                        onchange="getBranchData(this,1)">
+                                        <option value="">Select Branch</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_type">Client Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="client_type" name="client_type" required>
+                                        <option value="">Select Client type</option>
+                                        <?php
+                                        if (isset($client_type) && count($client_type)) {
+                                            foreach ($client_type as $key => $value) {
+                                                echo "<option value='" . $key . "' >" . $value . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="entity_type_id" name="entity_type_id" required>
+                                        <option value="" selected>Select Entity</option>
+                                        <?php
+                                        if (isset($entity) && count($entity)) {
+                                            foreach ($entity as $key => $value) {
+                                                echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_name">Client Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="client_name" name="client_name"
+                                        placeholder="Enter Client Name" required>
+                                </div>
+
+                                <div class="form-group col-md-4 freshFields">
+                                    <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="client_short_name" name="client_short_name"
+                                        placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
+                                </div>
+
+                                <div class="form-group col-md-4 renewalFields" style="display: none;">
+                                    <label for="source_policy_id"> Source Policy <span id="base_danger"
+                                            class="text-danger">*</span></label>
+                                    <select class="form-control" id="source_policy_id" name="source_policy_id" onchange="getPolicyData(this)">
+                                        <option value="" selected>Select Source Policy</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="pan">PAN<span class="text-danger"></span></label>
+                                    <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
+                                        data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
+                                        data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
+                                </div>
+
+                            </div>
                         </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_id">Client<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_id" name="client_id">
-                                <option value="">Select Client</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="client_branch_id">Branch<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_branch_id" name="client_branch_id"
-                                onchange="getBranchData(this,1)">
-                                <option value="">Select Branch</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_type">Client Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="client_type" name="client_type" required>
-                                <option value="">Select Client type</option>
-                                <?php
-                                if (isset($client_type) && count($client_type)) {
-                                    foreach ($client_type as $key => $value) {
-                                        echo "<option value='" . $key . "' >" . $value . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="entity_type_id">Entity Type<span class="text-danger">*</span></label>
-                            <select class="form-control" id="entity_type_id" name="entity_type_id" required>
-                                <option value="" selected>Select Entity</option>
-                                <?php
-                                if (isset($entity) && count($entity)) {
-                                    foreach ($entity as $key => $value) {
-                                        echo "<option value=" . $value['id'] . ">" . $value['name'] . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_name">Client Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_name" name="client_name"
-                                placeholder="Enter Client Name" required>
-                        </div>
-
-                        <div class="form-group col-md-3 freshFields">
-                            <label for="client_short_name">Client Short Name<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="client_short_name" name="client_short_name"
-                                placeholder="Enter Client Short Name" onkeyup="validateInput(this, 'clients', 'short_name')" required>
-                        </div>
-
-                        <div class="form-group col-md-3 renewalFields" style="display: none;">
-                            <label for="source_policy_id"> Source Policy <span id="base_danger"
-                                    class="text-danger">*</span></label>
-                            <select class="form-control" id="source_policy_id" name="source_policy_id" onchange="getPolicyData(this)">
-                                <option value="" selected>Select Source Policy</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="pan">PAN<span class="text-danger"></span></label>
-                            <input type="text" class="form-control" id="pan" placeholder="Enter PAN Number"
-                                data-parsley-error-message="Invalid PAN Number. Example: ABCDE1234F" name="pan"
-                                data-parsley-trigger="change" data-parsley-pattern="^[A-Z]{5}[0-9]{4}[A-Z]$">
-                        </div>
-
                     </div>
                     <!-- end client row -->
-
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- branch row-->
+                    <div class="card" id="collapseOne">
+                    <div class="card-body">
                     <div class="form-row">
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="gst">GST<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="gst" placeholder="Enter GST Number"
                                 data-parsley-error-message="Invalid GST Number. Example: 12ABCDE1234F5Z6" name="gst"
@@ -195,19 +223,19 @@
                                 data-parsley-pattern="^\d{2}[A-Z]{5}\d{4}[A-Z]{1}[A-Z\d]{1}[Z]{1}[A-Z\d]{1}$" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="branch_name" name="branch_name"
                                 placeholder="Enter Branch Name" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="branch_code" name="branch_code"
                                 placeholder="Enter Branch Code" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_summary">Contact Person's</label>
                             <select class="form-control" name="contact_person_summary" id="contact_person_summary">
                                 <option value="">Select a Person</option>
@@ -215,20 +243,20 @@
                         
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
                                 placeholder="Enter Contact Name" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_mobile">Contact Person Mobile<span
                                     class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_mobile"
                                 name="contact_person_mobile" placeholder="Enter Contact Mobile" required>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="contact_person_email">Contact Person Email<span
                                     class="text-danger">*</span></label>
                             <input type="text" class="form-control" id="contact_person_email"
@@ -236,13 +264,17 @@
                         </div>
 
                     </div>
+                    </div>
+                    </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
                     <!-- policy row -->
+                    <div class="card" id="collapseOne">
+                    <div class="card-body">
                     <div class="form-row" id="dynamic-form-container">
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="policy_type_id">Policy Type <span class="text-danger">*</span></label>
                             <select class="form-control" id="policy_type_id" name="policy_type_id"
                                 onchange="getPolicyTypeFields(this)" required>
@@ -259,7 +291,7 @@
                             </select>
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="insurer">Insurer <span class="text-danger"></span></label>
                             <select class="form-control" id="insurer" name="insurer">
                                 <option value="">Select Insurer</option>
@@ -293,78 +325,96 @@
                             </select>
                         </div> -->
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="">Date of Commencement <span class="text-danger">*</span></label>
-                            <input type="text" class="form-control policy_start_date" id="policy_start_date" name="policy_start_date"
-                                placeholder="Enter DOC" required>
+                            <div class="input-icon">
+                                        <input type="text" class="form-control policy_start_date" id="policy_start_date" name="policy_start_date"
+                                        placeholder="Enter DOC" required>
+                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                            </div>
+                            
                         </div>
 
-                        <div class="form-group col-md-3">
+                        <div class="form-group col-md-4">
                             <label for="">Date of Expiry <span class="text-danger">*</span></label>
-                            <input type="text" class="form-control policy_end_date" id="policy_end_date" name="policy_end_date"
-                                placeholder="Enter DOE" required>
+                            <div class="input-icon">      
+                                    <input type="text" class="form-control policy_end_date" id="policy_end_date" name="policy_end_date"
+                                    placeholder="Enter DOE" required>
+                                    <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
+                            </div>
                         </div>
 
                     </div>
+                    
 
                     <div id="appendArea"></div>
 
                     <div id="appendAreaForClaim">
                     </div>
 
-                    <hr>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
 
-                    <div id="multiFileAppendArea_1"></div>
-
-                    <hr>
-
-                    <!-- other row -->
-                    <div class="form-row">
-
-                        <!-- <div class="form-group col-md-3">
-                            <label for="file_upload">File Upload<span class="text-danger"></span></label>
-                            <input type="file" class="form-control" id="file_name" name="file_name" accept=".xls,.xlsx">
-                            <span class="text-danger" id="file_name_display"></span>
-                        </div> -->
-
-                        <div class="form-group col-md-3">
-                            <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
-                            <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
-                                <option value="">Select Sales Person</option>
-                                <?php if (isset($salse_team)) { ?>
-                                    <?php foreach ($salse_team as $value) { ?>
-                                        <option value="<?= $value['id']; ?>">
-                                            <?= $value['first_name']; ?>
-                                        </option>
-                                    <?php } ?>
-                                <?php } ?>
-                            </select>
+                    <div class="card" style="width:100%; background-color: transparent;">
+                        <div class="card-body" style="background-color: #fff !important; border: 0px !important;">
+                            <div id="multiFileAppendArea_1"></div>
                         </div>
-
-                        <div class="form-group col-md-3">
-                            <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
-                            <select class="form-control" id="lead_status" name="status" required>
-                                <option value="" selected>Select Status</option>
-                                <?php
-                                if (isset($lead_status) && count($lead_status)) {
-                                    foreach ($lead_status as $key => $value) {
-                                        if ($key == 'queued') {
-                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                        } else {
-                                            echo "<option value=" . $key . ">" . $value . "</option>";
-                                        }
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </div>
-
                     </div>
 
-                    <div class="form-row">
-                        <div class="form-group col-md-12">
-                            <label for="notes">Remarks</label>
-                            <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                    </div>
+                    </div>
+                    <!-- <hr> -->  <!-- bcoz removed in design --> 
+
+                    <!-- other row -->
+                    <div class="card" id="collapseOne">
+                        <div class="card-body">
+                            <div class="form-row">
+
+                                <!-- <div class="form-group col-md-3">
+                                    <label for="file_upload">File Upload<span class="text-danger"></span></label>
+                                    <input type="file" class="form-control" id="file_name" name="file_name" accept=".xls,.xlsx">
+                                    <span class="text-danger" id="file_name_display"></span>
+                                </div> -->
+
+                                <div class="form-group col-md-4">
+                                    <label for="salse_person_id">Sales Person<span class="text-danger">*</span></label>
+                                    <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
+                                        <option value="">Select Sales Person</option>
+                                        <?php if (isset($salse_team)) { ?>
+                                            <?php foreach ($salse_team as $value) { ?>
+                                                <option value="<?= $value['id']; ?>">
+                                                    <?= $value['first_name']; ?>
+                                                </option>
+                                            <?php } ?>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label for="status"> Status <span id="base_danger" class="text-danger">*</span></label>
+                                    <select class="form-control" id="lead_status" name="status" required>
+                                        <option value="" selected>Select Status</option>
+                                        <?php
+                                        if (isset($lead_status) && count($lead_status)) {
+                                            foreach ($lead_status as $key => $value) {
+                                                if ($key == 'queued') {
+                                                    echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                } else {
+                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                }
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+
+                            </div>
+
+                            <div class="form-row">
+                                <div class="form-group col-md-12">
+                                    <label for="notes">Remarks</label>
+                                    <textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
+                                </div>
+                            </div>
                         </div>
                     </div>
 
diff --git a/app/Views/rfq/multi_files.php b/app/Views/rfq/multi_files.php
index 11e517ed..09ba89ab 100644
--- a/app/Views/rfq/multi_files.php
+++ b/app/Views/rfq/multi_files.php
@@ -12,36 +12,71 @@ $increment = 1;
 ?>
 
     <div class="form-row d-flex align-items-end" id="fileField_<?= $displayIndex ?>">
+        <div class="form-group row" style="width: 100%;">
         <input type="hidden" name="leads_file_id[]" value="<?= htmlspecialchars($value['id']) ?>" id="file_id_<?= $displayIndex ?>">
 
-        <div class="form-group col-md-5">
-            <label>Document Name</label>
+        <div class="col-auto" style="align-content: center;">
+                    <label class="col-form-label">Document Name</label>
+        </div>
+        <div class="col-md-3">
             <input type="text" class="form-control" name="docs_name_<?= $increment ?>[]" 
-                placeholder="<?= $placeholder ?>" 
+                placeholder="<?= $placeholder ?>" style="background: #F5FFFF !important;"
                 value="<?= htmlspecialchars($value['docs_name']) ?>" id="docs_name_<?= $displayIndex ?>">
         </div>
-
-        <div class="form-group col-md-5">
+        <div class="col-auto" style="align-content: center;">
             <label>
                 File Upload<br>
                 <small id="file_name_display_<?= $displayIndex ?>" class="text-muted">
                     <?= !empty($value['file_name']) ? htmlspecialchars($value['file_name']) : 'No file chosen' ?>
                 </small>
             </label>
-            <input type="file" class="form-control" id="file_name_<?= $displayIndex ?>" 
-                name="file_name_<?= $increment ?>[]" accept="<?= $accept ?>" 
-                onchange="showFileName(this, <?= $displayIndex ?>)">
+        </div>
+        <div class="col-md-3">
+            <div class="input-icon">
+                    <input type="file" class="form-control" id="file_name_<?= $displayIndex ?>" name="file_name_<?= $increment ?>[]" accept="<?= $accept ?>" onchange="showFileName(this, <?= $displayIndex ?>)" style="background: #F5FFFF !important;">
+                    <i class="mdi mdi-upload additional-icon"></i>
+            </div> 
         </div>
 
-        <div class="col-md-2" style="position: relative; bottom: 16px;">
-            <button type="button" class="btn btn-danger" onclick="removeFileField(<?= $displayIndex ?>, <?= htmlspecialchars($value['id']) ?>)">x</button>
-            <button type="button" class="btn btn-primary" onclick="addFileField(<?= $increment ?>)">+</button>
+        <div class="col-auto">
+            <button type="button" class="btn btn-danger" onclick="removeFileField(<?= $displayIndex ?>, <?= htmlspecialchars($value['id']) ?>)"><span class="mdi mdi-trash-can"></span></button>
+            <button type="button" class="btn app-btn-secondary" onclick="addFileField(<?= $increment ?>)">+</button>
+        </div>
         </div>
     </div>
 
-<?php } } else { ?>
+<?php } }else { ?>
     <!-- Default field if no file data exists -->
     <div class="form-row d-flex align-items-end" id="fileField_1">
+        <div class="form-group row" style="width: 100%;">
+        <input type="hidden" name="leads_file_id[]" value="">
+
+                    <div class="col-auto" style="align-content: center;">
+                        <label class="col-form-label">Document Name</label>
+                    </div>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="docs_name_1[]" 
+                            placeholder="First file must be Demography." id="docs_name_1" style="background: #F5FFFF !important;">
+                    </div>
+                    <div class="col-auto" style="align-content: center;">
+                            <label>File Upload<br>
+                            <small id="file_name_display_1" class="text-muted">No file chosen</small></label>
+                    </div>
+                    <div class="col-md-3">
+                        <div class="input-icon">
+                            <input type="file" class="form-control" id="file_name_1" 
+                                name="file_name_1[]" accept=".xls,.xlsx" onchange="showFileName(this, 1)" style="background: #F5FFFF !important;">
+                            <i class="mdi mdi-upload additional-icon"></i>
+                        </div>
+                    </div>
+                    <div class="col-auto">
+                        <button type="button" class="btn btn-danger" onclick="removeFileField(1, '')"><span class="mdi mdi-trash-can"></span></button>
+                        <button type="button" class="btn app-btn-secondary" onclick="addFileField(1)">+</button>
+                    </div>
+                </div>
+    </div>
+
+    <!-- <div class="form-row d-flex align-items-end" id="fileField_1">
         <input type="hidden" name="leads_file_id[]" value="">
 
         <div class="form-group col-md-5">
@@ -63,5 +98,5 @@ $increment = 1;
             <button type="button" class="btn btn-danger" onclick="removeFileField(1, '')">x</button>
             <button type="button" class="btn btn-primary" onclick="addFileField(1)">+</button>
         </div>
-    </div>
+    </div> -->
 <?php } ?>
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 8441c85f..223a9851 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -623,6 +623,7 @@ $(document).ready(function() {
           ],
           paging: true,
           pageLength: 25,
+          order: [[0, 'desc']]
       });
 
     } else {