diff --git a/static/contact.html b/static/contact.html
index f8893fd7..9ff9d942 100644
--- a/static/contact.html
+++ b/static/contact.html
@@ -69,44 +69,32 @@
                 <h2><a href="#community">Community</a></h2>
 
                 <p>GrapheneOS has a very active community primarily based around the official chat
-                room. It's the best place to request support, ask questions or get involved in the
-                project. An official offtopic chat room is available for discussion of topics not
-                strictly related to GrapheneOS.</p>
+                rooms on Matrix.</p>
 
-                <p>The official chat room is available via Matrix as #grapheneos:grapheneos.org. There
-                are multiple ways to join the room:</p>
+                <p>The links below will take you to the Element web client, which uses matrix.org as
+                the homeserver by default. However, you can use the client and homserver of your
+                choice to join our rooms.</p>
 
-                <ul>
-                    <li><a href="https://app.element.io/#/room/%23grapheneos:grapheneos.org">Join the #grapheneos:grapheneos.org room with the Element web client</a>.</li>
-                    <li>Join the #grapheneos:grapheneos.org room with another Matrix client and homeserver of your choice. Element (web, desktop or mobile) and matrix.org are good default choices.</li>
-                </ul>
+                <table>
+                    <tr>
+                        <td><a href="https://app.element.io/#/room/%23grapheneos:grapheneos.org">#grapheneos:grapheneos.org</a></td>
+                        <td>Best place to request support, ask questions or get involved in the project</td>
+                    </tr>
+                    <tr>
+                        <td><a href="https://app.element.io/#/room/%23offtopic:grapheneos.org">#offtopic:grapheneos.org</a></td>
+                        <td>Discuss topics not strictly related to GrapheneOS</td>
+                    </tr>
+                    <tr>
+                        <td><a href="https://app.element.io/#/room/%23testing:grapheneos.org">#testing:grapheneos.org</a></td>
+                        <td>Provide feedback on Beta channel releases</td>
+                    </tr>
+                </table>
 
-                <p>The official off topic chat room is available via Matrix as
-                #offtopic:grapheneos.org. There are multiple ways to join the room:</p>
-
-                <ul>
-                    <li><a href="https://app.element.io/#/room/%23offtopic:grapheneos.org">Join the #offtopic:grapheneos.org room with the Element web client</a>.</li>
-                    <li>Join the #offtopic:grapheneos.org room with another Matrix client and homeserver of your choice. Element (web, desktop or mobile) and matrix.org are good default choices.</li>
-                </ul>
-
-                <p>The official testing chat room for providing feedback on Beta channel releases
-                is available as #testing:grapheneos.org. There are multiple ways to join the
-                room:</p>
-
-                <ul>
-                    <li><a href="https://app.element.io/#/room/%23testing:grapheneos.org">Join the #testing:grapheneos.org room with the Element web client</a>.</li>
-                    <li>Join the #testing:grapheneos.org room with another Matrix client and homeserver of your choice. Element (web, desktop or mobile) and matrix.org are good default choices.</li>
-                </ul>
-
-                <p>The official GrapheneOS groups together all of the official rooms along with
-                members of the community who join the space. Spaces are a new experimental Matrix
-                feature and older clients will see it as an unusable chat room rather than as a
-                community space. There are multiple ways to join the space:</p>
-
-                <ul>
-                    <li><a href="https://app.element.io/#/room/%23community:grapheneos.org">Join the #community:grapheneos.org space with the Element web client</a>.</li>
-                    <li>Join the #community:grapheneos.org room with another Matrix client and homeserver of your choice. Both the client and homeserver need to have support for the experimental Spaces feature. Element (web, desktop or mobile) and matrix.org are good default choices.</li>
-                </ul>
+                <p>The official GrapheneOS space groups together all of the official rooms along
+                with members of the community who join the space. Spaces are a new experimental
+                Matrix feature and older clients will see it as an unusable chat room rather than as
+                a community space. You can join the space at
+                <a href="https://app.element.io/#/room/%23community:grapheneos.org">#community:grapheneos.org</a></p>
 
                 <p>The official subreddit is
                 <a href="https://reddit.com/r/GrapheneOS">/r/GrapheneOS</a>. The subreddit is
diff --git a/static/main.css b/static/main.css
index 5970565e..c2aacab7 100644
--- a/static/main.css
+++ b/static/main.css
@@ -170,6 +170,16 @@ footer a, footer a:visited {
     color: #b00020;
 }
 
+table {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+td {
+    border: 1px solid #ddd;
+    padding: 0.5rem;
+}
+
 /* latin */
 @font-face {
     font-family: 'Roboto';
@@ -254,4 +264,8 @@ footer a, footer a:visited {
         /* Baseline Material dark error color */
         color: #cf6679;
     }
+
+    td {
+        border-color: #222;
+    }
 }