diff --git a/src/covid19/blueprints/admin/templates/admin/admin_info.html b/src/covid19/blueprints/admin/templates/admin/admin_info.html
index f17cb5f8a795397b85840027a1c89b4e61bab490..4c478fcd4b78f7d0fa8afe16095329c6fa4ee804 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_info.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_info.html
@@ -1,19 +1,16 @@
 {% extends 'application/page_layout.html' %}
 
-{% block navigation_breadcrumb %}
-    <!-- TODO: implement navigation_breadcrumb in .html -->
-{% endblock %}
-
-{% block navigation_navtabs %}
-  {% include 'admin/fragments/fragment_admin_navtabs.html' %}
-{% endblock %}
-
-{% block main_container %}
-
-{% endblock %}
-
-{% block footer_container %}
-
+{% block content %}
+    {{super()}}
+    {% include 'admin/fragments/fragment_admin_navtabs.html' %}
+
+    <div class="container">
+        <div class="row">
+            <div class="col">
+                <h1>admin :: Info</h1>
+            </div>
+        </div>
+    </div>
 {% endblock %}
 
 
diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
index f2092e1f4d9d6de360566013b149638344436f93..af6258ce246551df96a69ac6948115de94afe681 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -1,32 +1,29 @@
 {% extends 'application/page_layout.html' %}
 
-{% block navigation_breadcrumb %}
-    <!-- TODO: implement navigation_breadcrumb in .html -->
-{% endblock %}
-
-{% block navigation_navtabs %}
-  {% include 'admin/fragments/fragment_admin_navtabs.html' %}
-{% endblock %}
-
-{% block main_container %}
-    <div class="row">
-       <div class="col">
-            <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_alive_message_start') }}"
-                   role="button">Admin :: alive message</a>
-                <a class="btn btn-primary btn-lg btn-block text-left"
-                   href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
-                   role="button">Admin :: database :: drop_create</a>
-                <a class="btn btn-primary btn-lg btn-block text-left"
-                   href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
-                   role="button">Admin :: database :: drop_create :: only</a>
-                <a class="btn btn-secondary btn-lg btn-block text-left"
-                   href="{{ url_for( 'app_admin.url_admin_database_import') }}"
-                   role="button">Admin :: database :: import</a>
-                <a class="btn btn-primary btn-lg btn-block text-left"
-                   href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
-                   role="button">Admin :: database :: dump</a>
+{% block content %}
+    {{super()}}
+    {% include 'admin/fragments/fragment_admin_navtabs.html' %}
+
+    <div class="container">
+        <div class="row">
+            <div class="col">
+                <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_alive_message_start') }}"
+                       role="button">Admin :: alive message</a>
+                    <a class="btn btn-primary btn-lg btn-block text-left"
+                       href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
+                       role="button">Admin :: database :: drop_create</a>
+                    <a class="btn btn-primary btn-lg btn-block text-left"
+                       href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
+                       role="button">Admin :: database :: drop_create :: only</a>
+                    <a class="btn btn-secondary btn-lg btn-block text-left"
+                       href="{{ url_for( 'app_admin.url_admin_database_import') }}"
+                       role="button">Admin :: database :: import</a>
+                    <a class="btn btn-primary btn-lg btn-block text-left"
+                       href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
+                       role="button">Admin :: database :: dump</a>
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/covid19/blueprints/admin/templates/admin/index.html b/src/covid19/blueprints/admin/templates/admin/index.html
index 3ed5c8bc06cea4f5b2f7b96e4551d352d574b06e..6aa2a299b04fab6594ac17af6fda5a8391652ac6 100644
--- a/src/covid19/blueprints/admin/templates/admin/index.html
+++ b/src/covid19/blueprints/admin/templates/admin/index.html
@@ -1,31 +1,31 @@
 {% extends 'admin/master.html' %}
 
-{% block body %}
-  <p>Hello world</p>
     {% include 'admin/fragments/fragment_admin_navtabs.html' %}
-    <div class="row">
-       <div class="col">
-           <h3>Admin :: Tasks</h3>
-            <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_alive_message_start') }}"
-                   role="button">Admin :: alive message</a>
-                <a class="btn btn-primary btn-lg btn-block text-left"
-                   href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
-                   role="button">Admin :: database :: drop_create</a>
-                <a class="btn btn-primary btn-lg btn-block text-left"
-                   href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
-                   role="button">Admin :: database :: drop_create :: only</a>
-                <a class="btn btn-secondary btn-lg btn-block text-left"
-                   href="{{ url_for( 'app_admin.url_admin_database_import') }}"
-                   role="button">Admin :: database :: import</a>
-                <a class="btn btn-primary btn-lg btn-block text-left"
-                   href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
-                   role="button">Admin :: database :: dump</a>
+    <div class="container">
+        <div class="row">
+            <div class="col">
+                <h3>Admin :: Tasks</h3>
+                <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_alive_message_start') }}"
+                       role="button">Admin :: alive message</a>
+                    <a class="btn btn-primary btn-lg btn-block text-left"
+                       href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
+                       role="button">Admin :: database :: drop_create</a>
+                    <a class="btn btn-primary btn-lg btn-block text-left"
+                       href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
+                       role="button">Admin :: database :: drop_create :: only</a>
+                    <a class="btn btn-secondary btn-lg btn-block text-left"
+                       href="{{ url_for( 'app_admin.url_admin_database_import') }}"
+                       role="button">Admin :: database :: import</a>
+                    <a class="btn btn-primary btn-lg btn-block text-left"
+                       href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
+                       role="button">Admin :: database :: dump</a>
+                </div>
             </div>
         </div>
     </div>
-{% endblock %}
+