diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index b4fe84be..cac3f78f 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -26,7 +26,7 @@
 
                         <h5>Employee Details</h5>
                         <hr>
-                        
+
                         <!-- first_data_points -->
                         <div class="form-row">
 
@@ -251,7 +251,6 @@
                                     name="claim_number">
                             </div>
 
-
                             <div class="form-group col-md-3 up_cnu" style="display: none;">
                                 <label for="registration_date">Registration Date</label>
                                 <input type="text" class="form-control datepicker" id="registration_date" placeholder="Select Registration Date"
@@ -324,16 +323,16 @@
                                     value="<?= isset($ticket_data['pay_initiate_date']) ? $ticket_data['pay_initiate_date'] : '' ?>" name="pay_initiate_date">
                             </div>
 
-                            <div class="form-group col-md-3 returned" style="display: none;">
-                                <label for="return_remark">Return Remark</label>
-                                <textarea class="form-control" id="return_remark" rows="1" placeholder="Enter Return Remark" name="return_remark"><?= isset($ticket_data['return_remark']) ? $ticket_data['return_remark'] : '' ?></textarea>
-                            </div>
-
                             <div class="form-group col-md-3 canceled" style="display: none;">
                                 <label for="cancel_remark">Cancel Remark</label>
                                 <textarea class="form-control" id="cancel_remark" rows="1" placeholder="Enter Cancel Remark" name="cancel_remark"><?= isset($ticket_data['cancel_remark']) ? $ticket_data['cancel_remark'] : '' ?></textarea>
                             </div>
 
+                            <div class="form-group col-md-3 returned" style="display: none;">
+                                <label for="return_remark">Return Remark</label>
+                                <textarea class="form-control" id="return_remark" rows="1" placeholder="Enter Return Remark" name="return_remark"><?= isset($ticket_data['return_remark']) ? $ticket_data['return_remark'] : '' ?></textarea>
+                            </div>
+
                             <div class="form-group col-md-6 returned" style="display: none;">
                                 <label for="awb_no_courier_name">AWB No with Courier Name</label>
                                 <input type="text" class="form-control" id="awb_no_courier_name" placeholder="eg : 0001/ST Courier"
diff --git a/app/Views/ticket_form_gpa.php b/app/Views/ticket_form_gpa.php
index 42b916cb..95ddd123 100644
--- a/app/Views/ticket_form_gpa.php
+++ b/app/Views/ticket_form_gpa.php
@@ -25,92 +25,18 @@
                 <?php } ?>
                 <form role="form" class="parsley-examples" method="post" id="ticket_form_data" onsubmit="submitClaimForm(event, this)"
                     enctype="multipart/form-data">
-                    <div class="form-group">
-                        <div class="form-row">
 
-                           <input type="hidden" id="ticket_master_id" name="ticket_master_id" value="<?= isset($ticket_data['id']) ? $ticket_data['id'] : '' ?>">
+                            <input type="hidden" id="ticket_master_id" name="ticket_master_id" value="<?= isset($ticket_data['id']) ? $ticket_data['id'] : '' ?>">
                            <input type="hidden" id="is_head_approved" name="is_head_approved" value="<?= isset($ticket_data['is_head_approved']) ? $ticket_data['is_head_approved'] : '' ?>">
                            <input type="hidden" id="extra_fields_array_for_validate" name="extra_fields_array_for_validate" value='<?= isset($extra_fields_array_for_validate) && !empty($extra_fields_array_for_validate) ? json_encode($extra_fields_array_for_validate) : "[]" ?>'>
 
-                           <div class="form-group col-md-3">
-                                <label for="claim_status">Status<span class="text-danger"></span></label>
-                                <select class="form-control" id="claim_status_id" name="claim_status_id">
-                                    <!-- <option value="0">Select status</option> -->
-                                    <?php
-                                        if (isset($claim_status) && count($claim_status)) {
-                                            foreach ($claim_status as $key => $value) {
-                                                $selected = (isset($ticket_data) && $ticket_data['claim_status_id'] == $value['id']) ? 'selected' : '';
-                                                echo "<option value=" . $value['id'] . " $selected>" . $value['claim_status'] . "</option>";
-                                            }
-                                        }
-                                    ?>
-                                </select>
-                            </div>
+                    <div class="form-group">
 
