diff --git a/src/covid19/blueprints/app_admin/app_admin_views.py b/src/covid19/blueprints/app_admin/app_admin_views.py
index f0914a043955c7dfe538e3551570977b21e0f6ca..4dc169b53d07536842f336050e83817508ed026a 100644
--- a/src/covid19/blueprints/app_admin/app_admin_views.py
+++ b/src/covid19/blueprints/app_admin/app_admin_views.py
@@ -27,19 +27,11 @@ def url_admin_index():
         page_info=page_info)
 
 
-@app_admin.route('/tasks')
-def url_admin_tasks():
-    page_info = ApplicationPage('Admin', "Tasks")
-    return render_template(
-        'app_admin/admin_tasks.html',
-        page_info=page_info)
-
-
 @app_admin.route('/system/tasks')
 def url_system_tasks():
     page_info = ApplicationPage('Admin', "System Tasks")
     return render_template(
-        'app_admin/system_tasks.html',
+        'app_admin/admin_tasks.html',
         page_info=page_info)
 
 
diff --git a/src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_flashed_messages.html b/src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_flashed_messages.html
new file mode 100644
index 0000000000000000000000000000000000000000..b2b376229bec5e5bfa6b0a9c3e5a9beab518ec22
--- /dev/null
+++ b/src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_flashed_messages.html
@@ -0,0 +1,38 @@
+<div class="fragment-flash-messages">
+{% with errors = get_flashed_messages(category_filter=["error"]) %}
+    {% if errors %}
+        {% for message in errors %}
+            <div class="alert alert-danger" role="alert">
+                <span>{{ message }}</span>
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+        {% endfor %}
+    {% endif %}
+{% endwith %}
+{% with errors = get_flashed_messages(category_filter=["warning"]) %}
+    {% if errors %}
+        {% for message in errors %}
+            <div class="alert alert-warning" role="alert">
+                <span>{{ message }}</span>
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+        {% endfor %}
+    {% endif %}
+{% endwith %}
+{% with messages = get_flashed_messages(category_filter=["message"]) %}
+    {% if messages %}
+        {% for message in messages %}
+            <div class="alert alert-success" role="alert">
+                <span>{{ message }}</span>
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+        {% endfor %}
+    {% endif %}
+{% endwith %}
+</div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_pagination.html b/src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_pagination.html
new file mode 100644
index 0000000000000000000000000000000000000000..65df8fa2b159e956b886312cff8639a6c3c37622
--- /dev/null
+++ b/src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_pagination.html
@@ -0,0 +1,43 @@
+{% macro pagination_for_url( url_for_pagination ) -%}
+    <!-- previous page -->
+    <ul class="pagination">
+        {% if page_data.has_prev %}
+        <li class="page-item">
+            <a class="page-link"
+               href="{{ url_for( url_for_pagination, country_id=who_country.id, page=page_data.prev_num) }}">
+                Previous
+            </a>
+        </li>
+        {% endif %}
+        <!-- all page numbers -->
+        {% for page_num in page_data.iter_pages() %}
+            {% if page_num %}
+                {% if page_num != page_data.page %}
+                    <li class="page-item">
+                        <a class="page-link"
+                           href="{{ url_for( url_for_pagination, country_id=who_country.id, page=page_num) }}">
+                            {{ page_num }}
+                        </a>
+                    </li>
+                {% else %}
+                    <li class="page-item active">
+                        <a class="page-link" href="#">{{ page_num }}</a>
+                    </li>
+                {% endif %}
+           {% else %}
+               <li class="page-item">
+                   <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+               </li>
+           {% endif %}
+        {% endfor %}
+        <!-- next page -->
+        {% if page_data.has_next %}
+        <li class="page-item">
+            <a class="page-link"
+               href="{{ url_for( url_for_pagination, country_id=who_country.id, page=page_data.next_num) }}">
+                Next
+            </a>
+        </li>
+        {% endif %}
+    </ul>
+{%- endmacro %}
\ No newline at end of file
diff --git a/src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html b/src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html
index a0885f59d1afb1adb547cb1a2058c5524fb6f936..4754814e661c534f89a1e877d7dd26d90e469184 100644
--- a/src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html
+++ b/src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html
@@ -28,7 +28,7 @@
 
                     {% include 'usr/navigation/usr_navbar_dropdown.html' %}
 
-                    {% include 'app_admin/navigation/admin_navbar_dropdown.html' %}
+                    {% include 'app_admin/navigation/app_admin_navbar_dropdown.html' %}
 
                 </ul>
             </div>