diff --git a/engine/core/templates/admin/dashboard/_filters.html b/engine/core/templates/admin/dashboard/_filters.html
index cdf24eb8..4001bedd 100644
--- a/engine/core/templates/admin/dashboard/_filters.html
+++ b/engine/core/templates/admin/dashboard/_filters.html
@@ -1,22 +1,14 @@
 {% load i18n unfold %}
 
-{% component "unfold/components/card.html" with class="mb-4" %}
-    <div class="flex flex-wrap items-center gap-2">
-        {% component "unfold/components/text.html" with class="text-sm text-gray-500 dark:text-gray-400 mr-2" %}
-            {% trans "Timeframe" %}
-        {% endcomponent %}
-        {% with cur=tf|default:30 %}
-            <a href="?tf=7"
-               class="px-3 py-1 rounded-full text-sm border transition-colors {% if cur == 7 %} bg-gray-900 text-white dark:bg-white dark:text-gray-900 border-transparent {% else %} border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800 {% endif %}">7d</a>
-            <a href="?tf=30"
-               class="px-3 py-1 rounded-full text-sm border transition-colors {% if cur == 30 %} bg-gray-900 text-white dark:bg-white dark:text-gray-900 border-transparent {% else %} border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800 {% endif %}">30d</a>
-            <a href="?tf=90"
-               class="px-3 py-1 rounded-full text-sm border transition-colors {% if cur == 90 %} bg-gray-900 text-white dark:bg-white dark:text-gray-900 border-transparent {% else %} border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800 {% endif %}">90d</a>
-            <a href="?tf=360"
-               class="px-3 py-1 rounded-full text-sm border transition-colors {% if cur == 360 %} bg-gray-900 text-white dark:bg-white dark:text-gray-900 border-transparent {% else %} border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800 {% endif %}">360d</a>
-        {% endwith %}
-{#        <div class="ml-auto text-xs text-gray-400">#}
-{#             TODO: Integrate GA/Yandex.Metrica & Ads metrics#}
-{#        </div>#}
-    </div>
-{% endcomponent %}
+<div class="flex flex-wrap items-center gap-2">
+    {% with cur=tf|default:30 %}
+        <a href="?tf=7"
+           class="px-3 py-1 rounded-full text-sm border transition-colors {% if cur == 7 %} bg-gray-900 text-white dark:bg-white dark:text-gray-900 border-transparent {% else %} border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800 {% endif %}">7d</a>
+        <a href="?tf=30"
+           class="px-3 py-1 rounded-full text-sm border transition-colors {% if cur == 30 %} bg-gray-900 text-white dark:bg-white dark:text-gray-900 border-transparent {% else %} border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800 {% endif %}">30d</a>
+        <a href="?tf=90"
+           class="px-3 py-1 rounded-full text-sm border transition-colors {% if cur == 90 %} bg-gray-900 text-white dark:bg-white dark:text-gray-900 border-transparent {% else %} border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800 {% endif %}">90d</a>
+        <a href="?tf=360"
+           class="px-3 py-1 rounded-full text-sm border transition-colors {% if cur == 360 %} bg-gray-900 text-white dark:bg-white dark:text-gray-900 border-transparent {% else %} border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800 {% endif %}">360d</a>
+    {% endwith %}
+</div>
diff --git a/engine/core/templates/admin/dashboard/_product_lists.html b/engine/core/templates/admin/dashboard/_product_lists.html
index a71b0095..1c00b3cd 100644
--- a/engine/core/templates/admin/dashboard/_product_lists.html
+++ b/engine/core/templates/admin/dashboard/_product_lists.html
@@ -1,71 +1,69 @@
 {% load i18n unfold %}
 
-<div class="grid grid-cols-1 lg:grid-cols-2 gap-6 mt-6">
-    {% component "unfold/components/card.html" %}
-        {% component "unfold/components/title.html" %}
-            {% trans "Most wished product" %}
-        {% endcomponent %}
-        {% if most_wished_products %}
-            <ul class="flex flex-col divide-y divide-gray-200 dark:divide-base-700/50">
-                {% for p in most_wished_products %}
-                    <li class="py-2 first:pt-0 last:pb-0">
-                        <a href="{{ p.admin_url }}" class="flex items-center gap-4">
-                            {% if p.image %}
-                                <img src="{{ p.image }}" alt="{{ p.name }}"
-                                     class="w-12 h-12 object-cover rounded"/>
-                            {% endif %}
-                            <span class="font-medium flex-1 truncate">{{ p.name }}</span>
-                            <span class="text-xs px-2 py-0.5 rounded bg-base-700/[.06] dark:bg-white/[.06] text-gray-700 dark:text-gray-200">{{ p.count }}</span>
-                        </a>
-                    </li>
-                {% endfor %}
-            </ul>
-        {% elif most_wished_product %}
-            <a href="{{ most_wished_product.admin_url }}" class="flex items-center gap-4">
-                {% if most_wished_product.image %}
-                    <img src="{{ most_wished_product.image }}" alt="{{ most_wished_product.name }}"
-                         class="w-16 h-16 object-cover rounded"/>
-                {% endif %}
-                <span class="font-medium">{{ most_wished_product.name }}</span>
-            </a>
-        {% else %}
-            {% component "unfold/components/text.html" %}
-                {% trans "No data yet." %}
-            {% endcomponent %}
-        {% endif %}
+{% component "unfold/components/card.html" %}
+    {% component "unfold/components/title.html" %}
+        {% trans "Most wished product" %}
     {% endcomponent %}
+    {% if most_wished_products %}
+        <ul class="flex flex-col divide-y divide-gray-200 dark:divide-base-700/50">
+            {% for p in most_wished_products %}
+                <li class="py-2 first:pt-0 last:pb-0">
+                    <a href="{{ p.admin_url }}" class="flex items-center gap-4">
+                        {% if p.image %}
+                            <img src="{{ p.image }}" alt="{{ p.name }}"
+                                 class="w-12 h-12 object-cover rounded"/>
+                        {% endif %}
+                        <span class="font-medium flex-1 truncate">{{ p.name }}</span>
+                        <span class="text-xs px-2 py-0.5 rounded bg-base-700/[.06] dark:bg-white/[.06] text-gray-700 dark:text-gray-200">{{ p.count }}</span>
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
+    {% elif most_wished_product %}
+        <a href="{{ most_wished_product.admin_url }}" class="flex items-center gap-4">
+            {% if most_wished_product.image %}
+                <img src="{{ most_wished_product.image }}" alt="{{ most_wished_product.name }}"
+                     class="w-16 h-16 object-cover rounded"/>
+            {% endif %}
+            <span class="font-medium">{{ most_wished_product.name }}</span>
+        </a>
+    {% else %}
+        {% component "unfold/components/text.html" %}
+            {% trans "No data yet." %}
+        {% endcomponent %}
+    {% endif %}
+{% endcomponent %}
 
-    {% component "unfold/components/card.html" %}
-        {% component "unfold/components/title.html" %}
-            {% trans "Most popular product" %}
-        {% endcomponent %}
-        {% if most_popular_products %}
-            <ul class="flex flex-col divide-y divide-gray-200 dark:divide-base-700/50">
-                {% for p in most_popular_products %}
-                    <li class="py-2 first:pt-0 last:pb-0">
-                        <a href="{{ p.admin_url }}" class="flex items-center gap-4">
-                            {% if p.image %}
-                                <img src="{{ p.image }}" alt="{{ p.name }}"
-                                     class="w-12 h-12 object-cover rounded"/>
-                            {% endif %}
-                            <span class="font-medium flex-1 truncate">{{ p.name }}</span>
-                            <span class="text-xs px-2 py-0.5 rounded bg-base-700/[.06] dark:bg-white/[.06] text-gray-700 dark:text-gray-200">{{ p.count }}</span>
-                        </a>
-                    </li>
-                {% endfor %}
-            </ul>
-        {% elif most_popular_product %}
-            <a href="{{ most_popular_product.admin_url }}" class="flex items-center gap-4">
-                {% if most_popular_product.image %}
-                    <img src="{{ most_popular_product.image }}" alt="{{ most_popular_product.name }}"
-                         class="w-16 h-16 object-cover rounded"/>
-                {% endif %}
-                <span class="font-medium">{{ most_popular_product.name }}</span>
-            </a>
-        {% else %}
-            {% component "unfold/components/text.html" %}
-                {% trans "No data yet." %}
-            {% endcomponent %}
-        {% endif %}
+{% component "unfold/components/card.html" %}
+    {% component "unfold/components/title.html" %}
+        {% trans "Most popular product" %}
     {% endcomponent %}
-</div>
+    {% if most_popular_products %}
+        <ul class="flex flex-col divide-y divide-gray-200 dark:divide-base-700/50">
+            {% for p in most_popular_products %}
+                <li class="py-2 first:pt-0 last:pb-0">
+                    <a href="{{ p.admin_url }}" class="flex items-center gap-4">
+                        {% if p.image %}
+                            <img src="{{ p.image }}" alt="{{ p.name }}"
+                                 class="w-12 h-12 object-cover rounded"/>
+                        {% endif %}
+                        <span class="font-medium flex-1 truncate">{{ p.name }}</span>
+                        <span class="text-xs px-2 py-0.5 rounded bg-base-700/[.06] dark:bg-white/[.06] text-gray-700 dark:text-gray-200">{{ p.count }}</span>
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
+    {% elif most_popular_product %}
+        <a href="{{ most_popular_product.admin_url }}" class="flex items-center gap-4">
+            {% if most_popular_product.image %}
+                <img src="{{ most_popular_product.image }}" alt="{{ most_popular_product.name }}"
+                     class="w-16 h-16 object-cover rounded"/>
+            {% endif %}
+            <span class="font-medium">{{ most_popular_product.name }}</span>
+        </a>
+    {% else %}
+        {% component "unfold/components/text.html" %}
+            {% trans "No data yet." %}
+        {% endcomponent %}
+    {% endif %}
+{% endcomponent %}
diff --git a/engine/core/templates/admin/index.html b/engine/core/templates/admin/index.html
index 3257e12b..1a35dd74 100644
--- a/engine/core/templates/admin/index.html
+++ b/engine/core/templates/admin/index.html
@@ -18,17 +18,13 @@
         <div class="flex flex-col min-h-screen">
             {% component "unfold/components/title.html" %}
                 {% trans "Dashboard" %}
-                <br/>
+                {% include "admin/dashboard/_filters.html" %}
             {% endcomponent %}
 
-            {% include "admin/dashboard/_filters.html" %}
-
             {% include "admin/dashboard/_kpis.html" %}
 
             <div class="grid grid-cols-1 xl:grid-cols-3 gap-6 items-start">
-                <div class="xl:col-span-2">
-                    {% include "admin/dashboard/_daily_sales.html" %}
-                </div>
+                {% include "admin/dashboard/_daily_sales.html" %}
             </div>
 
             <div class="grid grid-cols-1 lg:grid-cols-2 gap-6 mt-6">
@@ -43,11 +39,7 @@
                 {% endif %}
             </div>
 
-            <div class="grid grid-cols-1 lg:grid-cols-2 gap-6 mt-6">
-                {% include "admin/dashboard/_top_categories.html" %}
-                {% include "admin/dashboard/_quick_links.html" %}
-            </div>
-
+            {% include "admin/dashboard/_top_categories.html" %}
             {% include "admin/dashboard/_product_lists.html" %}
 
             {% component "unfold/components/separator.html" %}