diff --git a/css/default.css b/css/default.css
index b00d0de69d..bfd478b06e 100644
--- a/css/default.css
+++ b/css/default.css
@@ -596,6 +596,11 @@ td {
   }
 }
 
+.table-wrapper {
+  display: block;
+  overflow-x: auto;
+}
+
 #featurestable {
   width: 100%;
   max-width: none;
@@ -612,6 +617,8 @@ td {
 
 #featurestable tr td {
   vertical-align: middle;
+  hyphens: inherit;
+  overflow-wrap: inherit;
 }
 
 #featurestable .green {
@@ -666,7 +673,7 @@ td {
   padding-left: 10px;
 }
 
-.categoryrow {
+.categoryrow td {
   background-color: #162036 !important;
 }
 
@@ -1218,10 +1225,13 @@ div#defaultsidebar .mysidebar .sidebarbuttoncontainer {
 }
 
 #jumpto {
-  flex: 1 !important; /* TODO: Disable “important” */
   padding-bottom: var(--space10);
 }
 
+#jumpto #anchorlist p:not(:empty) {
+  min-width: 240px;
+}
+
 #anchorlist {
   margin-top: 70px;
   overflow-wrap: anywhere;
@@ -1266,7 +1276,8 @@ div#defaultsidebar .mysidebar .sidebarbuttoncontainer {
 }
 
 .highlightlink {
-  background-color: var(--body-background) !important; /* Make sure background is white */
+  background-color: var(--body-background) !important;
+  /* Make sure background is white */
   color: var(--link-color) !important;
   font-weight: bold;
 }
diff --git a/css/inner-page.css b/css/inner-page.css
index df24d14b91..84a8562891 100644
--- a/css/inner-page.css
+++ b/css/inner-page.css
@@ -190,10 +190,27 @@ table>thead>tr>th {
   border-bottom: none;
 }
 
