diff --git a/templates/admin/admin_info.html b/templates/admin/admin_info.html
index f21a260d09504b9df3a5ac8b4099120f40d14258..761fce48f45d5205e2e8609b6a0b6b9220988bec 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 6d79ed8ca5820a8d4a071814dd1f13f29180ba57..fa796898c5be82fe4ffe600f56b1aa88625bf85f 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 0000000000000000000000000000000000000000..b01042b2ba886e3691826ff02e6e4ec2d6a1cb96
--- /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 975b2df8bd6ce934039ad3c29f91c2b64be1f396..57fe3af1e3c2448acd05074c8a250c0dee50ac6c 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 1818204c536ca14ab1c9a0bf4949ae79a5433baf..422fe556034e596d43e57411cfd6636718a84d7a 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 a25296887c0763d7e3ce72b58c2abc43d01a3ff9..ad0a1f086eea5f73e84e2a08f0a419dd2b4782fb 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 4171827bc3c4950f42ebdc246e93d40fda784fc8..add15475271b72a6669e0964351e65942ef1229c 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 0718aade579c0e32bdad2e4c1f6474543b740c62..c3b6d746e10285b0ec337a17c287bc549c1534d2 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 5db9dee82e68efb9196a77fe911e9371a6e5ad62..aaa339d814ff326a4d7948ba23fb6b9d37844b12 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 50e8fb9319997286db21f091908e7d3a0409eb78..42c51425e6f084487d10faf95fc69b445213962b 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 0026b951b4efbc2474acc2d233faaec4c8dc3477..19b9c681f4dee249dfcc83f989f6df63b9b9d35d 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 8b3fd98841da88d1ea2ca02203336c02307d72c6..9d399f325f1e5fc68bf74bbbc2a903d33019a0a7 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 60fc28b70636f94a173734297e4a418bc74d0bb9..c2823db97d729e8c7320708637af5bd840c31188 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 3c07605850a2c8b67aed0885086984e0bd27c925..e54ab62fb19f9591342dfe8430f47c0805f0f2d0 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 9d22a07ed2ff0c89beafce77570b917def149a74..6c782c0110b596004db5fafc21a1779988316a8a 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 17cb45e6c27c2ae4642e2b78b3ed1b74210c0a79..b8332a047a9186729689f039f5f4d1a8f2a01373 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 ce16b3bc52af7917cd8be3f39fb326334674cba3..d3294102f9874d0bcf3314236e92e6355a13275d 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 cb422b99bd01f7fcf14775979c676c380f3be16b..af7d50a1ce62a56484168720c80a6851182084d2 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 0000000000000000000000000000000000000000..b01042b2ba886e3691826ff02e6e4ec2d6a1cb96
--- /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 4eca36d4aecebeff42ce6678b429b05dae3e8d65..01bcd5e7cbd41d383bc6d87f6f08f640e606b124 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 0000000000000000000000000000000000000000..b01042b2ba886e3691826ff02e6e4ec2d6a1cb96
--- /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 ae1e26955e55b6617c957e8efdcb92e055f15337..4271c073d53bfb87f3b25a76862d4c45e1e3561c 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 2c63e2055e8b1ec3d6d3eea527efc4d42b140490..fa78b741e704336e30a89a98d1afe8640e8d46a7 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 11385a5aab56575a182d7315bfed49c9fe9b73d1..189b0066ecadf95af38789aa3eea59c9779686df 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 7565da216d3066898dbdf046cf696cd8e040f774..e235fdf26d8de6da43e2f6d4712e842a482c1ec3 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 078d0a36ad665ec6b905485627fed82abb5f49ef..3f4c4c670c707d2d295c3f8bf08a2a93a12bd374 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 0000000000000000000000000000000000000000..b01042b2ba886e3691826ff02e6e4ec2d6a1cb96
--- /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 05a6836e59b7d35fc3d651e3e1b05b52dbb70b13..b4624895c2bbdcbf3376347d439ab0c8ecbb2c86 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 0500b3f5ea3def411026a10dc7d073af871ade86..6eea293c5deb3ff066da49c37be298a5f9d69c44 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 77733fc0baca56a13743d86795f3b2e923a4b3cd..b2eacb7c9cbfa015354904efafcf98213432017d 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 0000000000000000000000000000000000000000..b01042b2ba886e3691826ff02e6e4ec2d6a1cb96
--- /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 9cdb2446174e9228b9b834cfc86a8a998f5562a1..8fe480f4874989b8345ec99842c6da409211a3f4 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 160af25ff18b7aea7dc2bace7cfc81229f12dee3..876c89b5b56f0f43ca1d11fa48e2bac7c54aefba 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 d01da379a70c1e8bae587aeaa98e9d0e84e5d89e..21d508248931f0bd7f0d464ebd5310ad772335f8 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 0000000000000000000000000000000000000000..b01042b2ba886e3691826ff02e6e4ec2d6a1cb96
--- /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 e6ce0d103c061ba757ea75f6d0cd833db36db3e1..da42bf5b511b10adf4453015824d436149b73991 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 7b0a96f9a1eeb2a38cbecf8ac63bd3dc36489fd1..11ce28f83be8ef79014b73d5fef923b351846450 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 39679ade88f7870ff1c385a7feae3635e0768d3f..2067c08577132569348645767bc43bc7db36ae15 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 b20a3d0c1e25cb70e13a24f4b8afc923dfd560a2..0a2c1227a93f4e86aa194341ee6a50b2dc32fabc 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 90566ab6aa11ea47053bea4c65444918f9d6f969..39f885fa6ba8c2903888bac32ee7576278a857f3 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 3993e5b2fe3f38ce40bd511d644a7bf7300477a0..8526c09fcf1a2da339d4c95d3a14611f5433060f 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 22a0252f001e67dd70da1f9db2da4a23abfc847b..c172b6d577067e89c352709e899c415612e093ec 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 9e475c72b3933a7d89bb920da7bda81b1acc71a6..da534f91c571b287e179c54a27948d41a35bec88 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 5389b59440ebf93513e4f5bb6ee65274b7555482..71e8780ba9b71b8cae00898cd890c12393dcc17e 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 42a4861f2cc230b1ae80a7ec6602ae137facaf32..81530e003b1343b812c46d002705651eb9bb877b 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 0405d566eaaacca79ae5b4e3966de32e8b7e146d..0b8d0282cfed706026882e744e810fad1b90768d 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 42a4861f2cc230b1ae80a7ec6602ae137facaf32..81530e003b1343b812c46d002705651eb9bb877b 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 a723f136d341b841f5b65eff3dc886892ddc881f..77097ed27e20df3442b3a6865cbd1f93de02d3bd 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 9adffa681a9de82bb69142cb5a152f33b093ba47..fcebf7584b73f2e039a0a5a87b56527aef2c7765 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 33cea105f418b93980ca17731876dc9521923686..e49d1fa8256c5602e377a861df18080e97ba6bad 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 a5cdae98a299f1d0abde78e0c2e5ef24af460fc3..3c147a0957f45f58ed4a61b272f5b644151756f6 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 d01e09aaa63b3323b08b5fc4e4d0f6f148af5a31..fa59a441229fb4639d013e0cfdaea80a0d045b02 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 a152b0e2c94c1ff302ebcaa135ef4ae55b903fde..394cc41618fdd9cfed76c9dddffe6b55b0d427d4 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 %}