diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
index 7b2d2517aa39ac5835229148d5eae9fa63f58972..e655f7d4f5323edab0b1fc7367ea8bc09e677599 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
@@ -15,7 +15,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
index 07a8b5068b9ed6b8436e47fa553b543312492948..e504c49d6ff1d09aa355bca67cd4641229b3c819 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
@@ -15,7 +15,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
index 7b76e1e706ced2c78dec360764dddf99d9438914..106e8766aeee60ff8078d1b313f70bcb87d02756 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
@@ -15,7 +15,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
index e8fc730b75c2107c58d962d57639fab5a3559536..3d27dc10abb5e805d355ecde4640273b0efe5981 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
@@ -15,7 +15,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
index d614b2c59face9a53ac81880b07b6c6abba3c0ee..827e137a4b0e29fa599b8af53fc9a47e164945d3 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
@@ -5,7 +5,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
index 83a7bcd6624562afc79ad4524d770a2895a10f35..5e63ff8467b3fc829dcf8efbf8e6d72a87896c71 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
@@ -5,7 +5,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
index 8d568432979d1b14f0dddc46e1787b09e951e17a..6c94420fbf90690a75985f75d3d28cec550b1811 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
@@ -15,7 +15,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
index eebf92a4a0448318225c50bcd150fb0e68718db0..8fa142e8095a6fdd539b52aa87641c39ed2449fd 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
@@ -8,7 +8,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
index c6dea641d0fba29eb07faef92ad04740f183c73b..c7623991b4b450c57531cbf4163253b17ff72a63 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
@@ -8,7 +8,7 @@
   {% include 'europe/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
index 3c626d4e7549aa1edfca2fda8bf2a733a7960021..e9ea47347c22ad5843d324d4489dfbf03679d375 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
@@ -8,7 +8,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
index 29fc133de767123181b1508b709547a7d764819d..92cc888c4a3ce561138db71145562ad132fa672a 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
@@ -8,7 +8,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
index 822ac5071224d5ff01d54357acd98aa556f2cf1f..e3b08872a9f5ef45119a0d3c4bcc07ae3f39b341 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
@@ -15,7 +15,7 @@
   {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
index bd04c539a95347d6a543214a31ed3bb3960ad705..95c7e93b54524fe99ad9c174d2b6d51955346b57 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
@@ -17,7 +17,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
index 2c7cc7d81acd34dded2655f50a35dbe02d666f4f..d55077b3aad78917be11bba7ad9af4d6b605c256 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
index 1d77a7810941fc546371aaab20f6de8adabf2f6d..1403545821d3cbb87f56080d0140d4f7a6d84231 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_all.html b/src/covid19/blueprints/who/templates/who/country/who_country_all.html
index 640fb689239c81f5e70b37edb9b50c23890c000a..2d18752fd4643594540446f5e037c57d89f79c32 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_all.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_all.html
@@ -16,7 +16,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html b/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
index 8545e436b2a89677389c05a91542290e67765992..000c8eb8bc566b5ce427f0f074cbd5e3eb316c6b 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
@@ -25,7 +25,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one.html b/src/covid19/blueprints/who/templates/who/country/who_country_one.html
index 31f7c4a375a92b5cf078e1c0fe350eacb7d98bac..fd082343b8d019ae9bd6647322910c4897845360 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one.html
@@ -17,7 +17,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
index ded2572d8147575abe1ccd115ba138bcb9e166d3..16560b6cbb0fb7a0cfd28c03d546157758cab2b2 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
@@ -17,7 +17,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
index 05e6d030cb21a1c10cc9f0dd84a3764f62733383..175669c68c12293b855a3a483bb1fc8314d22dcd 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
@@ -17,7 +17,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
index 819cecdf971d3b2c82c2ae4d4a2b3e436b149a18..7a6d467c5ebdb3472bfeedd733e76a53d0100f8a 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
@@ -17,7 +17,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
index ec22097e4bddf4a1e3e6b327cfdc7e9fd914331e..450be616c2339a7e44af7cca23455aff4fc44b04 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
@@ -17,7 +17,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
index fd58835e3a50e3212d4376e0bf85da3ecba5f822..300ada40e9fa4059502fb8c346eb3468946e5fd6 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
@@ -16,7 +16,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
index dcdfeb819f5054929ff628b55ac206e3a90986e8..80399b090c2527f1fd09b3967ae69275f9c6f5a7 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
index 1ed4ab5acf67f69ef8651d6b9e981ceb18347331..0446e170abd637de622300ef5f1475671e6a526e 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
index 374082fdaac122fccca642cd96b83de03f68de50..cba18a8f588f4264842fcc6f1f7a1ca6ea148599 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index 1ed4ab5acf67f69ef8651d6b9e981ceb18347331..0446e170abd637de622300ef5f1475671e6a526e 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
index 685ad739a1f7fd8ff7721956e1aa93e33883d519..a956d974cb813ca3d0827da78b103c67c7c57c20 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_all.html b/src/covid19/blueprints/who/templates/who/region/who_region_all.html
index d39ad83bdcea6dadc401b84ff50784a3ff1c9436..e0bf8a3c33446f3bc4151f94755e6476d632816c 100644
--- a/src/covid19/blueprints/who/templates/who/region/who_region_all.html
+++ b/src/covid19/blueprints/who/templates/who/region/who_region_all.html
@@ -16,7 +16,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
     {% if page_data.pages > 1 %}
         <!-- previous page -->
         <ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_one.html b/src/covid19/blueprints/who/templates/who/region/who_region_one.html
index 0014aa6cab1ffb3b0b95e6bc03be7e285711ab25..28909bdbcf2c52812a56df2d5e4db4364cee0813 100644
--- a/src/covid19/blueprints/who/templates/who/region/who_region_one.html
+++ b/src/covid19/blueprints/who/templates/who/region/who_region_one.html
@@ -17,7 +17,7 @@
   {% include 'who/fragments/fragment_who_navtabs.html' %}
 {% endblock %}
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
         <!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/who_imported.html b/src/covid19/blueprints/who/templates/who/who_imported.html
index 8ecfb4bc47bbd1060dca7d5ccb1bdf7ac36f79da..f9cd325dd8f4a5ffbd80ed89b3600944183aea01 100644
--- a/src/covid19/blueprints/who/templates/who/who_imported.html
+++ b/src/covid19/blueprints/who/templates/who/who_imported.html
@@ -15,7 +15,7 @@
 {% endblock %}
 
 
-{% block main_container_fluid %}
+{% block main_container %}
 
     {% if page_data.pages > 1 %}
     <!-- previous page -->