diff --git a/base/templates/request_and_approve/shift_request.html b/base/templates/request_and_approve/shift_request.html
index b94cb0198..d5bf42470 100644
--- a/base/templates/request_and_approve/shift_request.html
+++ b/base/templates/request_and_approve/shift_request.html
@@ -64,12 +64,11 @@
     </div>
 </div>
 {% else %}
-<div class="oh-empty h-100">
-    <p class="oh-empty__message">
-        <img style="display: block;width: 70px;margin: 20px auto ;" src="{% static "/images/ui/no_records.svg" %}" class="" alt=""/>
-        {% trans "No records available at the moment." %}
-    </p>
-</div>
+    <div class="oh-empty h-100">
+        <img src="{% static 'images/ui/search.svg' %}" class="oh-404__image" alt="Page not found. 404." />
+        <h1 class="oh-empty__title">{% trans "No Records found." %}</h1>
+        <p class="oh-empty__subtitle">{% trans "No records available at the moment." %}</p>
+    </div>
 {% endif %}
 {% if requests.has_next or requests.has_previous %}
     <div class=" float-end mt-3 mb-3">
diff --git a/base/templates/request_and_approve/work_type_request.html b/base/templates/request_and_approve/work_type_request.html
index 70df6131f..84c4b35bb 100644
--- a/base/templates/request_and_approve/work_type_request.html
+++ b/base/templates/request_and_approve/work_type_request.html
@@ -63,12 +63,11 @@
     </div>
 </div>
 {% else %}
-<div class="oh-empty h-100">
-    <p class="oh-empty__message">
-        <img style="display: block;width: 70px;margin: 20px auto ;" src="{% static "/images/ui/no_records.svg" %}" class="" alt=""/>
-        {% trans "No records available at the moment." %}
-    </p>
-</div>
+    <div class="oh-empty h-100">
+        <img src="{% static 'images/ui/search.svg' %}" class="oh-404__image" alt="Page not found. 404." />
+        <h1 class="oh-empty__title">{% trans "No Records found." %}</h1>
+        <p class="oh-empty__subtitle">{% trans "No records available at the moment." %}</p>
+    </div>
 {% endif %}
 {% if requests.has_next or requests.has_previous %}
     <div class=" float-end mt-3 mb-3">
