diff --git a/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data.html b/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data.html
index 2f31b0e77c75c319be2a539d53d240be4bd25529..2a1df62095edd064af7c896bcec420419010167c 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data.html
@@ -1,40 +1,7 @@
     <div class="table-responsive">
     <table class="table table-hover table-striped table-dark">
         <thead class="table-secondary">
-            <tr>
-                <th scope="col">
-                    <a href="{{ url_for( 'who.url_who_date_reported_all') }}">
-                        date reported
-                    </a>
-                </th>
-                <th scope="col">
-                    deaths new
-                </th>
-                <th scope="col">
-                    cases new
-                </th>
-                <th scope="col">
-                    deaths cumulative
-                </th>
-                <th scope="col">
-                    cases cumulative
-                </th>
-                <th scope="col">
-                    <a href="{{ url_for( 'who.url_who_country_all') }}">
-                        country code
-                    </a>
-                </th>
-                <th scope="col">
-                    <a href="{{ url_for( 'who.url_who_country_all') }}">
-                        country
-                    </a>
-                </th>
-                <th scope="col">
-                    <a href="{{ url_for( 'who.url_who_region_all') }}">
-                        region
-                    </a>
-                </th>
-            </tr>
+            {% include 'who/data/who_table_global_data_head.html' %}
         </thead>
         <tbody>
         {% for who_global_data in page_data.items %}
@@ -67,7 +34,7 @@
         {% endfor %}
         </tbody>
         <tfoot>
-
+            {% include 'who/data/who_table_global_data_head.html' %}
         </tfoot>
     </table>
     </div>
\ No newline at end of file
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table.html b/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table.html
index 0f6525afcefd014117598d7200045c13395c0476..c28f75d8a190b11f1cc30f414ebbab8a668cbb2a 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table.html
@@ -1,3 +1,4 @@
+                <div class="table-responsive">
                 <table class="table table-hover table-striped table-dark">
                     <thead>
                         {% include 'who/flat/who_flat_table_head.html' %}
@@ -35,4 +36,5 @@
                     <tfoot>
                         {% include 'who/flat/who_flat_table_head.html' %}
                     </tfoot>
-                </table>
\ No newline at end of file
+                </table>
+                </div>
\ No newline at end of file
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table.html b/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table.html
index 9ea10af0d27b9e97e071b34eb5e85dc9eab27a30..c9cad545f129440fa192b1a8924802a285a7a1a9 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table.html
@@ -1,3 +1,4 @@
+                <div class="table-responsive">
                 <table class="table table-hover table-striped table-dark">
                     <thead>
                         {% include 'who/flat/who_flat_table_head.html' %}
@@ -19,4 +20,5 @@
                     <tfoot>
                         {% include 'who/flat/who_flat_table_head.html' %}
                     </tfoot>
-                </table>
\ No newline at end of file
+                </table>
+                </div>
\ No newline at end of file
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all_table.html b/src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all_table.html
index cedcbff4457563ec32f608f5731447b31fc6a107..4548c266062404fb63fce3ce8330b046b48d36b8 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all_table.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all_table.html
@@ -1,4 +1,4 @@
-
+                <div class="table-responsive">
                 <table class="table table-hover table-striped table-dark">
                     <thead>
                         <tr>
@@ -22,3 +22,4 @@
                         </tr>
                     </tfoot>
                 </table>
+                </div>