diff --git a/employee/models.py b/employee/models.py
index cb0c32081..73028e63f 100644
--- a/employee/models.py
+++ b/employee/models.py
@@ -4,6 +4,7 @@ models.py
 This module is used to register models for employee app
 
 """
+
 import datetime as dtime
 from datetime import date, datetime, timedelta
 import json
@@ -265,14 +266,14 @@ class Employee(models.Model):
             related_models = []
             if reporting_manager_query.exists():
                 related_models.append("Reporting manager")
+            if recruitment_manager_query.exists():
+                related_models.append("Recruitment manager")
             if recruitment_stage_query.exists():
                 related_models.append("Recruitment stage manager")
             if onboarding_stage_query.exists():
                 related_models.append("Onboarding stage manager")
             if onboarding_task_query.exists():
                 related_models.append("Onboarding task manager")
-            if recruitment_manager_query.exists():
-                related_models.append("Recruitment manager")
 
             related_models_dict = {"related_models": related_models}
             return related_models_dict
@@ -281,7 +282,7 @@ class Employee(models.Model):
         last_name = (
             self.employee_last_name if self.employee_last_name is not None else ""
         )
-        badge_id = ((f"({self.badge_id})") if self.badge_id is not None else "")
+        badge_id = (f"({self.badge_id})") if self.badge_id is not None else ""
         return f"{self.employee_first_name} {last_name} {badge_id}"
 
     def check_online(self):
@@ -709,4 +710,4 @@ class EmployeeGeneralSetting(models.Model):
     """
 
     badge_id_prefix = models.CharField(max_length=5, default="PEP")
-    company_id = models.ForeignKey(Company,null=True,on_delete=models.CASCADE)
+    company_id = models.ForeignKey(Company, null=True, on_delete=models.CASCADE)
diff --git a/employee/templates/employee_personal_info/employee_card.html b/employee/templates/employee_personal_info/employee_card.html
index 16b575159..87fce1d89 100644
--- a/employee/templates/employee_personal_info/employee_card.html
+++ b/employee/templates/employee_personal_info/employee_card.html
@@ -15,6 +15,7 @@
     {% trans "Online" %}
   </span>
 </div>
+<div id="relatedModel"></div>
 {% if messages %}
     <div class="oh-alert-container">
         {% for message in messages %}
@@ -84,9 +85,9 @@
             {% if perms.employee.delete_employee %}
             <li class="oh-dropdown__item">
               {% if emp.is_active %}
-              <a href="{% url 'employee-archive' emp.id %}" onclick="return confirm('{% trans "Do you want to archive this employee?" %}')" class="oh-dropdown__link">
-                {% trans "Archive" %}
-              </a>
+                <a hx-confirm="{% trans 'Do you want to archive this employee?' %}" hx-post="{% url 'employee-archive' emp.id %}" hx-target="#relatedModel" class="oh-dropdown__link">
+                  {% trans "Archive" %}
+                </a>
                 {% else %}
                 <a href="{% url 'employee-archive' emp.id %}" onclick="return confirm('{% trans "Do you want to un archive this employee?" %}')" class="oh-dropdown__link">
                   {% trans "Un-Archive" %}
diff --git a/employee/templates/employee_personal_info/employee_list.html b/employee/templates/employee_personal_info/employee_list.html
index 90bd9bb4f..c251ad13b 100644
--- a/employee/templates/employee_personal_info/employee_list.html
+++ b/employee/templates/employee_personal_info/employee_list.html
@@ -70,7 +70,7 @@
           </div>
         </div>
         <div
-          class="oh-sticky-table__th"
+          class="oh-sticky-table__th {% if request.sort_option.order == '-employee_first_name' %}arrow-up {% elif request.sort_option.order == 'employee_first_name' %}arrow-down {% else %}arrow-up-down {% endif %}"
           hx-target="#view-container"
           hx-get="{% url 'employee-filter-view' %}?{{pd}}&orderby=employee_first_name"
         >
@@ -81,7 +81,7 @@
         <div class="oh-sticky-table__th" data-cell-index="2" data-cell-title='{% trans "Phone" %}'>{% trans "Phone" %}</div>
         {% endif %}
         <div
-          class="oh-sticky-table__th" data-cell-index="3" data-cell-title='{% trans "Badge Id" %}'
+          class="oh-sticky-table__th {% if request.sort_option.order == '-badge_id' %}arrow-up {% elif request.sort_option.order == 'badge_id' %}arrow-down {% else %}arrow-up-down {% endif %}" data-cell-index="3" data-cell-title='{% trans "Badge Id" %}'
           hx-target="#view-container"
           hx-get="{% url 'employee-filter-view' %}?{{pd}}&orderby=badge_id"
         >
