diff --git a/base/templates/mail/htmx/form.html b/base/templates/mail/htmx/form.html
index 950ba6818..d0f1d156a 100644
--- a/base/templates/mail/htmx/form.html
+++ b/base/templates/mail/htmx/form.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 {% if form.instance.id %}
-<form id="editForm" hx-post="{% url "view-mail-template" form.instance.id %}" hx-target="#viewTemplateModalBody">
+    <form id="editForm" hx-post="{% url "view-mail-template" form.instance.id %}" hx-target="#viewTemplateModalBody">
 {% else %}
-<form id="createForm" hx-post="{% url "create-mail-template" %}" hx-target="#viewTemplateModalBody">
+    <form id="createForm" hx-post="{% url "create-mail-template" %}" hx-target="#viewTemplateModalBody">
 {% endif %}
     <div id="viewTemplateModalContainer">
         <div class="my-3" id="keyResultCard">
diff --git a/base/templates/mail/view_templates.html b/base/templates/mail/view_templates.html
index 4ea781438..43a5b249e 100644
--- a/base/templates/mail/view_templates.html
+++ b/base/templates/mail/view_templates.html
@@ -40,8 +40,8 @@
         {% if perms.base.delete_horillamailtemplate %}
           <h3 class="oh-faq-card__title d-flex justify-content-between "><span>{{ template.title }}</span>
             <div>
-            <a hx-get="{% url 'duplicate-mail-template' template.id %}" hx-target="#duplicateTemplateFormModal" data-toggle="oh-modal-toggle"
-              data-target="#duplicateTemplateModal" title="{% trans 'Duplicate' %}" style= "cursor: pointer;">
+            <a hx-get="{% url 'duplicate-mail-template' template.id %}" hx-target="#viewTemplateModalBody" data-toggle="oh-modal-toggle"
+              data-target="#viewTemplateModal" title="{% trans 'Duplicate' %}" style= "cursor: pointer;">
               <ion-icon name="copy-outline"></ion-icon>
             </a>
             <a href="{% url "delete-mail-template" %}?ids={{template.id}}" class="text-danger" style="cursor: pointer;"
diff --git a/base/templatetags/horillafilters.py b/base/templatetags/horillafilters.py
index bbff108cd..8f8e613db 100644
--- a/base/templatetags/horillafilters.py
+++ b/base/templatetags/horillafilters.py
@@ -323,16 +323,16 @@ def is_check_in_enabled(request):
 
     # Fetch the settings based on the selected company
     if selected_company == "all":
-        attendance_settings, created = AttendanceGeneralSetting.objects.get_or_create(
+        attendance_settings = AttendanceGeneralSetting.objects.filter(
             company_id=None
-        )
+        ).first()
     else:
         company = Company.objects.filter(id=selected_company).first()
         if not company:
             return False  # Return False if the company doesn't exist
-        attendance_settings, created = AttendanceGeneralSetting.objects.get_or_create(
+        attendance_settings = AttendanceGeneralSetting.objects.filter(
             company_id=company
-        )
+        ).first()
 
     # Check if check-in is enabled
     return bool(attendance_settings and attendance_settings.enable_check_in)
diff --git a/base/urls.py b/base/urls.py
index c69635ec2..c83c52f9e 100644
--- a/base/urls.py
+++ b/base/urls.py
@@ -969,7 +969,11 @@ urlpatterns = [
         "announcement-viewed-by", announcement.viewed_by, name="announcement-viewed-by"
     ),
     path("driver-viewed", views.driver_viewed_status, name="driver-viewed"),
