diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index 9286764b91d139ed04aab78f7492aa8dd858f95f..309f4571913b2290b8c8f26fa7f3fb5559794250 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -210,7 +210,7 @@ def task_admin_update_star_schema_incremental(self):
 
 
 @app_admin.route('/task/alive_message')
-def url_task_admin_message_start():
+def url_task_admin_alive_message():
     app.logger.info("url_task_admin_message_start [start]")
     task_admin_alive_message.apply_async()
     flash("alive_message_task started")
diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
index 513b2af7170a2980ee1a6093361999262ef8e1fb..4a18f28613b7d52fc41c08d1ad20b86ffed699e0 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -26,14 +26,14 @@
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-secondary btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_full_update_star_schema') }}"
-                       role="button">Admin :: all_files :: update star_schema :: initial</a>
+                       role="button">Admin :: update :: star_schema :: full</a>
                 </div>
             </div>
             <div class="col">
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-danger btn-lg btn-block text-left"
                            href="{{ url_for( 'app_admin.url_task_admin_update_star_schema') }}"
-                           role="button">Admin :: all_files :: update star_schema :: incremental</a>
+                           role="button">Admin :: update :: star_schema</a>
                 </div>
             </div>
         </div>
@@ -42,26 +42,26 @@
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-success btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_download_all_files') }}"
-                       role="button">Admin :: all files :: download</a>
+                       role="button">Admin :: files :: download</a>
                     <a class="btn btn-info btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_import_all_files') }}"
-                       role="button">Admin :: all files :: import</a>
+                       role="button">Admin :: files :: import</a>
                     <a class="btn btn-warning btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_update_full_dimension_tables') }}"
-                       role="button">Admin :: full update :: dimension_tables</a>
+                       role="button">Admin :: update :: dimension_tables :: full</a>
                     <a class="btn btn-danger btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_update_full_fact_tables') }}"
-                       role="button">Admin :: full update :: fact_table</a>
+                       role="button">Admin :: update :: fact_tables :: full</a>
                 </div>
             </div>
             <div class="col">
                 <div class="btn-group-vertical" role="group" aria-label="Views">
-                     <a class="btn btn-success btn-lg btn-block text-left"
+                    <a class="btn btn-success btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_download_all_files') }}"
-                       role="button">Admin :: all files :: download</a>
+                       role="button">Admin :: files :: download</a>
                     <a class="btn btn-info btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_import_all_files') }}"
-                       role="button">Admin :: all files :: import</a>
+                       role="button">Admin :: files :: import</a>
                     <a class="btn btn-warning btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_update_dimension_tables') }}"
                        role="button">Admin :: update :: dimension_tables</a>
@@ -75,22 +75,22 @@
             <div class="col">
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-warning btn-lg btn-block text-left"
-                       href="{{ url_for( 'app_admin.url_alive_message_start') }}"
+                       href="{{ url_for( 'app_admin.url_task_admin_alive_message') }}"
                        role="button">Admin :: alive message</a>
                 </div>
                 <p></p>
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-secondary btn-lg btn-block text-left"
-                       href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
+                       href="{{ url_for( 'app_admin.url_task_admin_database_dropcreate') }}"
                        role="button">Admin :: database :: drop_create :: only</a>
                 </div>
                 <p></p>
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-primary btn-lg btn-block text-left"
-                       href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
+                       href="{{ url_for( 'app_admin.url_task_admin_database_dump') }}"
                        role="button">Admin :: database :: dump</a>
                     <a class="btn btn-primary btn-lg btn-block text-left"
-                       href="{{ url_for( 'app_admin.url_admin_database_dump_reimport') }}"
+                       href="{{ url_for( 'app_admin.url_task_admin_database_dump_reimport') }}"
                        role="button">Admin :: database :: dump :: reimport</a>
                 </div>
                 <p></p>
@@ -110,7 +110,7 @@
                 <p></p>
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                      <a class="btn btn-primary btn-lg btn-block text-left"
-                       href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
+                       href="{{ url_for( 'app_admin.url_task_admin_database_dump') }}"
                        role="button">Admin :: database :: dump</a>
                     <a class="btn btn-success btn-lg btn-block text-left"
                        href="{{ url_for( 'app_admin.url_task_admin_download_all_files') }}"
diff --git a/src/covid19/blueprints/admin/templates/admin/navigation/admin_navbar_dropdown.html b/src/covid19/blueprints/admin/templates/admin/navigation/admin_navbar_dropdown.html
index 462c14df3842d420ab99ad75b5fee0ae2300524d..0dbb46d2f3c74ca49d89b733451870d8e6e5b48c 100644
--- a/src/covid19/blueprints/admin/templates/admin/navigation/admin_navbar_dropdown.html
+++ b/src/covid19/blueprints/admin/templates/admin/navigation/admin_navbar_dropdown.html
@@ -33,30 +33,33 @@
                             <div class="dropdown-divider"></div>
                         </li>
                         <li>
-                            <a class="dropdown-item" href="{{ url_for( 'app_admin.url_alive_message_start') }}">
+                            <a class="dropdown-item" href="{{ url_for( 'app_admin.url_task_admin_alive_message') }}">
                                 Task: Admin :: alive message
                             </a>
                         </li>
                         <li>
-                            <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_drop') }}">
-                                Task: Admin :: database :: drop_create and import
-                            </a>
+                            <div class="dropdown-divider"></div>
                         </li>
                         <li>
-                            <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}">
-                                Task: Admin :: database :: drop_create only
+                            <a class="dropdown-item" href="{{ url_for( 'app_admin.url_task_admin_database_dropcreate') }}">
+                                Task: Admin :: database :: drop and create
                             </a>
                         </li>
                         <li>
-                            <a class="dropdown-item"  href="{{ url_for( 'app_admin.url_admin_database_dump') }}">
-                                Task: Admin :: database :: dump
+                            <a class="dropdown-item"  href="{{ url_for( 'app_admin.url_task_admin_database_drop') }}">
+                                Task: Admin :: database :: drop
                             </a>
                         </li>
                         <li>
                             <div class="dropdown-divider"></div>
                         </li>
                         <li>
-                            <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dump_reimport') }}">
+                            <a class="dropdown-item" href="{{ url_for( 'app_admin.url_task_admin_database_dump') }}">
+                                Task: Admin :: database :: dump
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for( 'app_admin.url_task_admin_database_dump_reimport') }}">
                                 Task: Admin :: database :: dump :: reimport
                             </a>
                         </li>