-                            <div class="form-group col-md-3">
-                                <label for="acm_id">Account Manager<span class="text-danger"></span></label>
-                                <select class="form-control" id="acm_id" name="acm_id">
-                                    <!-- <option value="0">Select Account Manager</option> -->
-                                    <?php
-                                        if (isset($acms) && count($acms)) {
-                                            foreach ($acms as $key => $value) {
-                                                $selected = (isset($ticket_data) && $ticket_data['acm_id'] == $value['id']) ? 'selected' : '';
-                                                echo "<option value=" . $value['id'] . " $selected>" . $value['first_name'] . "</option>";
-                                            }
-                                        }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label for="client_name">Corporate Name<span class="text-danger"></span></label>
-                                <input type="hidden" id="client_id" name="client_id" value="<?= isset($ticket_data['client_id']) ? $ticket_data['client_id'] : '' ?>">
-                                <input type="text" class="form-control" id="client_name" placeholder="Client" value="<?= isset($ticket_data['client_name']) ? $ticket_data['client_name'] : '' ?>" readonly>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label for="insurer_id">Insurer<span class="text-danger"></span></label>
-                                <input type=hidden id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>">
-                                <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label for="policy_no">Policy No<span class="text-danger"></span></label>
-                                <input type="text" class="form-control" id="policy_no"
-                                    value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>"
-                                    name="policy_no">
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label for="ticket_type_id"> Policy Type <span class="text-danger"></span></label>
-                                <select class="form-control readonly-select" id="ticket_type_id" name="ticket_type_id" readonly>
-                                    <?php
-                                        if (isset($ticket_type) && count($ticket_type)) {
-                                            foreach ($ticket_type as $key => $value) {
-                                                if($key != 1){
-                                                    $selected = (isset($ticket_data) && $ticket_data['ticket_type_id'] == $key) ? 'selected' : ((isset($selected_ticket_type) && $selected_ticket_type == $key) ? 'selected' : '');
-                                                    echo "<option value='" . $key . "' $selected>" . $value . "</option>";
-                                                }
-                                            }
-                                        }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <label for="claim_type"> Claim Type <span class="text-danger"></span></label>
-                                <select class="form-control" id="claim_type" name="claim_type">
-                                    <!-- <option value="0">Select claim Type</option> -->
-                                    <?php
-                                        if (isset($claim_type) && count($claim_type)) {
-                                            foreach ($claim_type as $key => $value) {
-                                                $selected = (isset($ticket_data) && $ticket_data['claim_type'] == $key) ? 'selected' : '';
-                                                echo "<option value='" . $key . "' $selected>" . $value . "</option>";
-                                            }
-                                        }
-                                    ?>
-                                </select>
-                            </div>
+                        <h5>Employee Details</h5>
+                        <hr>
+                        
+                        <!-- first_data_points -->
+                        <div class="form-row">
 
                             <div class="form-group col-md-3">
                                 <label for="emp_code">Employee ID &nbsp; <i class="fa fa-search text-danger"
@@ -120,7 +46,6 @@
                                     name="emp_code">
                             </div>
 
-
                             <div class="form-group col-md-3">
                                 <label for="emp_name">Employee Name<span class="text-danger"></span></label>
                                 <input type=hidden id="emp_id" name="emp_id" value="<?= isset($ticket_data['emp_id']) ? $ticket_data['emp_id'] : '' ?>">
@@ -143,6 +68,94 @@
                                     name="emp_mail">
                             </div>
 
