From 30fa5676155041865592423588837f4f3d1db180 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 25 Jan 2021 17:03:48 +0100
Subject: [PATCH] work

---
 templates/admin/admin_info.html               |  2 +-
 templates/admin/admin_tasks.html              |  2 +-
 .../admin/fragment_admin_navbar_dropdown.html | 68 +++++++++++++++++++
 ...admin.html => fragment_admin_navtabs.html} |  0
 templates/europe/europe_continent_all.html    |  2 +-
 .../europe/europe_continent_germany.html      |  2 +-
 templates/europe/europe_continent_one.html    |  2 +-
 templates/europe/europe_country_all.html      |  2 +-
 templates/europe/europe_country_germany.html  |  2 +-
 templates/europe/europe_country_one.html      |  2 +-
 templates/europe/europe_data.html             |  2 +-
 .../europe/europe_date_reported_all.html      |  2 +-
 .../europe/europe_date_reported_one.html      |  2 +-
 ...europe_date_reported_one_cases_weekly.html |  2 +-
 ...urope_date_reported_one_deaths_weekly.html |  2 +-
 ...e_date_reported_one_notification_rate.html |  2 +-
 templates/europe/europe_imported.html         |  2 +-
 templates/europe/europe_info.html             |  2 +-
 templates/europe/europe_tasks.html            |  2 +-
 .../fragment_europe_navbar_dropdown.html      | 68 +++++++++++++++++++
 ...rope.html => fragment_europe_navtabs.html} |  0
 templates/fragment_navbar.html                |  4 +-
 .../nrw/fragment_nrw_navbar_dropdown.html     | 68 +++++++++++++++++++
 ...abs_nrw.html => fragment_nrw_navtabs.html} |  0
 templates/nrw/nrw_imported.html               |  2 +-
 templates/nrw/nrw_info.html                   |  2 +-
 templates/nrw/nrw_stadt.html                  |  2 +-
 templates/nrw/nrw_tasks.html                  |  2 +-
 templates/page_layout.html                    | 21 +++---
 .../rki/fragment_rki_navbar_dropdown.html     | 68 +++++++++++++++++++
 ...abs_rki.html => fragment_rki_navtabs.html} |  0
 templates/rki/rki_imported.html               |  2 +-
 templates/rki/rki_info.html                   |  2 +-
 templates/rki/rki_tasks.html                  |  2 +-
 .../fragment_vaccination_navbar_dropdown.html | 68 +++++++++++++++++++
 ...html => fragment_vaccination_navtabs.html} |  0
 templates/vaccination/vaccination_info.html   |  2 +-
 templates/vaccination/vaccination_tasks.html  |  2 +-
 .../vaccination_timeline_germany.html         |  2 +-
 .../who/fragment_who_navbar_dropdown.html     | 68 +++++++++++++++++++
 ...abs_who.html => fragment_who_navtabs.html} |  0
 templates/who/who_country_all.html            |  2 +-
 templates/who/who_country_germany.html        |  2 +-
 templates/who/who_country_one.html            |  2 +-
 .../who/who_country_one_cases_cumulative.html |  2 +-
 templates/who/who_country_one_cases_new.html  |  2 +-
 .../who_country_one_deaths_cumulative.html    |  2 +-
 templates/who/who_country_one_deaths_new.html |  2 +-
 templates/who/who_date_reported_all.html      |  2 +-
 templates/who/who_date_reported_one.html      |  2 +-
 ...ho_date_reported_one_cases_cumulative.html |  2 +-
 .../who/who_date_reported_one_cases_new.html  |  2 +-
 ...o_date_reported_one_deaths_cumulative.html |  2 +-
 .../who/who_date_reported_one_deaths_new.html |  2 +-
 templates/who/who_imported.html               |  2 +-
 templates/who/who_info.html                   |  2 +-
 templates/who/who_region_all.html             |  2 +-
 templates/who/who_region_one.html             |  2 +-
 templates/who/who_tasks.html                  |  2 +-
 59 files changed, 468 insertions(+), 55 deletions(-)
 create mode 100644 templates/admin/fragment_admin_navbar_dropdown.html
 rename templates/admin/{fragment_navtabs_admin.html => fragment_admin_navtabs.html} (100%)
 create mode 100644 templates/europe/fragment_europe_navbar_dropdown.html
 rename templates/europe/{fragment_navtabs_europe.html => fragment_europe_navtabs.html} (100%)
 create mode 100644 templates/nrw/fragment_nrw_navbar_dropdown.html
 rename templates/nrw/{fragment_navtabs_nrw.html => fragment_nrw_navtabs.html} (100%)
 create mode 100644 templates/rki/fragment_rki_navbar_dropdown.html
 rename templates/rki/{fragment_navtabs_rki.html => fragment_rki_navtabs.html} (100%)
 create mode 100644 templates/vaccination/fragment_vaccination_navbar_dropdown.html
 rename templates/vaccination/{fragment_navtabs_vaccination.html => fragment_vaccination_navtabs.html} (100%)
 create mode 100644 templates/who/fragment_who_navbar_dropdown.html
 rename templates/who/{fragment_navtabs_who.html => fragment_who_navtabs.html} (100%)

