diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 78023e93..53ae3c5b 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -387,6 +387,42 @@ class TicketController extends BaseController
             $ticket_data['date_of_intimat'] = change_date_format($ticket_data['date_of_intimat'], null, $out_put_format);
         }
 
+        if (empty($ticket_data['raised_date'])) {
+            $ticket_data['raised_date'] = null;
+        } else {
+            $ticket_data['raised_date'] = change_date_format($ticket_data['raised_date'], null, $out_put_format);
+        }
+
+        if (empty($ticket_data['registration_date'])) {
+            $ticket_data['registration_date'] = null;
+        } else {
+            $ticket_data['registration_date'] = change_date_format($ticket_data['registration_date'], null, $out_put_format);
+        }
+
+        if (empty($ticket_data['query_received_date'])) {
+            $ticket_data['query_received_date'] = null;
+        } else {
+            $ticket_data['query_received_date'] = change_date_format($ticket_data['query_received_date'], null, $out_put_format);
+        }
+
+        if (empty($ticket_data['denial_date'])) {
+            $ticket_data['denial_date'] = null;
+        } else {
+            $ticket_data['denial_date'] = change_date_format($ticket_data['denial_date'], null, $out_put_format);
+        }
+
+        if (empty($ticket_data['approved_date'])) {
+            $ticket_data['approved_date'] = null;
+        } else {
+            $ticket_data['approved_date'] = change_date_format($ticket_data['approved_date'], null, $out_put_format);
+        }
+
+        if (empty($ticket_data['settled_date'])) {
+            $ticket_data['settled_date'] = null;
+        } else {
+            $ticket_data['settled_date'] = change_date_format($ticket_data['settled_date'], null, $out_put_format);
+        }
+
         return $ticket_data;
     }
 
diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php
index 1cbbb5ff..df9b3dd8 100644
--- a/app/Views/ticket_edit_onbording.php
+++ b/app/Views/ticket_edit_onbording.php
@@ -211,14 +211,14 @@ function setMemberData(input) {is_head_approved
 
 function showConfirmationModal(event) {
     Swal.fire({
-        title: "Approve or Reject the rejected claim",
-        text: "Do you want to save this?",
+        title: "Approve Claim Rejection",
+        // text: "Do you want to save this?",
         icon: "warning",
         showCancelButton: true,
         showDenyButton: true, 
         confirmButtonColor: "#3085d6",
-        cancelButtonColor: "#d33",
-        denyButtonColor: "#6c757d",
+        cancelButtonColor: "#6c757d",
+        denyButtonColor: "#d33",
         confirmButtonText: "Approve",
         denyButtonText: "Reject",
         cancelButtonText: "Cancel"
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index c30dcadf..da0fc8e4 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -298,7 +298,7 @@
                     <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" id="btnSubmit" >Submit</button>
                         <?php if(get_role_id() == 5 && isset($ticket_data) && $ticket_data['claim_status_id'] == 8) { ?>
-                            <a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Rejected Approve</a>
+                            <a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Approve Claim Rejection</a>
                         <?php } ?>
                         <!-- <button type="button" class="btn btn-primary waves-effect waves-light mr-1" id="btnApprove" >Approve</button> -->
                     </div>
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index f9ec7184..65885cd1 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -68,12 +68,31 @@ table.dataTable tbody td {
                             <?php foreach($ticket_data as $index => $row){ ?>
                                     <tr onclick="viewTicket(<?php echo $row['id']; ?>)">
                                         
-                                    <td data-toggle="tooltip" data-placement="top" title="<?php echo $row['status']; ?>">
+                                    <td data-toggle="tooltip" data-placement="top" 
+                                    
+                                    
+                                       title="  <?php 
+                                                if ($row['claim_status_id'] == 8) {
+                                                    if ($row['is_head_approved'] == 0) {
+                                                        echo 'Waiting For Head Approvel'; 
+                                                    } elseif ($row['is_head_approved'] == 1) {
+                                                        echo 'Head Approved';
+                                                    } elseif ($row['is_head_approved'] == 2) {
+                                                        echo 'Head Rejected';
+                                                    } else {
+                                                        echo $row['status'];
+                                                    }
+                                                } else {
+                                                    echo $row['status'];
+                                                }
+                                            ?>">
+
+
                                         <span class="status-tooltip">
                                             <?php 
                                                 if (in_array($row['claim_status_id'],[8,23,33,43])) {
                                                     if ($row['is_head_approved'] == 0) {
-                                                        echo $row['status'] . '&nbsp;<i class="fa fa-exclamation-triangle" style="color:red;" aria-hidden="true"></i>'; 
+                                                        echo $row['status'] . '&nbsp;<i class="fa fa-exclamation-triangle" style="color:#cece00;" aria-hidden="true"></i>'; 
                                                     } elseif ($row['is_head_approved'] == 1) {
                                                         echo $row['status'] . '&nbsp;<i class="fa fa-check-circle" style="color:green;" aria-hidden="true"></i>';
                                                     } elseif ($row['is_head_approved'] == 2) {