diff --git a/base/translator.py b/base/translator.py
index a35ede96a..92750242c 100644
--- a/base/translator.py
+++ b/base/translator.py
@@ -312,3 +312,7 @@ _("candidate-update"),
 _("create-payslip"),
 _("work-records"),
 _("edit-profile"),
+_("candidate-reject-reasons"),
+_("employee-tag-view"),
+_("grace-settings-view"),
+_("helpdesk-tag-view"),
diff --git a/leave/templates/leave/leave_assign/assign_view.html b/leave/templates/leave/leave_assign/assign_view.html
index bc4af6b76..d6caf0df7 100644
--- a/leave/templates/leave/leave_assign/assign_view.html
+++ b/leave/templates/leave/leave_assign/assign_view.html
@@ -257,9 +257,9 @@
 				<button
 					class="oh-btn oh-btn--secondary oh-btn--shadow"
 					data-toggle="oh-modal-toggle"
-					data-target="#assignLeaveModal"
+					data-target="#objectCreateModal"
 					hx-get="{% url 'assign' %}"
-					hx-target="#assignLeaveFormModal"
+					hx-target="#objectCreateModalTarget"
 				>
 					{% trans "Assign" %}
 				</button>
@@ -355,17 +355,6 @@
   </div>
 </div>
 
