diff --git a/templates/AdminPages/EntityAdminBase.html.twig b/templates/AdminPages/EntityAdminBase.html.twig
index 4ea82a06..bb5f52ac 100644
--- a/templates/AdminPages/EntityAdminBase.html.twig
+++ b/templates/AdminPages/EntityAdminBase.html.twig
@@ -1,3 +1,5 @@
+{% import "components/tree_macros.html.twig" as tree %}
+
 {% extends "main_card.html.twig" %}
 
     {% block title %}
@@ -23,7 +25,7 @@
 
             <div class="col-sm-4">
                 <turbo-frame id="admin-tree-frame" target="admin-content-frame" data-turbo-action="advance">
-                    {% include "elements/_tree_view.html.twig" %}
+                   {{ tree.treeview(entity) }}
                 </turbo-frame>
             </div>
 
diff --git a/templates/_sidebar.html.twig b/templates/_sidebar.html.twig
index 86a9cb00..5aeb1a3c 100644
--- a/templates/_sidebar.html.twig
+++ b/templates/_sidebar.html.twig
@@ -1,4 +1,4 @@
-{% import "elements/tree_macros.html.twig" as tree %}
+{% import "components/tree_macros.html.twig" as tree %}
 
 
 <div class="nav flex-column">
diff --git a/templates/elements/tree_macros.html.twig b/templates/components/tree_macros.html.twig
similarity index 68%
rename from templates/elements/tree_macros.html.twig
rename to templates/components/tree_macros.html.twig
index ddba88de..07c93ef9 100644
--- a/templates/elements/tree_macros.html.twig
+++ b/templates/components/tree_macros.html.twig
@@ -37,4 +37,26 @@
 
         <div id="tree-categories" {{ stimulus_target('elements/sidebar_tree', 'tree') }}></div>
     </div>
+{% endmacro %}
+
+{% macro treeview(entity) %}
+    <div {{ stimulus_controller('elements/tree') }} data-tree-data="{{ generateTreeData(entity) }}">
+        <div class="row" >
+            <div class="col-8">
+                <input type="search" class="form-control" placeholder="{% trans %}search.placeholder{% endtrans %}" {{ stimulus_action('elements/tree', 'searchInput') }}>
+            </div>
+            <div class="btn-group btn-group-sm col-4" role="group">
+                <button type="button" class="btn btn-outline-secondary" {{ stimulus_action('elements/tree', 'expandAll') }}
+                        title="{% trans %}expandAll{% endtrans %}">
+                    <i class="fas fa-plus fa-fw"></i>
+                </button>
+                <button type="button" class="btn btn-outline-secondary" {{ stimulus_action('elements/tree', 'collapseAll') }}
+                        title="{% trans %}reduceAll{% endtrans %}">
+                    <i class="fas fa-minus fa-fw"></i>
+                </button>
+            </div>
+        </div>
+
+        <div class="treeview-sm mt-2" {{ stimulus_target('elements/tree', 'tree') }}></div>
+    </div>
 {% endmacro %}
\ No newline at end of file
diff --git a/templates/elements/_tree_view.html.twig b/templates/elements/_tree_view.html.twig
deleted file mode 100644
index b56f28db..00000000
--- a/templates/elements/_tree_view.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-<div {{ stimulus_controller('elements/tree') }} data-tree-data="{{ generateTreeData(entity) }}">
-    <div class="row" >
-        <div class="col-8">
-            <input type="search" class="form-control" placeholder="{% trans %}search.placeholder{% endtrans %}" {{ stimulus_action('elements/tree', 'searchInput') }}>
-        </div>
-        <div class="btn-group btn-group-sm col-4" role="group">
-            <button type="button" class="btn btn-outline-secondary" {{ stimulus_action('elements/tree', 'expandAll') }}
-                    title="{% trans %}expandAll{% endtrans %}">
-                <i class="fas fa-plus fa-fw"></i>
-            </button>
-            <button type="button" class="btn btn-outline-secondary" {{ stimulus_action('elements/tree', 'collapseAll') }}
-                    title="{% trans %}reduceAll{% endtrans %}">
-                <i class="fas fa-minus fa-fw"></i>
-            </button>
-        </div>
-    </div>
-
-    <div class="treeview-sm mt-2" {{ stimulus_target('elements/tree', 'tree') }}></div>
-</div>
\ No newline at end of file