-    path("employee-charts", views.employee_charts, name="employee-charts"),
+    path(
+        "dashboard-components-toggle",
+        views.dashboard_components_toggle,
+        name="dashboard-components-toggle",
+    ),
     path("employee-chart-show", views.employee_chart_show, name="employee-chart-show"),
     path(
         "settings/enable-biometric-attendance/",
diff --git a/base/views.py b/base/views.py
index 7e3a06e7a..cbae15047 100644
--- a/base/views.py
+++ b/base/views.py
@@ -1232,6 +1232,7 @@ def object_duplicate(request, obj_id, **kwargs):
     template = kwargs["template"]
     original_object = model.objects.get(id=obj_id)
     form = form_class(instance=original_object)
+    searchWords = form.get_template_language()
     if request.method == "GET":
         for field_name, field in form.fields.items():
             if isinstance(field, forms.CharField):
@@ -1251,11 +1252,11 @@ def object_duplicate(request, obj_id, **kwargs):
             new_object.id = None
             new_object.save()
             return HttpResponse("<script>window.location.reload()</script>")
-
     context = {
         kwargs.get("form_name", "form"): form,
         "obj_id": obj_id,
         "duplicate": True,
+        "searchWords": searchWords,
     }
     return render(request, template, context)
 
@@ -6230,7 +6231,7 @@ def driver_viewed_status(request):
 
 
 @login_required
-def employee_charts(request):
+def dashboard_components_toggle(request):
     """
     This function is used to create personalized dashboard charts for employees
     """
diff --git a/templates/dashboard_tile_container.html b/templates/dashboard_tile_container.html
index 3d6aa88ea..25fb67ff4 100644
--- a/templates/dashboard_tile_container.html
+++ b/templates/dashboard_tile_container.html
@@ -9,7 +9,7 @@
                         <span class="oh-card-dashboard__title">{% trans 'Offline Employees' %}
                         </span>
                         <span class="float-end chart_close_button" role="button" data-chart="offline_employees"
-                            hx-post="{% url 'employee-charts' %}?chart_id=offline_employees" hx-target="#notInYetId"
+                            hx-post="{% url 'dashboard-components-toggle' %}?chart_id=offline_employees" hx-target="#notInYetId"
                             hx-swap="outerHTML">
                             <i class="material-icons fw-lighter fs-5">close</i>
                         </span>
@@ -29,7 +29,7 @@
                     <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                         <span class="oh-card-dashboard__title">{% trans 'Online Employees' %}</span>
                         <span class="float-end chart_close_button fs-5" role="button" data-chart="online_employees"
-                            hx-post="{% url 'employee-charts' %}?chart_id=online_employees" hx-target="#notoutYetId"
+                            hx-post="{% url 'dashboard-components-toggle' %}?chart_id=online_employees" hx-target="#notoutYetId"
                             hx-swap="outerHTML">
                             <i class="material-icons fw-lighter">close</i>
                         </span>
@@ -49,7 +49,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Overall Leave" %}</span>
                     <span class="float-end chart_close_button ms-3" role="button" data-chart="overall_leave_chart"
-                        hx-post="{% url 'employee-charts' %}?chart_id=overall_leave_chart" hx-target="#movable1"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=overall_leave_chart" hx-target="#movable1"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -74,7 +74,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Hired Candidates" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="hired_candidates"
-                        hx-post="{% url 'employee-charts' %}?chart_id=hired_candidates" hx-target="#movable2"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=hired_candidates" hx-target="#movable2"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -91,7 +91,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Candidates Started Onboarding" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="onboarding_candidates"
-                        hx-post="{% url 'employee-charts' %}?chart_id=onboarding_candidates" hx-target="#movable3"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=onboarding_candidates" hx-target="#movable3"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -110,7 +110,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Recruitment Analytics" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="recruitment_analytics"
-                        hx-post="{% url 'employee-charts' %}?chart_id=recruitment_analytics" hx-target="#movable8"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=recruitment_analytics" hx-target="#movable8"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -130,7 +130,7 @@
                     <div class="oh-card-dashboard__title mb-2">
                         {% trans "Attendance Analytics" %}
                         <span class="float-end chart_close_button " role="button" data-chart="attendance_analytic"
-                            hx-post="{% url 'employee-charts' %}?chart_id=attendance_analytic" hx-target="#movable4"
+                            hx-post="{% url 'dashboard-components-toggle' %}?chart_id=attendance_analytic" hx-target="#movable4"
                             hx-swap="outerHTML">
                             <i class="material-icons fw-lighter fs-5">close</i>
                         </span>
@@ -164,7 +164,7 @@
                     <div class="oh-card-dashboard__title mb-2">
                         {% trans "Hours Chart" %}
                         <span class="float-end chart_close_button " role="button" data-chart="hours_chart"
-                            hx-post="{% url 'employee-charts' %}?chart_id=hours_chart" hx-target="#pendingHours"
+                            hx-post="{% url 'dashboard-components-toggle' %}?chart_id=hours_chart" hx-target="#pendingHours"
                             hx-swap="outerHTML">
                             <i class="material-icons fw-lighter fs-5">close</i>
                         </span>
@@ -188,7 +188,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Employees Chart" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="employees_chart"
-                        hx-post="{% url 'employee-charts' %}?chart_id=employees_chart" hx-target="#movable5"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=employees_chart" hx-target="#movable5"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -207,7 +207,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Department Chart" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="department_chart"
-                        hx-post="{% url 'employee-charts' %}?chart_id=department_chart" hx-target="#movable6"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=department_chart" hx-target="#movable6"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -226,7 +226,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Gender Chart" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="gender_chart"
-                        hx-post="{% url 'employee-charts' %}?chart_id=gender_chart" hx-target="#movable7"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=gender_chart" hx-target="#movable7"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -244,7 +244,7 @@
             <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                 <span class="oh-card-dashboard__title">{% trans "Objective Status" %}</span>
                 <span class="float-end chart_close_button " role="button" data-chart="objective_status"
-                    hx-post="{% url 'employee-charts' %}?chart_id=objective_status" hx-target="#movable9"
+                    hx-post="{% url 'dashboard-components-toggle' %}?chart_id=objective_status" hx-target="#movable9"
                     hx-swap="outerHTML">
                     <i class="material-icons fw-lighter fs-5">close</i>
                 </span>
@@ -262,7 +262,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Key Result Status" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="key_result_status"
-                        hx-post="{% url 'employee-charts' %}?chart_id=key_result_status" hx-target="#movable10"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=key_result_status" hx-target="#movable10"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -281,7 +281,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Feedback Status" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="feedback_status"
-                        hx-post="{% url 'employee-charts' %}?chart_id=feedback_status" hx-target="#movable11"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=feedback_status" hx-target="#movable11"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -303,7 +303,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Shift Requests To Approve" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="shift_request_approve"
-                        hx-post="{% url 'employee-charts' %}?chart_id=shift_request_approve"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=shift_request_approve"
                         hx-target="#shiftRequestApprove" hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -324,7 +324,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Work Type Requests To Approve" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="work_type_request_approve"
-                        hx-post="{% url 'employee-charts' %}?chart_id=work_type_request_approve"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=work_type_request_approve"
                         hx-target="#WorkTypeRequestApprove" hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -348,7 +348,7 @@
                         {% trans 'Overtime To Approve' %}
                     </span>
                     <span class="float-end chart_close_button " role="button" data-chart="overtime_approve"
-                        hx-post="{% url 'employee-charts' %}?chart_id=overtime_approve" hx-target="#OTApprove"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=overtime_approve" hx-target="#OTApprove"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -371,7 +371,7 @@
                         {% trans 'Attendance To Validate' %}
                     </span>
                     <span class="float-end chart_close_button " role="button" data-chart="attendance_validate"
-                        hx-post="{% url 'employee-charts' %}?chart_id=attendance_validate" hx-target="#AttendanceValidate"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=attendance_validate" hx-target="#AttendanceValidate"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -392,7 +392,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Leave Requests To Approve" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="leave_request_approve"
-                        hx-post="{% url 'employee-charts' %}?chart_id=leave_request_approve" hx-target="#LeaveApprove"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=leave_request_approve" hx-target="#LeaveApprove"
                         hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -413,7 +413,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Leave Allocation Request To Approve" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="leave_allocation_approve"
-                        hx-post="{% url 'employee-charts' %}?chart_id=leave_allocation_approve"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=leave_allocation_approve"
                         hx-target="#LeaveAllocationApprove" hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>
@@ -432,7 +432,7 @@
             <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                 <span class="oh-card-dashboard__title">{% trans "Feedback To Answers" %}</span>
                 <span class="float-end chart_close_button " role="button" data-chart="feedback_answer"
-                    hx-post="{% url 'employee-charts' %}?chart_id=feedback_answer" hx-target="#feedbackAnswer"
+                    hx-post="{% url 'dashboard-components-toggle' %}?chart_id=feedback_answer" hx-target="#feedbackAnswer"
                     hx-swap="outerHTML">
                     <i class="material-icons fw-lighter fs-5">close</i>
                 </span>
@@ -452,7 +452,7 @@
                 <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
                     <span class="oh-card-dashboard__title">{% trans "Asset Requests To Approve" %}</span>
                     <span class="float-end chart_close_button " role="button" data-chart="asset_request_approve"
-                        hx-post="{% url 'employee-charts' %}?chart_id=asset_request_approve"
+                        hx-post="{% url 'dashboard-components-toggle' %}?chart_id=asset_request_approve"
                         hx-target="#assetRequestApprove" hx-swap="outerHTML">
                         <i class="material-icons fw-lighter fs-5">close</i>
                     </span>