diff --git a/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/roadmap.sass b/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/roadmap.sass
index d87eec30e..67ec304a4 100644
--- a/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/roadmap.sass
+++ b/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/roadmap.sass
@@ -218,4 +218,8 @@ div
 
 .right-ribbon .development::after
   border-right: 3px solid #4D6370
-  border-top: 3px solid #4D6370
\ No newline at end of file
+  border-top: 3px solid #4D6370
+
+.schedule-container
+  max-width: 100%
+  overflow: auto
\ No newline at end of file
diff --git a/themes/hugo-bulma-blocks-theme/assets/sass/style.sass b/themes/hugo-bulma-blocks-theme/assets/sass/style.sass
index 67d1d8696..8a39bd61b 100644
--- a/themes/hugo-bulma-blocks-theme/assets/sass/style.sass
+++ b/themes/hugo-bulma-blocks-theme/assets/sass/style.sass
@@ -125,4 +125,6 @@ code
 .language-select-container
   background-color: #ecf1f4
   border-radius: 10px
-  color: #4d6370 !important
\ No newline at end of file
+  color: #4d6370 !important
+  select
+    max-width: 50vw
\ No newline at end of file
diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/csv-table.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/csv-table.html
index 2dbffa1df..8a2a2bcfd 100644
--- a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/csv-table.html
+++ b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/csv-table.html
@@ -4,24 +4,26 @@
 {{ else }}
     {{ $data = .Inner | unmarshal }}
 {{ end }}
-<table class="roadmap">
-    <thead>
-        <tr>
-            {{ range index $data 0 }}
-                <th>{{ . }}</th>
-            {{ end }}
-        </tr>
-    </thead>
-    <tbody>
-        {{ range after 1 $data }}
+<div class="schedule-container">
+    <table class="roadmap">
+        <thead>
             <tr>
-            {{ range . }}
-                {{ $class := index (findRE ":rm-\\w+:" .) 0 }}
-                <td class="{{ trim $class ":" }}">
-                    {{ . | replaceRE ":rm-\\w+:" "" }}
-                </td>
-            {{ end }}
+                {{ range index $data 0 }}
+                    <th>{{ . }}</th>
+                {{ end }}
             </tr>
-        {{ end }}
-    </tbody>
-</table>
+        </thead>
+        <tbody>
+            {{ range after 1 $data }}
+                <tr>
+                {{ range . }}
+                    {{ $class := index (findRE ":rm-\\w+:" .) 0 }}
+                    <td class="{{ trim $class ":" }}">
+                        {{ . | replaceRE ":rm-\\w+:" "" }}
+                    </td>
+                {{ end }}
+                </tr>
+            {{ end }}
+        </tbody>
+    </table>
+</div>