diff --git a/templates/admin/admin_info.html b/templates/admin/admin_info.html
index f21a260d..761fce48 100644
--- a/templates/admin/admin_info.html
+++ b/templates/admin/admin_info.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'admin/fragment_navtabs_admin.html' %}
+  {% include 'admin/fragment_admin_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/admin/admin_tasks.html b/templates/admin/admin_tasks.html
index 6d79ed8c..fa796898 100644
--- a/templates/admin/admin_tasks.html
+++ b/templates/admin/admin_tasks.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'admin/fragment_navtabs_admin.html' %}
+  {% include 'admin/fragment_admin_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/admin/fragment_admin_navbar_dropdown.html b/templates/admin/fragment_admin_navbar_dropdown.html
new file mode 100644
index 00000000..b01042b2
--- /dev/null
+++ b/templates/admin/fragment_admin_navbar_dropdown.html
@@ -0,0 +1,68 @@
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        WHO
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/who/info">WHO</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/region/all">WHO Regions</a>
+                        <a class="dropdown-item" href="/who/date_reported/all">WHO Date Reported</a>
+                        <a class="dropdown-item" href="/who/country/all">WHO Countries</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/germany">WHO Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/update">WHO Task: Update Data</a>
+                        <a class="dropdown-item" href="/who/update/short">WHO Task: Update Data Short</a>
+                        <a class="dropdown-item" href="/who/imported">WHO imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/tasks">WHO Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        Europe
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/europe/info">Europe</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/country/all">Europe Countries</a>
+                        <a class="dropdown-item" href="/europe/germany">Europe Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">Europe Task: Update Data</a>
+                        <a class="dropdown-item" href="/europe/imported">Europe imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/tasks">Europe Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        RKI
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/rki/info">RKI</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/imported">RKI imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/tasks">RKI Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        NRW
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/nrw/info">NRW</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/region/all">NRW Staedte</a>
+                        <a class="dropdown-item" href="/nrw/bochum">NRW Bochum</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">NRW Task: Update Data</a>
+                        <a class="dropdown-item" href="/nrw/imported">NRW imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/tasks">NRW Tasks</a>
+                    </div>
+                </li>
\ No newline at end of file
diff --git a/templates/admin/fragment_navtabs_admin.html b/templates/admin/fragment_admin_navtabs.html
similarity index 100%
rename from templates/admin/fragment_navtabs_admin.html
rename to templates/admin/fragment_admin_navtabs.html
diff --git a/templates/europe/europe_continent_all.html b/templates/europe/europe_continent_all.html
index 975b2df8..57fe3af1 100644
--- a/templates/europe/europe_continent_all.html
+++ b/templates/europe/europe_continent_all.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_continent_germany.html b/templates/europe/europe_continent_germany.html
index 1818204c..422fe556 100644
--- a/templates/europe/europe_continent_germany.html
+++ b/templates/europe/europe_continent_germany.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_continent_one.html b/templates/europe/europe_continent_one.html
index a2529688..ad0a1f08 100644
--- a/templates/europe/europe_continent_one.html
+++ b/templates/europe/europe_continent_one.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_country_all.html b/templates/europe/europe_country_all.html
index 4171827b..add15475 100644
--- a/templates/europe/europe_country_all.html
+++ b/templates/europe/europe_country_all.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_country_germany.html b/templates/europe/europe_country_germany.html
index 0718aade..c3b6d746 100644
--- a/templates/europe/europe_country_germany.html
+++ b/templates/europe/europe_country_germany.html
@@ -1,7 +1,7 @@
 {% extends 'page_layout.html' %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_country_one.html b/templates/europe/europe_country_one.html
index 5db9dee8..aaa339d8 100644
--- a/templates/europe/europe_country_one.html
+++ b/templates/europe/europe_country_one.html
@@ -1,7 +1,7 @@
 {% extends 'page_layout.html' %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_data.html b/templates/europe/europe_data.html
index 50e8fb93..42c51425 100644
--- a/templates/europe/europe_data.html
+++ b/templates/europe/europe_data.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_date_reported_all.html b/templates/europe/europe_date_reported_all.html
index 0026b951..19b9c681 100644
--- a/templates/europe/europe_date_reported_all.html
+++ b/templates/europe/europe_date_reported_all.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_date_reported_one.html b/templates/europe/europe_date_reported_one.html
index 8b3fd988..9d399f32 100644
--- a/templates/europe/europe_date_reported_one.html
+++ b/templates/europe/europe_date_reported_one.html
@@ -4,7 +4,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_date_reported_one_cases_weekly.html b/templates/europe/europe_date_reported_one_cases_weekly.html
index 60fc28b7..c2823db9 100644
--- a/templates/europe/europe_date_reported_one_cases_weekly.html
+++ b/templates/europe/europe_date_reported_one_cases_weekly.html
@@ -4,7 +4,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_date_reported_one_deaths_weekly.html b/templates/europe/europe_date_reported_one_deaths_weekly.html
index 3c076058..e54ab62f 100644
--- a/templates/europe/europe_date_reported_one_deaths_weekly.html
+++ b/templates/europe/europe_date_reported_one_deaths_weekly.html
@@ -4,7 +4,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_date_reported_one_notification_rate.html b/templates/europe/europe_date_reported_one_notification_rate.html
index 9d22a07e..6c782c01 100644
--- a/templates/europe/europe_date_reported_one_notification_rate.html
+++ b/templates/europe/europe_date_reported_one_notification_rate.html
@@ -4,7 +4,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/europe/europe_imported.html b/templates/europe/europe_imported.html
index 17cb45e6..b8332a04 100644
--- a/templates/europe/europe_imported.html
+++ b/templates/europe/europe_imported.html
@@ -12,7 +12,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/europe/europe_info.html b/templates/europe/europe_info.html
index ce16b3bc..d3294102 100644
--- a/templates/europe/europe_info.html
+++ b/templates/europe/europe_info.html
@@ -12,7 +12,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/europe/europe_tasks.html b/templates/europe/europe_tasks.html
index cb422b99..af7d50a1 100644
--- a/templates/europe/europe_tasks.html
+++ b/templates/europe/europe_tasks.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragment_navtabs_europe.html' %}
+  {% include 'europe/fragment_europe_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/europe/fragment_europe_navbar_dropdown.html b/templates/europe/fragment_europe_navbar_dropdown.html
new file mode 100644
index 00000000..b01042b2
--- /dev/null
+++ b/templates/europe/fragment_europe_navbar_dropdown.html
@@ -0,0 +1,68 @@
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        WHO
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/who/info">WHO</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/region/all">WHO Regions</a>
+                        <a class="dropdown-item" href="/who/date_reported/all">WHO Date Reported</a>
+                        <a class="dropdown-item" href="/who/country/all">WHO Countries</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/germany">WHO Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/update">WHO Task: Update Data</a>
+                        <a class="dropdown-item" href="/who/update/short">WHO Task: Update Data Short</a>
+                        <a class="dropdown-item" href="/who/imported">WHO imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/tasks">WHO Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        Europe
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/europe/info">Europe</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/country/all">Europe Countries</a>
+                        <a class="dropdown-item" href="/europe/germany">Europe Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">Europe Task: Update Data</a>
+                        <a class="dropdown-item" href="/europe/imported">Europe imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/tasks">Europe Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        RKI
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/rki/info">RKI</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/imported">RKI imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/tasks">RKI Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        NRW
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/nrw/info">NRW</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/region/all">NRW Staedte</a>
+                        <a class="dropdown-item" href="/nrw/bochum">NRW Bochum</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">NRW Task: Update Data</a>
+                        <a class="dropdown-item" href="/nrw/imported">NRW imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/tasks">NRW Tasks</a>
+                    </div>
+                </li>
\ No newline at end of file
diff --git a/templates/europe/fragment_navtabs_europe.html b/templates/europe/fragment_europe_navtabs.html
similarity index 100%
rename from templates/europe/fragment_navtabs_europe.html
rename to templates/europe/fragment_europe_navtabs.html
diff --git a/templates/fragment_navbar.html b/templates/fragment_navbar.html
index 4eca36d4..01bcd5e7 100644
--- a/templates/fragment_navbar.html
+++ b/templates/fragment_navbar.html
@@ -1,6 +1,6 @@
 
-    <nav class="navbar navbar-expand-lg navbar-light bg-light">
-        <a class="navbar-brand" href="#">Navbar</a>
+    <nav class="navbar navbar navbar-dark bg-dark navbar-expand-lg">
+        <a class="navbar-brand" href="#">Covid19 Data</a>
         <button class="navbar-toggler" type="button"
                 data-toggle="collapse" data-target="#navbarSupportedContent"
                 aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
diff --git a/templates/nrw/fragment_nrw_navbar_dropdown.html b/templates/nrw/fragment_nrw_navbar_dropdown.html
new file mode 100644
index 00000000..b01042b2
--- /dev/null
+++ b/templates/nrw/fragment_nrw_navbar_dropdown.html
@@ -0,0 +1,68 @@
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        WHO
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/who/info">WHO</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/region/all">WHO Regions</a>
+                        <a class="dropdown-item" href="/who/date_reported/all">WHO Date Reported</a>
+                        <a class="dropdown-item" href="/who/country/all">WHO Countries</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/germany">WHO Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/update">WHO Task: Update Data</a>
+                        <a class="dropdown-item" href="/who/update/short">WHO Task: Update Data Short</a>
+                        <a class="dropdown-item" href="/who/imported">WHO imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/tasks">WHO Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        Europe
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/europe/info">Europe</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/country/all">Europe Countries</a>
+                        <a class="dropdown-item" href="/europe/germany">Europe Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">Europe Task: Update Data</a>
+                        <a class="dropdown-item" href="/europe/imported">Europe imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/tasks">Europe Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        RKI
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/rki/info">RKI</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/imported">RKI imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/tasks">RKI Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        NRW
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/nrw/info">NRW</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/region/all">NRW Staedte</a>
+                        <a class="dropdown-item" href="/nrw/bochum">NRW Bochum</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">NRW Task: Update Data</a>
+                        <a class="dropdown-item" href="/nrw/imported">NRW imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/tasks">NRW Tasks</a>
+                    </div>
+                </li>
\ No newline at end of file
diff --git a/templates/nrw/fragment_navtabs_nrw.html b/templates/nrw/fragment_nrw_navtabs.html
similarity index 100%
rename from templates/nrw/fragment_navtabs_nrw.html
rename to templates/nrw/fragment_nrw_navtabs.html
diff --git a/templates/nrw/nrw_imported.html b/templates/nrw/nrw_imported.html
index ae1e2695..4271c073 100644
--- a/templates/nrw/nrw_imported.html
+++ b/templates/nrw/nrw_imported.html
@@ -8,7 +8,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'nrw/fragment_navtabs_nrw.html' %}
+  {% include 'nrw/fragment_nrw_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/nrw/nrw_info.html b/templates/nrw/nrw_info.html
index 2c63e205..fa78b741 100644
--- a/templates/nrw/nrw_info.html
+++ b/templates/nrw/nrw_info.html
@@ -12,7 +12,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'nrw/fragment_navtabs_nrw.html' %}
+  {% include 'nrw/fragment_nrw_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/nrw/nrw_stadt.html b/templates/nrw/nrw_stadt.html
index 11385a5a..189b0066 100644
--- a/templates/nrw/nrw_stadt.html
+++ b/templates/nrw/nrw_stadt.html
@@ -12,7 +12,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'nrw/fragment_navtabs_nrw.html' %}
+  {% include 'nrw/fragment_nrw_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/nrw/nrw_tasks.html b/templates/nrw/nrw_tasks.html
index 7565da21..e235fdf2 100644
--- a/templates/nrw/nrw_tasks.html
+++ b/templates/nrw/nrw_tasks.html
@@ -12,7 +12,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'nrw/fragment_navtabs_nrw.html' %}
+  {% include 'nrw/fragment_nrw_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/page_layout.html b/templates/page_layout.html
index 078d0a36..3f4c4c67 100644
--- a/templates/page_layout.html
+++ b/templates/page_layout.html
@@ -48,10 +48,10 @@
 <body>
 
     <header>
-        <div class="container tw_padding">
+        <div class="container-fluid tw_padding">
             {% include 'fragment_navbar.html' %}
         </div>
-        <div class="container tw_padding">
+        <div class="container-fluid tw_padding">
             {% block navigation_jumbotron %}
                 <div class="jumbotron">
                     <h1 class="display-4">{{ page_info.title }}</h1>
@@ -61,19 +61,22 @@
                 </div>
             {% endblock %}
         </div>
-        <div class="container tw_padding">
+    </header>
+
+    <section>
+        <div class="container-fluid tw_padding">
             {% include 'fragment_navtabs.html' %}
         </div>
-        <div class="container">
+        <div class="container-fluid">
             {% block navigation_navtabs %}{% endblock %}
         </div>
-        <div class="container">
+        <div class="container-fluid">
             {% block navigation_breadcrumb %}{% endblock %}
         </div>
-    </header>
+    </section>
 
     <main>
-        <div class="container tw_padding">
+        <div class="container-fluid tw_padding">
             {% include 'fragment_flashed_messages.html' %}
             <p></p>
             {% block main_container %}{% endblock %}
@@ -81,7 +84,7 @@
     </main>
 
     <section>
-        <div class="container">
+        <div class="container-fluid">
             {% for error in errors %}
                 <h4>{{ error }}</h4>
             {% endfor %}
@@ -89,7 +92,9 @@
     </section>
 
     <footer>
+        <div class="container-fluid">
         {% block footer_container %}{% endblock %}
+        </div>
     </footer>
 
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
diff --git a/templates/rki/fragment_rki_navbar_dropdown.html b/templates/rki/fragment_rki_navbar_dropdown.html
new file mode 100644
index 00000000..b01042b2
--- /dev/null
+++ b/templates/rki/fragment_rki_navbar_dropdown.html
@@ -0,0 +1,68 @@
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        WHO
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/who/info">WHO</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/region/all">WHO Regions</a>
+                        <a class="dropdown-item" href="/who/date_reported/all">WHO Date Reported</a>
+                        <a class="dropdown-item" href="/who/country/all">WHO Countries</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/germany">WHO Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/update">WHO Task: Update Data</a>
+                        <a class="dropdown-item" href="/who/update/short">WHO Task: Update Data Short</a>
+                        <a class="dropdown-item" href="/who/imported">WHO imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/tasks">WHO Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        Europe
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/europe/info">Europe</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/country/all">Europe Countries</a>
+                        <a class="dropdown-item" href="/europe/germany">Europe Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">Europe Task: Update Data</a>
+                        <a class="dropdown-item" href="/europe/imported">Europe imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/tasks">Europe Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        RKI
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/rki/info">RKI</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/imported">RKI imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/tasks">RKI Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        NRW
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/nrw/info">NRW</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/region/all">NRW Staedte</a>
+                        <a class="dropdown-item" href="/nrw/bochum">NRW Bochum</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">NRW Task: Update Data</a>
+                        <a class="dropdown-item" href="/nrw/imported">NRW imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/tasks">NRW Tasks</a>
+                    </div>
+                </li>
\ No newline at end of file
diff --git a/templates/rki/fragment_navtabs_rki.html b/templates/rki/fragment_rki_navtabs.html
similarity index 100%
rename from templates/rki/fragment_navtabs_rki.html
rename to templates/rki/fragment_rki_navtabs.html
diff --git a/templates/rki/rki_imported.html b/templates/rki/rki_imported.html
index 05a6836e..b4624895 100644
--- a/templates/rki/rki_imported.html
+++ b/templates/rki/rki_imported.html
@@ -8,7 +8,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'rki/fragment_navtabs_rki.html' %}
+  {% include 'rki/fragment_rki_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/rki/rki_info.html b/templates/rki/rki_info.html
index 0500b3f5..6eea293c 100644
--- a/templates/rki/rki_info.html
+++ b/templates/rki/rki_info.html
@@ -6,7 +6,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'rki/fragment_navtabs_rki.html' %}
+  {% include 'rki/fragment_rki_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/rki/rki_tasks.html b/templates/rki/rki_tasks.html
index 77733fc0..b2eacb7c 100644
--- a/templates/rki/rki_tasks.html
+++ b/templates/rki/rki_tasks.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'rki/fragment_navtabs_rki.html' %}
+  {% include 'rki/fragment_rki_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/vaccination/fragment_vaccination_navbar_dropdown.html b/templates/vaccination/fragment_vaccination_navbar_dropdown.html
new file mode 100644
index 00000000..b01042b2
--- /dev/null
+++ b/templates/vaccination/fragment_vaccination_navbar_dropdown.html
@@ -0,0 +1,68 @@
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        WHO
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/who/info">WHO</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/region/all">WHO Regions</a>
+                        <a class="dropdown-item" href="/who/date_reported/all">WHO Date Reported</a>
+                        <a class="dropdown-item" href="/who/country/all">WHO Countries</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/germany">WHO Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/update">WHO Task: Update Data</a>
+                        <a class="dropdown-item" href="/who/update/short">WHO Task: Update Data Short</a>
+                        <a class="dropdown-item" href="/who/imported">WHO imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/tasks">WHO Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        Europe
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/europe/info">Europe</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/country/all">Europe Countries</a>
+                        <a class="dropdown-item" href="/europe/germany">Europe Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">Europe Task: Update Data</a>
+                        <a class="dropdown-item" href="/europe/imported">Europe imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/tasks">Europe Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        RKI
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/rki/info">RKI</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/imported">RKI imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/tasks">RKI Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        NRW
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/nrw/info">NRW</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/region/all">NRW Staedte</a>
+                        <a class="dropdown-item" href="/nrw/bochum">NRW Bochum</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">NRW Task: Update Data</a>
+                        <a class="dropdown-item" href="/nrw/imported">NRW imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/tasks">NRW Tasks</a>
+                    </div>
+                </li>
\ No newline at end of file
diff --git a/templates/vaccination/fragment_navtabs_vaccination.html b/templates/vaccination/fragment_vaccination_navtabs.html
similarity index 100%
rename from templates/vaccination/fragment_navtabs_vaccination.html
rename to templates/vaccination/fragment_vaccination_navtabs.html
diff --git a/templates/vaccination/vaccination_info.html b/templates/vaccination/vaccination_info.html
index 9cdb2446..8fe480f4 100644
--- a/templates/vaccination/vaccination_info.html
+++ b/templates/vaccination/vaccination_info.html
@@ -6,7 +6,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'vaccination/fragment_navtabs_vaccination.html' %}
+  {% include 'vaccination/fragment_vaccination_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/vaccination/vaccination_tasks.html b/templates/vaccination/vaccination_tasks.html
index 160af25f..876c89b5 100644
--- a/templates/vaccination/vaccination_tasks.html
+++ b/templates/vaccination/vaccination_tasks.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'vaccination/fragment_navtabs_vaccination.html' %}
+  {% include 'vaccination/fragment_vaccination_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/vaccination/vaccination_timeline_germany.html b/templates/vaccination/vaccination_timeline_germany.html
index d01da379..21d50824 100644
--- a/templates/vaccination/vaccination_timeline_germany.html
+++ b/templates/vaccination/vaccination_timeline_germany.html
@@ -8,7 +8,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'vaccination/fragment_navtabs_vaccination.html' %}
+  {% include 'vaccination/fragment_vaccination_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/who/fragment_who_navbar_dropdown.html b/templates/who/fragment_who_navbar_dropdown.html
new file mode 100644
index 00000000..b01042b2
--- /dev/null
+++ b/templates/who/fragment_who_navbar_dropdown.html
@@ -0,0 +1,68 @@
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        WHO
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/who/info">WHO</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/region/all">WHO Regions</a>
+                        <a class="dropdown-item" href="/who/date_reported/all">WHO Date Reported</a>
+                        <a class="dropdown-item" href="/who/country/all">WHO Countries</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/germany">WHO Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/update">WHO Task: Update Data</a>
+                        <a class="dropdown-item" href="/who/update/short">WHO Task: Update Data Short</a>
+                        <a class="dropdown-item" href="/who/imported">WHO imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/who/tasks">WHO Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
+                       role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        Europe
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/europe/info">Europe</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/country/all">Europe Countries</a>
+                        <a class="dropdown-item" href="/europe/germany">Europe Germany</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">Europe Task: Update Data</a>
+                        <a class="dropdown-item" href="/europe/imported">Europe imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/europe/tasks">Europe Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        RKI
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/rki/info">RKI</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/imported">RKI imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/rki/tasks">RKI Tasks</a>
+                    </div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        NRW
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                        <a class="dropdown-item" href="/nrw/info">NRW</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/region/all">NRW Staedte</a>
+                        <a class="dropdown-item" href="/nrw/bochum">NRW Bochum</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#">NRW Task: Update Data</a>
+                        <a class="dropdown-item" href="/nrw/imported">NRW imported</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/nrw/tasks">NRW Tasks</a>
+                    </div>
+                </li>
\ No newline at end of file
diff --git a/templates/who/fragment_navtabs_who.html b/templates/who/fragment_who_navtabs.html
similarity index 100%
rename from templates/who/fragment_navtabs_who.html
rename to templates/who/fragment_who_navtabs.html
diff --git a/templates/who/who_country_all.html b/templates/who/who_country_all.html
index e6ce0d10..da42bf5b 100644
--- a/templates/who/who_country_all.html
+++ b/templates/who/who_country_all.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_country_germany.html b/templates/who/who_country_germany.html
index 7b0a96f9..11ce28f8 100644
--- a/templates/who/who_country_germany.html
+++ b/templates/who/who_country_germany.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_country_one.html b/templates/who/who_country_one.html
index 39679ade..2067c085 100644
--- a/templates/who/who_country_one.html
+++ b/templates/who/who_country_one.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_country_one_cases_cumulative.html b/templates/who/who_country_one_cases_cumulative.html
index b20a3d0c..0a2c1227 100644
--- a/templates/who/who_country_one_cases_cumulative.html
+++ b/templates/who/who_country_one_cases_cumulative.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_country_one_cases_new.html b/templates/who/who_country_one_cases_new.html
index 90566ab6..39f885fa 100644
--- a/templates/who/who_country_one_cases_new.html
+++ b/templates/who/who_country_one_cases_new.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_country_one_deaths_cumulative.html b/templates/who/who_country_one_deaths_cumulative.html
index 3993e5b2..8526c09f 100644
--- a/templates/who/who_country_one_deaths_cumulative.html
+++ b/templates/who/who_country_one_deaths_cumulative.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_country_one_deaths_new.html b/templates/who/who_country_one_deaths_new.html
index 22a0252f..c172b6d5 100644
--- a/templates/who/who_country_one_deaths_new.html
+++ b/templates/who/who_country_one_deaths_new.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_date_reported_all.html b/templates/who/who_date_reported_all.html
index 9e475c72..da534f91 100644
--- a/templates/who/who_date_reported_all.html
+++ b/templates/who/who_date_reported_all.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_date_reported_one.html b/templates/who/who_date_reported_one.html
index 5389b594..71e8780b 100644
--- a/templates/who/who_date_reported_one.html
+++ b/templates/who/who_date_reported_one.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/who/who_date_reported_one_cases_cumulative.html b/templates/who/who_date_reported_one_cases_cumulative.html
index 42a4861f..81530e00 100644
--- a/templates/who/who_date_reported_one_cases_cumulative.html
+++ b/templates/who/who_date_reported_one_cases_cumulative.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/who/who_date_reported_one_cases_new.html b/templates/who/who_date_reported_one_cases_new.html
index 0405d566..0b8d0282 100644
--- a/templates/who/who_date_reported_one_cases_new.html
+++ b/templates/who/who_date_reported_one_cases_new.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/who/who_date_reported_one_deaths_cumulative.html b/templates/who/who_date_reported_one_deaths_cumulative.html
index 42a4861f..81530e00 100644
--- a/templates/who/who_date_reported_one_deaths_cumulative.html
+++ b/templates/who/who_date_reported_one_deaths_cumulative.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/who/who_date_reported_one_deaths_new.html b/templates/who/who_date_reported_one_deaths_new.html
index a723f136..77097ed2 100644
--- a/templates/who/who_date_reported_one_deaths_new.html
+++ b/templates/who/who_date_reported_one_deaths_new.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/who/who_imported.html b/templates/who/who_imported.html
index 9adffa68..fcebf758 100644
--- a/templates/who/who_imported.html
+++ b/templates/who/who_imported.html
@@ -8,7 +8,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/who/who_info.html b/templates/who/who_info.html
index 33cea105..e49d1fa8 100644
--- a/templates/who/who_info.html
+++ b/templates/who/who_info.html
@@ -6,7 +6,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/templates/who/who_region_all.html b/templates/who/who_region_all.html
index a5cdae98..3c147a09 100644
--- a/templates/who/who_region_all.html
+++ b/templates/who/who_region_all.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_region_one.html b/templates/who/who_region_one.html
index d01e09aa..fa59a441 100644
--- a/templates/who/who_region_one.html
+++ b/templates/who/who_region_one.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/templates/who/who_tasks.html b/templates/who/who_tasks.html
index a152b0e2..394cc416 100644
--- a/templates/who/who_tasks.html
+++ b/templates/who/who_tasks.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'who/fragment_navtabs_who.html' %}
+  {% include 'who/fragment_who_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
-- 
GitLab