-<!-- Assign leave -->
-<div
-	class="oh-modal"
-	id="assignLeaveModal"
-	role="dialog"
-	aria-labelledby="assignLeaveModalLabel"
-	aria-hidden="true"
->
-	<div class="oh-modal__dialog" id="assignLeaveFormModal"> </div>
-</div>
-
 <script>
 	$(document).ready(function(){
 		$("#id_field").on("change", function () {
diff --git a/leave/templates/leave/leave_assign/assigned-leave.html b/leave/templates/leave/leave_assign/assigned-leave.html
index 6fbd4af56..95af2e9db 100644
--- a/leave/templates/leave/leave_assign/assigned-leave.html
+++ b/leave/templates/leave/leave_assign/assigned-leave.html
@@ -36,8 +36,8 @@
                 <div class="oh-sticky-table__td">
                     <div class="oh-btn-group">
                         <button class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Edit' %}" data-toggle="oh-modal-toggle"
-                            data-target="#editModal1" hx-get="{% url 'available-leave-update' available_leave.id %}"
-                            hx-target="#leaveForm"><ion-icon name="create-outline"></ion-icon></button>
+                            data-target="#objectUpdateModal" hx-get="{% url 'available-leave-update' available_leave.id %}"
+                            hx-target="#objectUpdateModalTarget"><ion-icon name="create-outline"></ion-icon></button>
                         <a class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" onclick="return confirm('{% trans "Are you sure you want to delete ?" %}');" id="delete-link"
                             href="{% url 'assign-delete' available_leave.id %}" title="{% trans 'Delete' %}"><ion-icon
                                 name="trash-outline"></ion-icon></a>
diff --git a/leave/templates/leave/leave_assign/assigned_leave.html b/leave/templates/leave/leave_assign/assigned_leave.html
index d53a03acd..20b94d6b6 100644
--- a/leave/templates/leave/leave_assign/assigned_leave.html
+++ b/leave/templates/leave/leave_assign/assigned_leave.html
@@ -48,8 +48,8 @@
         <div class="oh-sticky-table__tbody">
         {% for available_leave in available_leaves %}
         <div class="oh-sticky-table__tr" draggable="false"
-            data-toggle="oh-modal-toggle" data-target="#objectDetailsModalW25"
-            hx-target="#objectDetailsModalW25Target"
+            data-toggle="oh-modal-toggle" data-target="#objectDetailsModal"
+            hx-target="#objectDetailsModalTarget"
             hx-get="{% url 'available-leave-single-view' available_leave.id %}?{{pd}}&instances_ids={{available_leave_ids}}">
             <div class="oh-sticky-table__sd" onclick="event.stopPropagation();">
                 <div class="centered-div">
@@ -76,8 +76,8 @@
                 <div class="oh-btn-group" onclick="event.stopPropagation();">
                     {% if request.user|is_reportingmanager or perms.leave.change_availableleave %}
                         <button class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Edit' %}" data-toggle="oh-modal-toggle"
-                            data-target="#assignLeaveUpdateModal" hx-get="{% url 'available-leave-update' available_leave.id %}?{{pd}}"
-                            hx-target="#assignLeaveUpdateFormModal"><ion-icon name="create-outline"></ion-icon></button>
+                            data-target="#objectUpdateModal" hx-get="{% url 'available-leave-update' available_leave.id %}?{{pd}}"
+                            hx-target="#objectUpdateModalTarget"><ion-icon name="create-outline"></ion-icon></button>
                     {% endif %}
                     {% if request.user|is_reportingmanager or perms.leave.delete_availableleave %}
                     <a class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" hx-confirm="{% trans 'Are you sure you want to delete ?' %}" 
diff --git a/leave/templates/leave/leave_assign/available_update_form.html b/leave/templates/leave/leave_assign/available_update_form.html
index 53a5a20e8..f5739046c 100644
--- a/leave/templates/leave/leave_assign/available_update_form.html
+++ b/leave/templates/leave/leave_assign/available_update_form.html
@@ -41,7 +41,7 @@
 </div>
 <form
   hx-post="{% url 'available-leave-update' id %}?{{pd}}"
-  hx-target="#assignLeaveUpdateFormModal"
+  hx-target="#objectUpdateModalTarget"
 >
   <div class="oh-modal__dialog-body pb-2">
     <label class="oh-label d-block">{% trans "Available Days" %}</label>
diff --git a/leave/templates/leave/leave_assign/group_by.html b/leave/templates/leave/leave_assign/group_by.html
index bd764945f..ef3fdfc90 100644
--- a/leave/templates/leave/leave_assign/group_by.html
+++ b/leave/templates/leave/leave_assign/group_by.html
@@ -81,8 +81,8 @@
                   class="oh-sticky-table__tr"
                   draggable="false"
                   data-toggle="oh-modal-toggle"
-                  data-target="#objectDetailsModalW25"
-                  hx-target="#objectDetailsModalW25Target"
+                  data-target="#objectDetailsModal"
+                  hx-target="#objectDetailsModalTarget"
                   hx-get="{% url 'available-leave-single-view' available_leave.id %}?{{pd}}&instances_ids={{available_leave_ids}}"
                 >
                   <div
@@ -136,9 +136,9 @@
                         class="oh-btn oh-btn--light-bkg w-100"
                         title="{% trans 'Edit' %}"
                         data-toggle="oh-modal-toggle"
-                        data-target="#assignLeaveUpdateModal"
+                        data-target="#objectUpdateModal"
                         hx-get="{% url 'available-leave-update' available_leave.id %}?{{pd}}"
-                        hx-target="#assignLeaveUpdateFormModal"
+                        hx-target="#objectUpdateModalTarget"
                       >
                         <ion-icon name="create-outline"></ion-icon>
                       </button>
diff --git a/leave/templates/leave/leave_assign/leave_assign_form.html b/leave/templates/leave/leave_assign/leave_assign_form.html
index 0ece69c79..9593adfd4 100644
--- a/leave/templates/leave/leave_assign/leave_assign_form.html
+++ b/leave/templates/leave/leave_assign/leave_assign_form.html
@@ -13,17 +13,12 @@
     {% trans "Assign Leaves" %}
     <div class="oh-payslip__header mt-3 mb-0"></div>
   </span>
-  <button
-    class="oh-modal__close"
-    aria-label="Close"
-    hx-get="{% url 'assign-filter' %}"
-    hx-target="#assignedLeaves"
-  >
+  <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
   </button>
 </div>
 <div class="oh-modal__dialog-body">
-  <form hx-post="{% url 'assign' %}" hx-target="#assignLeaveFormModal">
+  <form hx-post="{% url 'assign' %}" hx-target="#objectCreateModalTarget">
     {{assign_form}}
     <div class="oh-modal__dialog-footer">
       <button type="submit" class="oh-btn oh-btn--secondary w-100">
diff --git a/leave/templates/leave/leave_assign/single_assign_view.html b/leave/templates/leave/leave_assign/single_assign_view.html
index dd7aae1a3..f9575bdb3 100644
--- a/leave/templates/leave/leave_assign/single_assign_view.html
+++ b/leave/templates/leave/leave_assign/single_assign_view.html
@@ -13,7 +13,6 @@
 <div class="oh-modal__dialog-header">
   <h2
     class="oh-modal__dialog-title"
-    style="margin-left: 30px"
     id="attendanceModalLabel"
   >
     {% trans "Details" %}
@@ -27,7 +26,7 @@
   <div class="oh-modal__dialog oh-modal__dialog--navigation m-0 p-0">
     <button
       hx-get="{% url 'available-leave-single-view' previous_instance %}?instances_ids={{instance_ids_json}}"
-      hx-target="#objectDetailsModalW25Target"
+      hx-target="#objectDetailsModalTarget"
       class="oh-modal__diaglog-nav oh-modal__nav-prev"
     >
       <ion-icon
@@ -40,7 +39,7 @@
 
     <button
       hx-get="{% url 'available-leave-single-view' next_instance %}?instances_ids={{instance_ids_json}}"
-      hx-target="#objectDetailsModalW25Target"
+      hx-target="#objectDetailsModalTarget"
       class="oh-modal__diaglog-nav oh-modal__nav-next"
     >
       <ion-icon
@@ -52,7 +51,6 @@
     </button>
   </div>
   {% if available_leave %}
-    <div class="oh-modal__dialog-header">
       <a
         class="oh-timeoff-modal__profile-content"
         style="text-decoration: none"
@@ -80,7 +78,7 @@
           </div>
         </div>
       </a>
-
+    <div class="oh-modal__dialog-header" style="padding-top: 5px">
       <div class="oh-timeoff-modal__stats-container mt-3 mb-3">
         <div class="oh-timeoff-modal__stat">
           <span class="oh-timeoff-modal__stat-title"
@@ -135,8 +133,8 @@
         <div class="oh-modal__button-container text-center">
           <div class="oh-btn-group">
             {% if request.user|is_reportingmanager or perms.leave.change_availableleave %}
-              <a hx-get="{% url 'available-leave-update' available_leave.id %}?{{pd}}" hx-target='#assignLeaveUpdateFormModal' 
-                data-toggle="oh-modal-toggle" data-target='#assignLeaveUpdateModal' class="oh-btn oh-btn--info w-50" title="{% trans 'Edit' %}">
+              <a hx-get="{% url 'available-leave-update' available_leave.id %}?{{pd}}" hx-target='#objectUpdateModalTarget' 
+                data-toggle="oh-modal-toggle" data-target='#objectUpdateModal' class="oh-btn oh-btn--info w-50" title="{% trans 'Edit' %}">
                 <ion-icon name="create-outline"></ion-icon>
               </a>
             {% endif %}
diff --git a/leave/templates/leave/user_leave/group_by.html b/leave/templates/leave/user_leave/group_by.html
index 1ad46983f..57b9394f3 100644
--- a/leave/templates/leave/user_leave/group_by.html
+++ b/leave/templates/leave/user_leave/group_by.html
@@ -1,5 +1,16 @@
 {% load attendancefilters %} {% load basefilters %} {% load static %}
 {% load i18n %} {% include 'filter_tags.html' %}
+{% if messages %}
+<div class="oh-wrapper">
+  {% for message in messages %}
+  <div class="oh-alert-container">
+    <div class="oh-alert oh-alert--animated {{message.tags}}">
+      {{ message }}
+    </div>
+  </div>
+  {% endfor %}
+</div>
+{% endif %}
 
 <!-- start of selection buttons -->
 <div
@@ -136,8 +147,10 @@
                                                 </button>
                                                 <a class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" 
                                                     title="{% trans 'Delete' %}" id="delete-link"
-                                                    onclick="return confirm('{% trans "Are you sure you want to delete ?" %}');"
-                                                    href="{% url 'user-request-delete' leave_request.id %}">
+                                                    hx-confirm="{% trans 'Are you sure you want to delete this leave request?' %}"
+                                                    hx-post="{% url 'user-request-delete' leave_request.id %}?{{pd}}"
+                                                    hx-target="#userRequest"
+                                                    >
                                                     <ion-icon name="trash-outline"></ion-icon>
                                                 </a>
                                             </div>
diff --git a/leave/templates/leave/user_leave/user_requests.html b/leave/templates/leave/user_leave/user_requests.html
index 3e7b8dffa..b4c00cc06 100644
--- a/leave/templates/leave/user_leave/user_requests.html
+++ b/leave/templates/leave/user_leave/user_requests.html
@@ -1,6 +1,16 @@
 {% load i18n %}
-{% load static %}   
-
+{% load static %}
+{% if messages %}
+<div class="oh-wrapper">
+  {% for message in messages %}
+  <div class="oh-alert-container">
+    <div class="oh-alert oh-alert--animated {{message.tags}}">
+      {{ message }}
+    </div>
+  </div>
+  {% endfor %}
+</div>
+{% endif %}
 {% include 'filter_tags.html' %}
 <div class="d-flex flex-row-reverse mb-2">
     <span class="me-3" style="cursor:pointer;" onclick="$('[name=status]').val('rejected');$('[name=status]').first().change();$('.filterButton').click()">
@@ -35,13 +45,6 @@
     >
     {% trans "Unselect All Requests" %}
 </div>
-{% comment %} <div
-    class="oh-checkpoint-badge text-info mb-2"
-    id="exportUserrequests"
-    style="cursor: pointer; display: none"
->
-    {% trans "Export Requests" %}
-</div> {% endcomment %}
 <div class="oh-checkpoint-badge text-danger mb-2" id="selectedShowUserrequests" style="display: none"></div>
 <!-- end of selection buttons -->
 
@@ -143,8 +146,10 @@
                                 </button>
                                 <a class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" 
                                     title="{% trans 'Delete' %}" id="delete-link"
-                                    onclick="return confirm('{% trans "Are you sure you want to delete ?" %}');"
-                                    href="{% url 'user-request-delete' leave_request.id %}">
+                                    hx-confirm="{% trans 'Are you sure you want to delete this leave request?' %}"
+                                    hx-post="{% url 'user-request-delete' leave_request.id %}?{{pd}}"
+                                    hx-target="#userRequest"
+                                    >
                                     <ion-icon name="trash-outline"></ion-icon>
                                 </a>
                             </div>
diff --git a/leave/views.py b/leave/views.py
index 64deda2db..ba591e651 100644
--- a/leave/views.py
+++ b/leave/views.py
@@ -1108,7 +1108,7 @@ def available_leave_update(request, id):
     """
     leave_assign = AvailableLeave.objects.get(id=id)
     form = AvailableLeaveUpdateForm(instance=leave_assign)
-    previous_data = request.GET.urlencode()
+    previous_data = request.GET.urlencode() or "field=leave_type_id"
     if request.method == "POST":
         form = AvailableLeaveUpdateForm(request.POST, instance=leave_assign)
         if form.is_valid():
@@ -1833,6 +1833,8 @@ def user_leave_request(request, id):
                         icon="people-circle",
                         redirect=f"/leave/request-view?id={leave_request.id}",
                     )
+                if len(LeaveRequest.objects.filter(employee_id=employee)) == 1:
+                    return HttpResponse("<script>window.location.reload();</script>")
         else:
             form.add_error(
                 None, _("You dont have enough leave days to make the request..")
@@ -1946,16 +1948,20 @@ def user_request_delete(request, id):
     Returns:
     GET : return user leave request view template
     """
+    previous_data = request.GET.urlencode()
     try:
         leave_request = LeaveRequest.objects.get(id=id)
         if request.user.employee_get == leave_request.employee_id:
-            LeaveRequest.objects.get(id=id).delete()
             messages.success(request, _("Leave request deleted successfully.."))
+            leave_request.delete()
     except LeaveRequest.DoesNotExist:
         messages.error(request, _("User has no leave request.."))
     except ProtectedError:
         messages.error(request, _("Related entries exists"))
-    return redirect(user_request_view)
+    if not LeaveRequest.objects.filter(employee_id=request.user.employee_get):
+        return HttpResponse("<script>window.location.reload();</script>")
+    else:
+        return redirect(f"/leave/user-request-filter?{previous_data}")
 
 
 @login_required
@@ -2680,6 +2686,11 @@ def leave_request_create(request):
                     )
                     mail_thread.start()
                     form = UserLeaveRequestCreationForm(initial={"employee_id": emp})
+                    if len(LeaveRequest.objects.filter(employee_id=emp_id)) == 1:
+                        return HttpResponse(
+                            "<script>window.location.reload();</script>"
+                        )
+
             return render(
                 request,
                 "leave/user_leave/request_form.html",