diff --git a/asset/static/src/asset_category/assetCategoryView.js b/asset/static/src/asset_category/assetCategoryView.js
index adffbb06e..82ab8f9fc 100644
--- a/asset/static/src/asset_category/assetCategoryView.js
+++ b/asset/static/src/asset_category/assetCategoryView.js
@@ -76,7 +76,7 @@ function getAssetImportTemplate() {
 						const url = URL.createObjectURL(file);
 						const link = document.createElement("a");
 						link.href = url;
-						link.download = "my_excel_file.xlsx";
+						link.download = "asset_excel.xlsx";
 						document.body.appendChild(link);
 						link.click();
 					},
diff --git a/asset/templates/batch/asset_batch_empty.html b/asset/templates/batch/asset_batch_empty.html
index 903f4bb0b..a5e5788a2 100644
--- a/asset/templates/batch/asset_batch_empty.html
+++ b/asset/templates/batch/asset_batch_empty.html
@@ -1,59 +1,34 @@
 {% extends 'index.html' %} {% block content %} {% load static %}
 {% load i18n %} {% load widget_tweaks %}
 
-<!-- start of messages -->
-{% 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 }}
+<section class="oh-wrapper oh-main__topbar">
+    <div class="oh-main__titlebar oh-main__titlebar--left">
+        <h1 class="oh-main__titlebar-title fw-bold">
+            {% trans "Asset Batch Number" %}
+        </h1>
     </div>
-  </div>
-  {% endfor %}
-</div>
-{% endif %}
-<!-- end of messages -->
-
-<main :class="sidebarOpen ? 'oh-main__sidebar-visible' : ''">
-    <section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-        <div class="oh-main__titlebar oh-main__titlebar--left">
-            <h1 class="oh-main__titlebar-title fw-bold">
-              {% trans "Asset Batch Number" %}
-            </h1>
-        </div>
-        <div class="oh-main__titlebar oh-main__titlebar--right">
-            <div class="oh-main__titlebar-button-container">
-                {% if perms.asset.add_assetlot %}
-                    <div class="oh-btn-group ml-2">
-                        <div>
-                            <a class="oh-btn oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle" data-target="#objectCreateModal"
-                                hx-get="{% url 'asset-batch-number-creation' %}" hx-target="#objectCreateModalTarget">
-                                <ion-icon class="me-2" name="add-outline"></ion-icon>{% trans "Create" %}
-                            </a>
-                        </div>
-                    </div>
-                {% endif %}
+    <div class="oh-main__titlebar oh-main__titlebar--right">
+        <div class="oh-main__titlebar-button-container">
+            {% if perms.asset.add_assetlot %}
+            <div class="oh-btn-group ml-2">
+                <div>
+                    <a class="oh-btn oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
+                        data-target="#objectCreateModal" hx-get="{% url 'asset-batch-number-creation' %}"
+                        hx-target="#objectCreateModalTarget">
+                        <ion-icon class="me-2" name="add-outline"></ion-icon>{% trans "Create" %}
+                    </a>
+                </div>
             </div>
+            {% endif %}
         </div>
-    </section>
-</main>
+    </div>
+</section>
 
-<div class="oh-wrapper-main">
-    <main :class="sidebarOpen ? 'oh-main__sidebar-visible' : ''">
-        <div class="oh-wrapper">
-            <div class="oh-404">
-                <img
-                  style="width: 190px; height: 190px"
-                  src="{% static 'images/ui/batch.png' %}"
-                  class="oh-404__image mb-4"
-                  alt="Page not found. 404."
-                />
-                <h5 class="oh-404__subtitle">
-                  {% trans "No Asset Batches have been created." %}
-                </h5>
-            </div>
-        </div>
-    </main>
+<div class="oh-wrapper">
+    <div class="oh-empty">
+        <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 Asset Batches have been created." %}</p>
+    </div>
 </div>
 {% endblock %}
diff --git a/asset/templates/category/asset_empty.html b/asset/templates/category/asset_empty.html
index 0cbdd505d..6888039db 100644
--- a/asset/templates/category/asset_empty.html
+++ b/asset/templates/category/asset_empty.html
@@ -5,99 +5,57 @@
 {% load widget_tweaks %}
 {% load assets_custom_filter %}
 
-
-<style>
-    .button-link {
-        display: inline-block;
-        padding: 12px 15px;
-        background-color: #F0EFEF; /* Change this to your desired button color */
-        color: #312D2D; /* Text color for the button */
-        text-align: center;
-        text-decoration: none;
-        cursor: pointer;
-    }
-</style>
-
-<!-- start of messages -->
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated oh-alert--warning">
-            {{ message }}
-        </div>
+<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
+    <div class="oh-main__titlebar oh-main__titlebar--left">
+        <h1 class="oh-main__titlebar-title fw-bold">{{ model.get_verbose_name }}</h1>
     </div>
-    {% endfor %}
-</div>
-{% endif %}
-<!-- end of messages -->
+    <div class="oh-main__titlebar oh-main__titlebar--right">
 
