diff --git a/src/covid19/blueprints/application/templates/application/page_layout.html b/src/covid19/blueprints/application/templates/application/page_layout.html
index 007d0e59929f7f58409137f0f39b58fb39f46596..1be8e3ab648ce0b72439da4bd05d28843ae4c9ec 100644
--- a/src/covid19/blueprints/application/templates/application/page_layout.html
+++ b/src/covid19/blueprints/application/templates/application/page_layout.html
@@ -8,16 +8,17 @@
 {% block content %}
     {{super()}}
     {% include 'application/fragments/fragment_flashed_messages.html' %}
+    {% include 'application/fragments/fragment_navtabs.html' %}
 {% endblock %}
 
 {% block styles %}
 {{super()}}
 <link rel="stylesheet"
-      href="{{url_for('.static', filename='styles.css')}}">
+      href="{{url_for('.static', filename='/styles.css')}}">
 {% endblock %}
 
 {% block scripts %}
-<script src="{{url_for('.static', filename='index.js')}}"></script>
+<script src="{{url_for('.static', filename='/index.js')}}"></script>
 {{super()}}
 {% endblock %}
 
diff --git a/src/covid19/blueprints/who/templates/who/who_info.html b/src/covid19/blueprints/who/templates/who/who_info.html
index babbccdbac935be66a3c7ebcb753dbd87b153cec..40e04a6268c01f4c93997bab6a47c6d9a910c0ca 100644
--- a/src/covid19/blueprints/who/templates/who/who_info.html
+++ b/src/covid19/blueprints/who/templates/who/who_info.html
@@ -1,17 +1,8 @@
 {% extends 'application/page_layout.html' %}
 
-{% block navigation_breadcrumb %}
-    <!-- TODO: implement navigation_breadcrumb in .html -->
-
-{% endblock %}
-
-
-{% block navigation_navtabs %}
+{% block content %}
+    {{super()}}
   {% include 'who/fragments/fragment_who_navtabs.html' %}
-{% endblock %}
-
-
-{% block main_container %}
     <div>
         <h3>WHO Coronavirus Disease (COVID-19) Dashboard</h3>
         <p>
@@ -29,9 +20,5 @@
 {% endblock %}
 
 
-{% block footer_container %}
-
-{% endblock %}
-
 
 
diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/covid19/blueprints/who/templates/who/who_tasks.html
index 073506a01290e49f836a8c0b9c1f906da2b809b5..b81c5e7ff485a01b2cbea3a1c2d7aefb0a620b96 100644
--- a/src/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/src/covid19/blueprints/who/templates/who/who_tasks.html
@@ -1,14 +1,8 @@
 {% extends 'application/page_layout.html' %}
 
-{% block navigation_breadcrumb %}
-    <!-- TODO: implement navigation_breadcrumb in .html -->
-{% endblock %}
-
-{% block navigation_navtabs %}
-  {% include 'who/fragments/fragment_who_navtabs.html' %}
-{% endblock %}
-
-{% block main_container %}
+{% block content %}
+    {{super()}}
+    {% include 'who/fragments/fragment_who_navtabs.html' %}
     <div class="row">
         <div class="col">
             <div class="btn-group-vertical" role="group" aria-label="Views">