diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html
index 2309b8d355fa852559827188eba5b9ca1b7cc816..b1f1e1efccd655df47ac1334ebeeb0c021b71025 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html
@@ -4,7 +4,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for('owid.url_owid_test', page=page_data.prev_num) }}">Previous</a>
+                           href="{{ url_for('owid.url_owid_country_all', page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
                     <!-- all page numbers -->
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for('owid.url_owid_test', page=page_num) }}">{{ page_num }}</a>
+                                       href="{{ url_for('owid.url_owid_country_all', page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
                                 <li class="page-item active">
@@ -30,7 +30,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for('owid.url_owid_test', page=page_data.next_num) }}">Next</a>
+                           href="{{ url_for('owid.url_owid_country_all', page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
                     </ul>
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html
index 2309b8d355fa852559827188eba5b9ca1b7cc816..f821a6ad69e737f685b13e80a2f89c5a88ebd950 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html
@@ -4,7 +4,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for('owid.url_owid_test', page=page_data.prev_num) }}">Previous</a>
+                           href="{{ url_for('owid.url_owid_country_one_germany', page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
                     <!-- all page numbers -->
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for('owid.url_owid_test', page=page_num) }}">{{ page_num }}</a>
+                                       href="{{ url_for('owid.url_owid_country_one_germany', page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
                                 <li class="page-item active">
@@ -30,7 +30,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for('owid.url_owid_test', page=page_data.next_num) }}">Next</a>
+                           href="{{ url_for('owid.url_owid_country_one_germany', page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
                     </ul>
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
index 2309b8d355fa852559827188eba5b9ca1b7cc816..8f1305b53ea9c626c0a7f929b45edcf2a56aa4ce 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
@@ -4,7 +4,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for('owid.url_owid_test', page=page_data.prev_num) }}">Previous</a>
+                           href="{{ url_for('owid.url_owid_country_one', page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
                     <!-- all page numbers -->
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for('owid.url_owid_test', page=page_num) }}">{{ page_num }}</a>
+                                       href="{{ url_for('owid.url_owid_country_one', page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
                                 <li class="page-item active">
@@ -30,7 +30,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for('owid.url_owid_test', page=page_data.next_num) }}">Next</a>
+                           href="{{ url_for('owid.url_owid_country_one', page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
                     </ul>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
index 7337b92a6e9dc527e9a953d8c27e13e4b32c5cb3..6fc04644289cbd7207cdc8611129e1d6f3a58ac3 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
@@ -12,7 +12,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_deaths_cumulative',
                         date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
@@ -21,7 +21,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+                                    <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_deaths_cumulative',
                                     date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -38,7 +38,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_deaths_cumulative',
                         date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
@@ -48,7 +48,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
+                {% include 'owid/date_reported/owid_date_reported_one_table.html' %}
             </div>
         </div>
     </div>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
index 22eea5265f350227a932b44a793683af493a6e4b..d213649be1377af1f47bd28248f0f53e04ebbe2e 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
@@ -12,7 +12,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('owid.url_owiddate_reported_cases_new',
+                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_new',
                         date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
@@ -23,7 +23,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('owid.url_owiddate_reported_cases_new',
+                                    <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_new',
                                     date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -40,7 +40,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('owid.url_owiddate_reported_cases_new',
+                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_new',
                         date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
+                {% include 'owid/date_reported/owid_date_reported_one_table.html' %}
             </div>
         </div>
     </div>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
index 7337b92a6e9dc527e9a953d8c27e13e4b32c5cb3..a66b424bfe96bb2d8e356e40ce8a815b6eb8adc3 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
@@ -12,7 +12,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_cumulative',
                         date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
@@ -21,7 +21,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+                                    <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_cumulative',
                                     date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -38,7 +38,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_cumulative',
                         date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
@@ -48,7 +48,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
+                {% include 'owid/date_reported/owid_date_reported_one_table.html' %}
             </div>
         </div>
     </div>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
index cf5bce323dfcc54c939639a4d29ef308931bba8b..8c94c181b315e10a5b3aac9d098daf6087cefae1 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
@@ -54,7 +54,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
+                {% include 'owid/date_reported/owid_date_reported_one_table.html' %}
             </div>
         </div>
     </div>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html
index 238c9a326c0a8567502f2d0ded47bfad655cd69c..fd70c0b9b2fbdff53f330554fa07cda3d24fe197 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html
@@ -3,7 +3,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported',
+                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one',
                         date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
@@ -12,7 +12,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('owid.url_owid_date_reported',
+                                    <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one',
                                     date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -29,7 +29,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported',
+                        <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one',
                         date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
diff --git a/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html b/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html
index 3385ee546c69f5fe594e8a7bc728efb62b3ac84b..9f01db3aa9199e43a2a83d1d9d80b564ed3efd89 100644
--- a/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html
+++ b/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html
@@ -24,6 +24,10 @@
                         <a class="nav-link"
                            href="{{ url_for( 'owid.url_owid_country_all') }}">OWID Countries</a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link"
+                           href="{{ url_for( 'owid.url_owid_country_one_germany') }}">OWID Germany</a>
+                    </li>
                     <li class="nav-item">
                         <a class="nav-link"
                            href="{{ url_for( 'owid.url_owid_imported') }}">OWID imported</a>