diff --git a/leave/resources.py b/leave/resources.py
deleted file mode 100644
index f21255ea5..000000000
--- a/leave/resources.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""
-Module for Import-Export Resources
-
-This module defines resources for exporting and importing data using the django-import-export library.
-"""
-
-from import_export import resources
-
-from .models import Holiday
-
-
-class HolidayResource(resources.ModelResource):
-    class Meta:
-        model = Holiday
diff --git a/base/templates/request_and_approve/leave_allocation_approve.html b/leave/templates/leave/dashboard/leave_allocation_approve.html
similarity index 95%
rename from base/templates/request_and_approve/leave_allocation_approve.html
rename to leave/templates/leave/dashboard/leave_allocation_approve.html
index 11f75fb37..0e92ab8da 100644
--- a/base/templates/request_and_approve/leave_allocation_approve.html
+++ b/leave/templates/leave/dashboard/leave_allocation_approve.html
@@ -63,10 +63,9 @@
 </div>
 {% else %}
     <div class="oh-empty h-100">
-        <p class="oh-empty__message">
-            <img style="display: block;width: 70px;margin: 20px auto ;" src="{% static "/images/ui/no_records.svg" %}" class="" alt=""/>
-            {% trans "No records available at the moment." %}
-        </p>
+        <img src="{% static 'images/ui/search.svg' %}" class="oh-404__image" alt="Page not found. 404." />
+        <h1 class="oh-empty__title">{% trans "No Records found." %}</h1>
+        <p class="oh-empty__subtitle">{% trans "No records available at the moment." %}</p>
     </div>
 {% endif %}
 {% if allocation_reqests.has_next or allocation_reqests.has_previous %}
diff --git a/base/templates/request_and_approve/leave_request_approve.html b/leave/templates/leave/dashboard/leave_request_approve.html
similarity index 94%
rename from base/templates/request_and_approve/leave_request_approve.html
rename to leave/templates/leave/dashboard/leave_request_approve.html
index 4c2ef02e1..2d486a589 100644
--- a/base/templates/request_and_approve/leave_request_approve.html
+++ b/leave/templates/leave/dashboard/leave_request_approve.html
@@ -49,10 +49,9 @@
     </div>
 {% else %}
     <div class="oh-empty h-100">
-        <p class="oh-empty__message">
-            <img style="display: block;width: 70px;margin: 20px auto ;" src="{% static "/images/ui/no_records.svg" %}" class="" alt=""/>
-            {% trans "No records available at the moment." %}
-        </p>
+        <img src="{% static 'images/ui/search.svg' %}" class="oh-404__image" alt="Page not found. 404." />
+        <h1 class="oh-empty__title">{% trans "No Records found." %}</h1>
+        <p class="oh-empty__subtitle">{% trans "No records available at the moment." %}</p>
     </div>
 {% endif %}
 {% if leave_requests.has_next or leave_requests.has_previous %}
@@ -82,4 +81,4 @@
             </span>
         {% endif %}
     </div>
-{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/leave/templates/leave/on_leave.html b/leave/templates/leave/dashboard/on_leave.html
similarity index 85%
rename from leave/templates/leave/on_leave.html
rename to leave/templates/leave/dashboard/on_leave.html
index ca6b773a3..6461c1cee 100644
--- a/leave/templates/leave/on_leave.html
+++ b/leave/templates/leave/dashboard/on_leave.html
@@ -31,9 +31,8 @@
     </div>
 {% else %}
     <div class="oh-empty h-100">
-        <p class="oh-empty__message">
-            <img style="display: block;width: 70px;margin: 20px auto ;" src="{% static 'images/ui/attendance.png' %}"/>
-            {% trans "No employees have taken leave today." %}
-        </p>
+        <img src="{% static 'images/ui/search.svg' %}" class="oh-404__image" alt="Page not found. 404." />
+        <h1 class="oh-empty__title">{% trans "No Records found." %}</h1>
+        <p class="oh-empty__subtitle">{% trans "No employees have taken leave today." %}</p>
     </div>
-{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/leave/views.py b/leave/views.py
index f2d21af02..273b1d669 100644
--- a/leave/views.py
+++ b/leave/views.py
@@ -2707,7 +2707,7 @@ def employee_leave(request):
     today_holidays = Holidays.today_holidays()
     return render(
         request,
-        "leave/on_leave.html",
+        "leave/dashboard/on_leave.html",
         {
             "leaves": leaves,
             "requests_ids": requests_ids,
@@ -5287,7 +5287,7 @@ def leave_request_and_approve(request):
     leave_requests_ids = json.dumps([instance.id for instance in leave_requests])
     return render(
         request,
-        "request_and_approve/leave_request_approve.html",
+        "leave/dashboard/leave_request_approve.html",
         {
             "leave_requests": leave_requests,
             "requests_ids": leave_requests_ids,
@@ -5313,7 +5313,7 @@ def leave_allocation_approve(request):
     )
     return render(
         request,
-        "request_and_approve/leave_allocation_approve.html",
+        "leave/dashboard/leave_allocation_approve.html",
         {
             "allocation_reqests": allocation_reqests,
             "reqests_ids": allocation_reqests_ids,
diff --git a/base/templates/request_and_approve/feedback_answer.html b/pms/templates/dashboard/feedback_answer.html
similarity index 92%
rename from base/templates/request_and_approve/feedback_answer.html
rename to pms/templates/dashboard/feedback_answer.html
index 20f1fcf9a..004ba4131 100644
--- a/base/templates/request_and_approve/feedback_answer.html
+++ b/pms/templates/dashboard/feedback_answer.html
@@ -48,10 +48,9 @@
 </div>
 {% else %}
     <div class="oh-empty h-100">
-        <p class="oh-empty__message">
-            <img style="display: block;width: 70px;margin: 20px auto ;" src="{% static "/images/ui/no_records.svg" %}" class="" alt=""/>
-            {% trans "No records available at the moment." %}
-        </p>
+        <img src="{% static 'images/ui/search.svg' %}" class="oh-404__image" alt="Page not found. 404." />
+        <h1 class="oh-empty__title">{% trans "No Records found." %}</h1>
+        <p class="oh-empty__subtitle">{% trans "No records available at the moment." %}</p>
     </div>
 {% endif %}
 {% if feedbacks.has_next or feedbacks.has_previous %}
@@ -81,4 +80,4 @@
             </span>
         {% endif %}
     </div>
-{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/pms/views.py b/pms/views.py
index 9a296196d..8543b3fd6 100644
--- a/pms/views.py
+++ b/pms/views.py
@@ -3807,9 +3807,10 @@ def dashboard_feedback_answer(request):
     ).distinct()
     feedbacks = feedback_requested.exclude(feedback_answer__employee_id=employee)
     feedbacks = paginator_qry(feedbacks, page_number)
+
     return render(
         request,
-        "request_and_approve/feedback_answer.html",
+        "dashboard/feedback_answer.html",
         {
             "feedbacks": feedbacks,
             "pd": previous_data,
diff --git a/templates/announcements_list.html b/templates/announcements_list.html
deleted file mode 100644
index b60488811..000000000
--- a/templates/announcements_list.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% load static %}
-{% load i18n %}
-<div class="oh-sticky-table" style="height:400px; border:none;">
-    <div class="oh-sticky-table__table oh-table--sortable">
-        <div class="oh-sticky-table__tbody">
-            {% if not announcements %}
-                <div style="margin-top:30%">
-                    <div class="oh-404" style="position:revert; transform:none">
-                        <img style="width: 80px;height: 80px; margin-bottom:20px"
-                            src="{% static 'images/ui/no-announcement.svg' %}" class="oh-404__image"
-                            alt="Page not found. 404." />
-                        <h5 class="oh-404__subtitle">{% trans "No Announcements to show." %}</h5>
-                    </div>
-                </div>
-            {% else %}
-                {% for announcement in announcements %}
-                    <div class="oh-sticky-table__tr" draggable="true">
-                        <div class="announcement_title">
-                            <a class="oh-profile oh-profile--md" style="text-decoration:none;"
-                                hx-on:click="$('#objectDetailsModal').addClass('oh-modal--show');"
-                                hx-get="{% url 'announcement-single-view' announcement.id %}?instance_ids={{instance_ids}}"
-                                hx-target="#objectDetailsModalTarget" onclick="closeNew(this)">
-                                <div class="oh-profile__avatar mr-1">
-                                    <img src="https://ui-avatars.com/api/?name={{announcement.title}}&background=random"
-                                        class="oh-profile__image" />
-                                </div>
-                                <span class="oh-profile__name oh-text--dark fw-bold">
-                                    {{announcement.title}}
-                                </span>
-                                {% if announcement.created_at|date:"Y-m-d" == current_date and request.user not in announcement.viewed_by %}
-                                    <span class="oh-profile__info-value ms-2" id="newTab"
-                                        style="background-color: hsl(8,77%,56%); color:white;
-                                                font-size: 0.7rem; padding: 3px 8px; border-radius: 15px; font-weight: 800; width:auto;">
-                                        {% trans "NEW" %}
-                                    </span>
-                                {% endif %}
-                            </a>
-                        </div>
-                    </div>
-                {% endfor %}
-            {% endif %}
-        </div>
-    </div>
-</div>