diff --git a/docs/_static/js/version_table.js b/docs/_static/js/version_table.js
index 66e6f5bd68..d4f84ebdb6 100644
--- a/docs/_static/js/version_table.js
+++ b/docs/_static/js/version_table.js
@@ -23,7 +23,7 @@ $(document).ready(function() {
 
     (Where 'idf_target' path element are optional depending on if the project has multiple target support)
     */
-    let project_base_url = DOCUMENTATION_OPTIONS.URL_ROOT + "../..";
+    let project_base_url = DOCUMENTATION_OPTIONS.URL_ROOT + "../../..";
     if (DOCUMENTATION_OPTIONS.IDF_TARGETS) {
         project_base_url += "/..";
     }
@@ -38,17 +38,29 @@ $(document).ready(function() {
         return result + "/";
     };
 
-    old_ver_list = "";
+    old_ver_table = "";
+    old_ver_table_row = "<tr>"
+    let row_items = 0;
+    const ITEMS_PER_ROW = 4;
 
     for (let i = 0; i < versions.length; i++) {
         let v = versions[i];
         let url = getVersionUrl(v);
 
         if (v.old) {
-            old_ver_list += "<li><a href=\"" + url + "\">" + v.name + "</li>";
+            old_ver_table_row += "<td><a href=\"" + url + "\">" + v.name + "</td>";
+            row_items++;
+            if (row_items === ITEMS_PER_ROW) {
+                old_ver_table_row += "</tr>"
+                old_ver_table += old_ver_table_row
+
+                /* Prepare a new row */
+                old_ver_table_row = "<tr>"
+                row_items = 0
+            }
         }
 
     }
 
-    $( "#version_list" ).append(old_ver_list);
+    $( "#version_table" ).append(old_ver_table);
 });
diff --git a/docs/_static/version_table.html b/docs/_static/version_table.html
index 6e0feedbbe..6888880154 100644
--- a/docs/_static/version_table.html
+++ b/docs/_static/version_table.html
@@ -1,7 +1,7 @@
 
 <version_table>
     <script src="_static/js/version_table.js"></script>
-    <ul id="version_list">
+    <table id="version_table" style="width: 100%">
 
-    </ul>
+    </table>
 </version_table>
diff --git a/docs/conf_common.py b/docs/conf_common.py
index 03b607556b..7855706ab1 100644
--- a/docs/conf_common.py
+++ b/docs/conf_common.py
@@ -179,3 +179,5 @@ with open('../page_redirects.txt') as f:
         if len(line.split(' ')) != 2:
             raise RuntimeError('Invalid line in page_redirects.txt: %s' % line)
 html_redirect_pages = [tuple(line.split(' ')) for line in lines]
+
+html_static_path = ['../_static']