-table>tbody>tr:nth-of-type(odd) {
+table>tbody>tr:nth-of-type(odd):not(.categoryrow) td {
   background-color: var(--table-cell);
 }
 
+#featurestable tr td,
+#featurestable tr th {
+  padding: 8px;
+  min-width: 130px;
+}
+
+#featurestable tr td:first-child,
+#featurestable tr th:first-child {
+  min-width: 200px;
+}
+
+#featurestable tr {
+  width: 100%;
+  display: grid;
+  grid-auto-flow: column;
+}
+
 .designsheet table tr td {
   line-height: 2.4em !important;
   text-align: center;
diff --git a/js/additionalscripts.js b/js/additionalscripts.js
index ce2fbac44e..9b2761ddaf 100644
--- a/js/additionalscripts.js
+++ b/js/additionalscripts.js
@@ -668,7 +668,7 @@ function searchFunction() {
 //very similar to the search function above, just for the capabilities comparison table
 function capabilitiesSearch() {
   var $title = $(".h1").text()
-  if ($title.indexOf("Rich Messaging Channel Capabilities") > -1) {
+  if ($title.indexOf("Messaging features Capabilities Comparison") > -1) {
     // Declare variables
     // console.log("run")
     var input, filter, table, tr, categorytr, td, i
diff --git a/pages/Documents/APIGuidelines/messaging-features-capabilities-comparison.md b/pages/Documents/APIGuidelines/messaging-features-capabilities-comparison.md
index f1d9c39e9a..afb0321d1b 100644
--- a/pages/Documents/APIGuidelines/messaging-features-capabilities-comparison.md
+++ b/pages/Documents/APIGuidelines/messaging-features-capabilities-comparison.md
@@ -10,112 +10,114 @@ redirect_from:
 ---
 
 <input id="capabilitiesSearch" placeholder="Search by Capability Name" />
-<table id="featurestable">
-  <thead>
-    <th></th>
-    <th>Mobile App Messaging</th>
-    <th>Web Messaging</th>
-    <th>Apple Business chat</th>
-    <th>SMS</th>
-    <th>Facebook</th>
-    <th>WhatsApp</th>
-    <th>Google RCS</th>
-    <th>Line</th>
-    <th>Messaging Window API</th>
-    <th>Connector API</th>
-  </thead>
-  <tbody>
-    {% for category in site.data.capabilities %}
-      <tr class="categoryrow">
-        <td>{{ category.categoryName }}</td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-      </tr>
-      {% for feature in category.features %}
-      <tr>
-        <td>{{ feature.featureName }}</td>
-        {% for channel in feature.channels %}
-        {% if forloop.index == 1 %}
-        {% if channel.mobileAppMessaging == "Supported" %}
-        <td class="green">{{ channel.mobileAppMessaging }}</td>
-        {% else %}
-        <td>{{ channel.mobileAppMessaging }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 2 %}
-        {% if channel.webMessaging == "Supported" %}
-        <td class="green">{{ channel.webMessaging }}</td>
-        {% else %}
-        <td>{{ channel.webMessaging }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 3 %}
-        {% if channel.appleBusinessChat == "Supported" %}
-        <td class="green">{{ channel.appleBusinessChat }}</td>
-        {% else %}
-        <td>{{ channel.appleBusinessChat }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 4 %}
-        {% if channel.sms == "Supported" %}
-        <td class="green">{{ channel.sms }}</td>
-        {% else %}
-        <td>{{ channel.sms }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 5 %}
-        {% if channel.facebook == "Supported" %}
-        <td class="green">{{ channel.facebook }}</td>
-        {% else %}
-        <td>{{ channel.facebook }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 6 %}
-        {% if channel.whatsapp == "Supported" %}
-        <td class="green">{{ channel.whatsapp }}</td>
-        {% else %}
-        <td>{{ channel.whatsapp }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 7 %}
-        {% if channel.googleRCS == "Supported" %}
-        <td class="green">{{ channel.googleRCS }}</td>
-        {% else %}
-        <td>{{ channel.googleRCS }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 8 %}
-        {% if channel.line == "Supported" %}
-        <td class="green">{{ channel.line }}</td>
-        {% else %}
-        <td>{{ channel.line }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 9 %}
-        {% if channel.messagingWindowAPI == "Supported" %}
-        <td class="green">{{ channel.messagingWindowAPI }}</td>
-        {% else %}
-        <td>{{ channel.messagingWindowAPI }}</td>
-        {% endif %}
-        {% endif %}
-        {% if forloop.index == 10 %}
-        {% if channel.connectorAPI == "Supported" %}
-        <td class="green">{{ channel.connectorAPI }}</td>
-        {% else %}
-        <td>{{ channel.connectorAPI }}</td>
-        {% endif %}
-        {% endif %}
+<div class="table-wrapper">
+  <table id="featurestable">
+    <thead>
+      <th></th>
+      <th>Mobile App Messaging</th>
+      <th>Web Messaging</th>
+      <th>Apple Business chat</th>
+      <th>SMS</th>
+      <th>Facebook</th>
+      <th>WhatsApp</th>
+      <th>Google RCS</th>
+      <th>Line</th>
+      <th>Messaging Window API</th>
+      <th>Connector API</th>
+    </thead>
+    <tbody>
+      {% for category in site.data.capabilities %}
+        <tr class="categoryrow">
+          <td>{{ category.categoryName }}</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        {% for feature in category.features %}
+        <tr>
+          <td>{{ feature.featureName }}</td>
+          {% for channel in feature.channels %}
+          {% if forloop.index == 1 %}
+          {% if channel.mobileAppMessaging == "Supported" %}
+          <td class="green">{{ channel.mobileAppMessaging }}</td>
+          {% else %}
+          <td>{{ channel.mobileAppMessaging }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 2 %}
+          {% if channel.webMessaging == "Supported" %}
+          <td class="green">{{ channel.webMessaging }}</td>
+          {% else %}
+          <td>{{ channel.webMessaging }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 3 %}
+          {% if channel.appleBusinessChat == "Supported" %}
+          <td class="green">{{ channel.appleBusinessChat }}</td>
+          {% else %}
+          <td>{{ channel.appleBusinessChat }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 4 %}
+          {% if channel.sms == "Supported" %}
+          <td class="green">{{ channel.sms }}</td>
+          {% else %}
+          <td>{{ channel.sms }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 5 %}
+          {% if channel.facebook == "Supported" %}
+          <td class="green">{{ channel.facebook }}</td>
+          {% else %}
+          <td>{{ channel.facebook }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 6 %}
+          {% if channel.whatsapp == "Supported" %}
+          <td class="green">{{ channel.whatsapp }}</td>
+          {% else %}
+          <td>{{ channel.whatsapp }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 7 %}
+          {% if channel.googleRCS == "Supported" %}
+          <td class="green">{{ channel.googleRCS }}</td>
+          {% else %}
+          <td>{{ channel.googleRCS }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 8 %}
+          {% if channel.line == "Supported" %}
+          <td class="green">{{ channel.line }}</td>
+          {% else %}
+          <td>{{ channel.line }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 9 %}
+          {% if channel.messagingWindowAPI == "Supported" %}
+          <td class="green">{{ channel.messagingWindowAPI }}</td>
+          {% else %}
+          <td>{{ channel.messagingWindowAPI }}</td>
+          {% endif %}
+          {% endif %}
+          {% if forloop.index == 10 %}
+          {% if channel.connectorAPI == "Supported" %}
+          <td class="green">{{ channel.connectorAPI }}</td>
+          {% else %}
+          <td>{{ channel.connectorAPI }}</td>
+          {% endif %}
+          {% endif %}
+          {% endfor %}
+        </tr>
         {% endfor %}
-      </tr>
       {% endfor %}
-    {% endfor %}
-    </tbody>
+      </tbody>
   </table>
+</div>