+                            <div class="form-group col-md-3">
+                                <label for="policy_no">Policy No<span class="text-danger"></span></label>
+                                <input type="text" class="form-control" id="policy_no"
+                                    value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>"
+                                    name="policy_no">
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label for="client_name">Corporate Name<span class="text-danger"></span></label>
+                                <input type="hidden" id="client_id" name="client_id" value="<?= isset($ticket_data['client_id']) ? $ticket_data['client_id'] : '' ?>">
+                                <input type="text" class="form-control" id="client_name" placeholder="Client" value="<?= isset($ticket_data['client_name']) ? $ticket_data['client_name'] : '' ?>" readonly>
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label for="insurer_id">Insurer<span class="text-danger"></span></label>
+                                <input type=hidden id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>">
+                                <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly>
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label for="acm_id">Account Manager<span class="text-danger"></span></label>
+                                <select class="form-control" id="acm_id" name="acm_id">
+                                    <!-- <option value="0">Select Account Manager</option> -->
+                                    <?php
+                                        if (isset($acms) && count($acms)) {
+                                            foreach ($acms as $key => $value) {
+                                                $selected = (isset($ticket_data) && $ticket_data['acm_id'] == $value['id']) ? 'selected' : '';
+                                                echo "<option value=" . $value['id'] . " $selected>" . $value['first_name'] . "</option>";
+                                            }
+                                        }
+                                    ?>
+                                </select>
+                            </div>
+
+                        </div>
+                        <!-- end first_data_points -->
+
+                        <h5>Claim Details</h5>
+                        <hr>
+
+                        <!-- second_data_points -->
+                        <div class="form-row">
+
+                            <div class="form-group col-md-3">
+                                <label for="ticket_type_id"> Policy Type <span class="text-danger"></span></label>
+                                <select class="form-control readonly-select" id="ticket_type_id" name="ticket_type_id" readonly>
+                                    <?php
+                                        if (isset($ticket_type) && count($ticket_type)) {
+                                            foreach ($ticket_type as $key => $value) {
+                                                if($key != 1){
+                                                    $selected = (isset($ticket_data) && $ticket_data['ticket_type_id'] == $key) ? 'selected' : ((isset($selected_ticket_type) && $selected_ticket_type == $key) ? 'selected' : '');
+                                                    echo "<option value='" . $key . "' $selected>" . $value . "</option>";
+                                                }
+                                            }
+                                        }
+                                    ?>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label for="claim_status">Status<span class="text-danger"></span></label>
+                                <select class="form-control" id="claim_status_id" name="claim_status_id">
+                                    <!-- <option value="0">Select status</option> -->
+                                    <?php
+                                        if (isset($claim_status) && count($claim_status)) {
+                                            foreach ($claim_status as $key => $value) {
+                                                $selected = (isset($ticket_data) && $ticket_data['claim_status_id'] == $value['id']) ? 'selected' : '';
+                                                echo "<option value=" . $value['id'] . " $selected>" . $value['claim_status'] . "</option>";
+                                            }
+                                        }
+                                    ?>
+                                </select>
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label for="claim_type"> Claim Type <span class="text-danger"></span></label>
+                                <select class="form-control" id="claim_type" name="claim_type">
+                                    <!-- <option value="0">Select claim Type</option> -->
+                                    <?php
+                                        if (isset($claim_type) && count($claim_type)) {
+                                            foreach ($claim_type as $key => $value) {
+                                                $selected = (isset($ticket_data) && $ticket_data['claim_type'] == $key) ? 'selected' : '';
+                                                echo "<option value='" . $key . "' $selected>" . $value . "</option>";
+                                            }
+                                        }
+                                    ?>
+                                </select>
+                            </div>
 
                             <div class="form-group col-md-3">
                                 <label for="date_of_join">Date of joining<span class="text-danger"></span></label>
@@ -196,6 +209,14 @@
                                     value="<?= isset($ticket_data['si_amt']) ? $ticket_data['si_amt'] : '' ?>"
                                     name="si_amt">
                             </div>
+                        </div>
+                        <!-- end second_data_points -->
+
+                        <h5>Additional Details</h5>
+                        <hr>
+
+                        <!-- third_data_points -->
+                        <div class="form-row">
 
                             <div class="form-group col-md-3 approved" style="display: none;">
                                 <label for="approved_amount">Approved Amount</label>
@@ -233,16 +254,15 @@
                                     value="<?= isset($ticket_data['settle_letter']) ? $ticket_data['settle_letter'] : '' ?>" name="settle_letter">
                             </div>
 
-                            <div class="form-group col-md-3 returned" style="display: none;">
-                                <label for="return_remark">Return Remark</label>
-                                <textarea class="form-control" id="return_remark" placeholder="Enter Return Remark" name="return_remark"><?= isset($ticket_data['return_remark']) ? $ticket_data['return_remark'] : '' ?></textarea>
-                            </div>
-
                             <div class="form-group col-md-3 canceled" style="display: none;">
                                 <label for="cancel_remark">Cancel Remark</label>
-                                <textarea class="form-control" id="cancel_remark" placeholder="Enter Cancel Remark" name="cancel_remark"><?= isset($ticket_data['cancel_remark']) ? $ticket_data['cancel_remark'] : '' ?></textarea>
+                                <textarea class="form-control" id="cancel_remark" rows="1" placeholder="Enter Cancel Remark" name="cancel_remark"><?= isset($ticket_data['cancel_remark']) ? $ticket_data['cancel_remark'] : '' ?></textarea>
                             </div>
 
+                            <div class="form-group col-md-3 returned" style="display: none;">
+                                <label for="return_remark">Return Remark</label>
+                                <textarea class="form-control" id="return_remark" rows="1" placeholder="Enter Return Remark" name="return_remark"><?= isset($ticket_data['return_remark']) ? $ticket_data['return_remark'] : '' ?></textarea>
+                            </div>
 
                             <div class="form-group col-md-6 returned" style="display: none;">
                                 <label for="awb_no_courier_name">AWB No with Courier Name</label>
@@ -250,7 +270,10 @@
                                     value="<?= isset($ticket_data['awb_no_courier_name']) ? $ticket_data['awb_no_courier_name'] : '' ?>" name="awb_no_courier_name">
                             </div>
 
+
                         </div>
+                        <!-- end third_data_points -->
+
                     </div>
                     <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
                         <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"