diff --git a/rocky/rocky/templates/organizations/organization_list.html b/rocky/rocky/templates/organizations/organization_list.html
index 85f9d6fb302..80bd6e4a4b8 100644
--- a/rocky/rocky/templates/organizations/organization_list.html
+++ b/rocky/rocky/templates/organizations/organization_list.html
@@ -2,7 +2,6 @@
 
 {% load i18n %}
 {% load static %}
-{% load compress %}
 
 {% block content %}
     {% include "header.html" %}
@@ -25,7 +24,7 @@ <h1>{% translate "Organizations" %}</h1>
                                     <th>{% translate "Name" %}</th>
                                     <th>{% translate "Code" %}</th>
                                     <th>{% translate "Tags" %}</th>
-                                    <th>{% translate "Members" %}</th>
+                                    <th>{% translate "Settings" %}</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -41,7 +40,11 @@ <h1>{% translate "Organizations" %}</h1>
                                             {% include "organizations/organization_tags.html" %}
 
                                         </td>
-                                        <td>{{ organization.member_count }}</td>
+                                        <td>
+                                            <a href="{% url 'organization_settings' organization_code=organization.code %}">
+                                                <button class="icon ti-edit action-button">Settings</button>
+                                            </a>
+                                        </td>
                                     </tr>
                                 {% endfor %}
                             </tbody>
@@ -67,9 +70,3 @@ <h2>{% translate "Actions" %}</h2>
         </section>
     </main>
 {% endblock content %}
-{% block html_at_end_body %}
-    {{ block.super }}
-    {% compress js %}
-        <script src="{% static "js/checkboxToggler.js" %}" nonce="{{ request.csp_nonce }}"></script>
-    {% endcompress %}
-{% endblock html_at_end_body %}
diff --git a/rocky/rocky/templates/organizations/organization_settings.html b/rocky/rocky/templates/organizations/organization_settings.html
index 9f23d24d492..058495e8ad6 100644
--- a/rocky/rocky/templates/organizations/organization_settings.html
+++ b/rocky/rocky/templates/organizations/organization_settings.html
@@ -35,6 +35,7 @@ <h2>{% translate "Organization details" %}</h2>
                             <tr>
                                 <th>{% translate "Name" %}</th>
                                 <th>{% translate "Code" %}</th>
+                                <th>{% translate "Tags" %}</th>
                                 {% if perms.tools.change_organization %}
                                     <th>{% translate "Edit" %}</th>
                                 {% endif %}
@@ -44,6 +45,10 @@ <h2>{% translate "Organization details" %}</h2>
                             <tr>
                                 <td>{{ organization.name }}</td>
                                 <td>{{ organization.code }}</td>
+                                <td>
+                                    {% include "organizations/organization_tags.html" %}
+
+                                </td>
                                 {% if perms.tools.change_organization %}
                                     <td>
                                         {% spaceless %}