diff --git a/src/covid19/blueprints/app_all/all_views.py b/src/covid19/blueprints/app_all/all_views.py
index 7e33e052620602f0dbbedabf60f3e0ba3e2880d6..a19aa5d4c9409f4b6a49b4e9d055e4a0455578f0 100644
--- a/src/covid19/blueprints/app_all/all_views.py
+++ b/src/covid19/blueprints/app_all/all_views.py
@@ -35,14 +35,6 @@ def url_admin_tasks():
         page_info=page_info)
 
 
-@blueprint_app_all.route('/system/tasks')
-def url_system_tasks():
-    page_info = ApplicationPage('Admin', "System Tasks")
-    return render_template(
-        'app_admin/system_tasks.html',
-        page_info=page_info)
-
-
 @blueprint_app_all.route('/info')
 def url_admin_info():
     page_info = ApplicationPage('Admin', "Info")
diff --git a/src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html b/src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html
index 6af792e782828ba247cd767f730d95b0e05e9bc1..c65e0647e5b78f984ca7aaebf7ead30d604bd428 100644
--- a/src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html
+++ b/src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     {{super()}}
-    {% include 'app_admin/navigation/admin_navtabs.html' %}
+    {% include 'app_all/navigation/app_all_navtabs.html' %}
 
     <div class="container">
         <div class="row">
diff --git a/src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html b/src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html
new file mode 100644
index 0000000000000000000000000000000000000000..4155fc29baf59332b5e8e358b456b0ac5198d160
--- /dev/null
+++ b/src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html
@@ -0,0 +1,32 @@
+                <li class="dropdown">
+                    <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+                        Admin<i class="glyphicon glyphicon-chevron-down small"></i>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for( 'app_all.url_admin_index') }}">
+                                Admin
+                            </a>
+                        </li>
+                        <li>
+                            <div class="dropdown-divider"></div>
+                        </li>
+                        {% if current_user.is_authenticated %}
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for( 'app_all.url_admin_tasks') }}">
+                                Admin Tasks
+                            </a>
+                        </li>
+                        {% endif %}
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for( 'app_all.url_admin_info') }}">
+                                Admin info
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for( 'app_all.url_admin_index') }}">
+                                Flask Admin (CRUD)
+                            </a>
+                        </li>
+                    </ul>
+                </li>
\ No newline at end of file
diff --git a/src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navtabs.html b/src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navtabs.html
new file mode 100644
index 0000000000000000000000000000000000000000..9b8a454a099ed798e8c2c9bf81b784d5c3032ef8
--- /dev/null
+++ b/src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navtabs.html
@@ -0,0 +1,21 @@
+
+    <div class="container">
+        <div class="row">
+            <div class="col">
+                <nav>
+                    <ul class="nav nav-tabs">
+                        {% if current_user.is_authenticated %}
+                        <li class="nav-item">
+                            <a class="nav-link"
+                               href="{{ url_for( 'app_all.url_admin_tasks') }}">Admin Tasks</a>
+                        </li>
+                        {% endif %}
+                        <li class="nav-item">
+                            <a class="nav-link"
+                               href="{{ url_for( 'app_all.url_admin_index') }}">Database CRUD (flask admin)</a>
+                        </li>
+                    </ul>
+                </nav>
+            </div>
+        </div>
+    </div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html b/src/covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html
index 8819268a329acb060040f62913653a6d2819cb09..142582967d7a35a3e36b0da40f9c47397ceac007 100644
--- a/src/covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html
+++ b/src/covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html
@@ -42,6 +42,12 @@
                             DIVI
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link"
+                           href="{{ url_for( 'app_all.url_admin_tasks') }}">
+                            All
+                        </a>
+                    </li>
                     <li class="nav-item">
                         <a class="nav-link"
                            href="{{ url_for( 'usr.url_user_info') }}">