@@ -93,7 +93,7 @@
         <div class="oh-sticky-table__th" data-cell-index="7" data-cell-title='{% trans "Work Type" %}'>{% trans "Work Type" %}</div>
         <div class="oh-sticky-table__th" data-cell-index="8" data-cell-title='{% trans "Job Role" %}'>{% trans "Job Role" %}</div>
         <div
-          class="oh-sticky-table__th" data-cell-index="9" data-cell-title='{% trans "Reporting Manager" %}'
+          class="oh-sticky-table__th {% if request.sort_option.order == '-employee_work_info__reporting_manager_id' %}arrow-up {% elif request.sort_option.order == 'employee_work_info__reporting_manager_id' %}arrow-down {% else %}arrow-up-down {% endif %}" data-cell-index="9" data-cell-title='{% trans "Reporting Manager" %}'
           hx-target="#view-container"
           hx-get="{% url 'employee-filter-view' %}?{{pd}}&orderby=employee_work_info__reporting_manager_id"
         >
@@ -102,9 +102,9 @@
         <div class="oh-sticky-table__th" data-cell-index="10" data-cell-title='{% trans "Company" %}'>{% trans "Company" %}</div>
         <div class="oh-sticky-table__th" data-cell-index="11" data-cell-title='{% trans "Work Email" %}'>{% trans "Work Email" %}</div>
         <div
-          class="oh-sticky-table__th" data-cell-index="12" data-cell-title='{% trans "Date of Joining" %}'
+          class="oh-sticky-table__th {% if request.sort_option.order == '-employee_work_info__date_joining' %}arrow-up {% elif request.sort_option.order == 'employee_work_info__date_joining' %}arrow-down {% else %}arrow-up-down {% endif %}" data-cell-index="12" data-cell-title='{% trans "Date of Joining" %}'
           hx-target="#view-container"
-          hx-get="{% url 'employee-filter-view' %}?{{pd}}&orderby=date_joining"
+          hx-get="{% url 'employee-filter-view' %}?{{pd}}&orderby=employee_work_info__date_joining"
         >
           {% trans "Date of Joining" %}
         </div>
diff --git a/employee/templates/related_models.html b/employee/templates/related_models.html
new file mode 100644
index 000000000..f0fdafd27
--- /dev/null
+++ b/employee/templates/related_models.html
@@ -0,0 +1,33 @@
+{% load i18n %}
+<div
+  class="oh-modal oh-modal--show"
+  role="dialog"
+  id="confirmModal"
+  aria-labelledby="confirmModalLabel"
+  aria-hidden="true"
+>
+  <div class="oh-modal__dialog oh-modal__dialog--confirm">
+    <div
+      class="oh-modal__dialog-header"
+      style="display: flex; justify-content: center"
+    >
+      <span class="oh-modal__dialog-title" id="confirmModalLabel"
+        >{% trans "Can't Archive" %}
+      </span>
+    </div>
+    <div class="oh-modal__dialog-body" id="confirmModalBody">
+      <p>{{employee}} {% trans "assigned as" %} :</p>
+      {% for related_model in related_models %}
+      <p style="margin-left: 24px">{{forloop.counter}}.{{related_model}}</p>
+      {% endfor %}
+    </div>
+    <div
+      class="oh-modal__dialog-footer"
+      style="display: flex; justify-content: center"
+    >
+      <button class="oh-btn oh-btn--info oh-modal__cancel" id="cancel">
+        {% trans "Close" %}
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/static/index/index.js b/static/index/index.js
index 34c0c4acb..d3ac024f1 100644
--- a/static/index/index.js
+++ b/static/index/index.js
@@ -60,7 +60,19 @@ window.confirm = function (message) {
       if (event.target.tagName.toLowerCase() === "form") {
         event.target.submit();
       } else if (event.target.tagName.toLowerCase() === "a") {
-        window.location.href = event.target.href;
+        if (event.target.href) {
+          window.location.href = event.target.href;
+        } else {
+          var path = event.target["htmx-internal-data"].path;
+          var verb = event.target["htmx-internal-data"].verb;
+          var hxTarget = $(event.target).attr("hx-target");
+          if (verb === "post") {
+            // hx.post(path)
+            htmx.ajax("POST", path, hxTarget);
+          } else {
+            htmx.ajax("GET", path, hxTarget);
+          }
+        }
       }
     } else {
     }