diff --git a/main.css b/main.css
index ab156bb..378e773 100644
--- a/main.css
+++ b/main.css
@@ -1,8 +1,8 @@
 /* Theming taken from https://github.com/vector-im/riot-web/blob/cf5cf02529f95a094d88051c12fdb87a03d87335/src/skins/vector/css/themes/_base.scss */
-table {
+.room {
     margin-left: 2em;
 }
-td {
+.info {
     align-items: center;
     display:flex;
 }
diff --git a/spaces.html b/spaces.html
index aeb4ca4..a5d1fac 100644
--- a/spaces.html
+++ b/spaces.html
@@ -11,33 +11,36 @@
     </head>
     <body>
         <%def name="render(room)">
-            <table>
-            <tbody>
-                <tr>
-                % if 'avatar_url' in room:
-                <td><img class="avatar roomAvatar" src=${mxc2url(room['avatar_url'])}>
-                % endif
 
-                % if 'room_id' in room:
-                    <a href="https://view.matrix.org/room/${room['room_id']}">
-
-                    % if 'name' in room:
-                        <div> ${room['name']} </div>
+            <div class="room">
+               <div class="info">
+                    % if 'avatar_url' in room:
+                    <img class="avatar roomAvatar" src=${mxc2url(room['avatar_url'])}>
                     % endif
+                    
 
-                    </a>
-                % endif
-                </td>
-                </tr>
+                    % if 'room_id' in room:
+                        % if 'children' not in room:
+                            <a href="https://view.matrix.org/room/${room['room_id']}">
+                        % endif
+
+                        % if 'name' in room:
+                            <div> ${room['name']} </div>
+                        % endif
+
+                            </a>
+                    % endif
+                </div>
 
                 % if 'children' in room:
+                    <details>
                     % for subroom in room['children']:
-                        <tr><td>${render(subroom)}</td></tr>
+                        ${render(subroom)}
                     % endfor
+                    </details>
                 % endif
+            </div>
 
-            </tbody>
-            </table>
         </%def>
 
         ${render(s)}
