diff --git a/templates/webapps/galaxy/admin/tool_sheds.mako b/templates/webapps/galaxy/admin/tool_sheds.mako
index 54fe80bc347..68f3f116864 100644
--- a/templates/webapps/galaxy/admin/tool_sheds.mako
+++ b/templates/webapps/galaxy/admin/tool_sheds.mako
@@ -12,30 +12,22 @@
     ${render_msg( message, status )}
 %endif
 
-<div class="toolForm">
-    <div class="toolFormTitle">Accessible Galaxy tool sheds</div>
-    <div class="toolFormBody">
-        <div class="form-row">
-            <table class="grid">
-                <% shed_id = 0 %>
-                %for name, url in trans.app.tool_shed_registry.tool_sheds.items():
-                    <tr class="libraryTitle">
-                        <td>
-                            <div style="float: left; margin-left: 1px;" class="menubutton split popup" id="dataset-${shed_id}-popup">
-                                <a class="view-info" href="${h.url_for( controller='admin_toolshed', action='browse_tool_shed', tool_shed_url=url )}">${name|h}</a>
-                            </div>
-                            <div popupmenu="dataset-${shed_id}-popup">
-                                <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='browse_tool_shed', tool_shed_url=url )}">Browse valid repositories</a>
-                                <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='find_tools_in_tool_shed', tool_shed_url=url )}">Search for valid tools</a>
-                                <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='find_workflows_in_tool_shed', tool_shed_url=url )}">Search for workflows</a>
-                            </div>
-                        </td>
-                    </tr>
-                    <% shed_id += 1 %>
-                %endfor
-                </tr>
-            </table>
-        </div>
-        <div style="clear: both"></div>
+<div class="card">
+    <div class="card-header">Accessible Galaxy tool sheds</div>
+    <div class="card-body">
+        <% shed_id = 0 %>
+        %for name, url in trans.app.tool_shed_registry.tool_sheds.items():
+            <% margin_cls = "mt-2" if shed_id > 0 else "" %>
+            <div class="menubutton split popup ${margin_cls}" id="dataset-${shed_id}-popup">
+                <a class="view-info" href="${h.url_for( controller='admin_toolshed', action='browse_tool_shed', tool_shed_url=url )}">${name|h}</a>
+            </div>
+            <div popupmenu="dataset-${shed_id}-popup">
+                <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='browse_tool_shed', tool_shed_url=url )}">Browse valid repositories</a>
+                <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='find_tools_in_tool_shed', tool_shed_url=url )}">Search for valid tools</a>
+                <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='find_workflows_in_tool_shed', tool_shed_url=url )}">Search for workflows</a>
+            </div>
+            <br/>
+            <% shed_id += 1 %>
+        %endfor
     </div>
 </div>