-<main :class="sidebarOpen ? 'oh-main__sidebar-visible' : ''">
-    <section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-        <div class="oh-main__titlebar oh-main__titlebar--left">
-            <h1 class="oh-main__titlebar-title fw-bold">{{ model.get_verbose_name }}</h1>
-        </div>
-        <div class="oh-main__titlebar oh-main__titlebar--right">
-
-            <div class="oh-main__titlebar-button-container">
-                {% if perms.asset.add_asset %}
-                <!-- import asset start  -->
-                <div class="oh-dropdown" >
-                        <button class="ml-2" id="import-button" style='border:none'>
-                            <a href="#" id="asset-info-import" class="button-link" onclick="return confirm('{% trans "Do you want to download template ?" %}')"><ion-icon name="arrow-down-outline" class="me-1"></ion-icon> {% trans "Import" %}</a>
-                        </button>
-                    <div class="oh-dropdown__import oh-dropdown__import--right " style="display: none;" id ="import-dropdown" >
-                        <button class="oh-modal__close close-import"  aria-label="Close">
-                            <ion-icon name="close-outline"></ion-icon>
-                          </button>
-                        <div id="AssetImportResponse"></div>
-                        <form action="{%url 'asset-import' %}" enctype="multipart/form-data" method="post">
-                            {% csrf_token %}
-                            <div class="oh-dropdown__import-form">
-                                <label class="oh-dropdown__import-label" for="uploadFile">
-                                    <ion-icon name="cloud-upload" class="oh-dropdown__import-form-icon"></ion-icon>
-                                    <span class="oh-dropdown__import-form-title">{% trans "Upload a File" %}</span>
-                                    <span class="oh-dropdown__import-form-text">{% trans "Drag and drop files here" %}</span>
-                                </label>
-                                <input type="file" name="asset_import" id="" />
-                            </div>
-                            <button type="submit"
-                                class="oh-btn oh-btn--small oh-btn--secondary w-100 mt-3">{% trans "Upload" %}</button>
-                        </form>
-                    </div>
-                </div>
-                {% endif %}
-                <!-- import asset end  -->
-                <div class="oh-btn-group ml-2">
-                    {% if perms.asset.add_assetcategory %}
-                        <div>
-                            <a  href="#" class="oh-btn oh-btn--secondary oh-btn--shadow"
-                                data-toggle="oh-modal-toggle"
-                                data-target="#objectCreateModal"
-                                hx-get="{%url 'asset-category-creation' %}"
-                                hx-target="#objectCreateModalTarget">
-                                <ion-icon name="add-outline"></ion-icon>
-                                {% trans "Create" %}
+        <div class="oh-main__titlebar-button-container">
+            {% if perms.asset.add_asset %}
+            <div class="oh-dropdown ml-2" x-data="{open: false}">
+                <button onclick="event.stopPropagation();event.preventDefault()" class="oh-btn oh-btn--dropdown"
+                    @click="open = !open" @click.outside="open = false">
+                    {% trans "Actions" %}
+                </button>
+                <div class="oh-dropdown__menu oh-dropdown__menu--right" x-show="open" style="display: none">
+                    <ul class="oh-dropdown__items">
+                        <li class="oh-dropdown__item" id="import-button">
+                            <a href="#" class="oh-dropdown__link asset-info-import" data-toggle="oh-modal-toggle"
+                                data-target="#objectCreateModal" hx-get="{%url 'asset-import' %}"
+                                hx-target="#objectCreateModalTarget" class="button-link"
+                                onclick="return confirm('{% trans "Do you want to download template ?" %}')">
+                                {% trans "Import" %}
                             </a>
-                        </div>
-                    {% endif %}
+                        </li>
+                    </ul>
                 </div>
             </div>
+            {% endif %}
+            <!-- import asset end  -->
+            <div class="oh-btn-group ml-2">
+                {% if perms.asset.add_assetcategory %}
+                    <div>
+                        <a href="#" class="oh-btn oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
+                            data-target="#objectCreateModal" hx-get="{%url 'asset-category-creation' %}"
+                            hx-target="#objectCreateModalTarget">
+                            <ion-icon name="add-outline"></ion-icon>
+                            {% trans "Create" %}
+                        </a>
+                    </div>
+                {% endif %}
+            </div>
         </div>
-    </section>
-</main>
-<div
-class="oh-wrapper-main"
->
-  <main :class="sidebarOpen ? 'oh-main__sidebar-visible' : ''">
-    <div class="oh-wrapper">
-      <div class="oh-404">
-          <img style="    width: 190px;height: 190px;" src="{% static 'images/ui/asset.png' %}" class="oh-404__image mb-4" alt="Page not found. 404."/>
-          <h5 class="oh-404__subtitle">{% trans "There is no Asset category and no Assets has been created." %}</h5>
-      </div>
     </div>
-  </main>
-</div>
+</section>
+
+
+<div class="oh-wrapper">
+    <div class="oh-empty">
+        <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 Asset Categories or Assets have been created." %}</p>
+    </div>
 </div>
 
 <script src="{% static 'src/asset_category/assetCategoryView.js' %}"></script>