diff --git a/templates/tables/deleted-organisations.html.twig b/templates/tables/deleted-organisations.html.twig
index 9dc1256..5657bdd 100644
--- a/templates/tables/deleted-organisations.html.twig
+++ b/templates/tables/deleted-organisations.html.twig
@@ -1,5 +1,8 @@
 {% extends "tables/organisations.html.twig" %}
 
+{% use 'tables/partials/deleted-organisations/column-info.html.twig' %}
+{% use 'tables/partials/deleted-organisations/column-actions.html.twig' %}
+
 {% block table %}
     <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
         <thead>
@@ -17,43 +20,4 @@
     </table>
 {% endblock %}
 
-{% block table_cell_template_info %}
-<script id="{{table.id}}-column-info" type="text/x-handlebars-template">
-    {%- verbatim %}
-    <td data-text="{{row.name}}">
-        <strong>
-        <a href="{{site.uri.public}}/organisations/o/{{row.slug}}">{{row.name}}</a>
-        </strong>
-    </td>
-    {% endverbatim -%}
-</script>
-{% endblock %}
-
-{% block table_cell_template_actions %}
-<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
-    {%- verbatim %}
-    <td>
-        <div class="btn-group">
-            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
-                <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                <li>
-                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-restore">
-                    <i class="fas fa-trash-restore"></i> {% endverbatim %}{{translate("ORGANISATION.RESTORE_DELETED")}}{% verbatim %}
-                    </a>
-                </li>
-                <li>
-                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-permenentDelete">
-                    <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("ORGANISATION.PERMENENT_DELETE")}}{% verbatim %}
-                    </a>
-                </li>
-            </ul>
-        </div>
-    </td>
-    {% endverbatim -%}
-</script>
-{% endblock %}
-
 {% block table_cell_template_join %}{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/organisation-members.html.twig b/templates/tables/organisation-members.html.twig
index 37c5a1a..59f3248 100644
--- a/templates/tables/organisation-members.html.twig
+++ b/templates/tables/organisation-members.html.twig
@@ -1,4 +1,7 @@
-{% extends "@blockier-templates/tables/users.html.twig" %}
+{% extends "tables/users.html.twig" %}
+
+{% use 'tables/partials/organisation-members/column-status.html.twig' %}
+{% use 'tables/partials/organisation-members/column-actions.html.twig' %}
 
 {% block table %}
     <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
@@ -18,105 +21,4 @@
         <tbody>
         </tbody>
     </table>
-{% endblock %}
-
-
-{% block table_cell_template_status %}
-<script id="{{table.id}}-column-status" type="text/x-handlebars-template">
-    {%- verbatim %}
-    <td
-        {{#ifx row.membership_approved '==' 0 }}
-            data-text="pending"
-        {{ else }}
-            data-text="accepted"
-        {{/ifx }}
-    >
-        {{#ifx row.membership_approved '==' 0 }}
-            <span class="text-yellow">{% endverbatim %}{{translate("PENDING")}}{% verbatim %}</span>
-        {{ else }}
-            <span>{% endverbatim %}{{translate("ACCEPTED")}}{% verbatim %}</span>
-            {{#ifx row.organisation_admin '==' 1 }}<span class="text-secondary">({% endverbatim %}{{translate("ADMIN")}}{% verbatim %})</span>{{/ifx}}
-        {{/ifx }}
-    </td>
-    {% endverbatim -%}
-</script>
-{% endblock %}
-
-{% block table_cell_template_actions %}
-{% if checkAccess('update_organisation_field', { 'organisation': organisation, 'fields': [ 'members' ] }) or isOrganisationAdmin(organisation) %}
-<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
-    {%- verbatim %}
-    <td class="uf-table-fit-width">
-        <div class="btn-group">
-            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
-            <ul class="dropdown-menu dropdown-menu-right-responsive" role="menu">
-                {{#ifx row.membership_approved '!=' 1 }}
-                <li>
-                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-accept">
-                    <i class="fas fa-thumbs-up"></i> {% endverbatim %}{{translate("ORGANISATION.JOIN_REQUEST.ACCEPT")}}{% verbatim %}
-                    </a>
-                </li>
-                <li>
-                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-reject">
-                    <i class="fas fa-thumbs-down"></i> {% endverbatim %}{{translate("ORGANISATION.JOIN_REQUEST.REJECT")}}{% verbatim %}
-                    </a>
-                </li>
-                {{ else }}
-                {{#ifx row.organisation_admin '==' 1 }}
-                <li>
-                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-demote">
-                    <i class="fas fa-angle-double-down"></i> {% endverbatim %}{{translate("MEMBER.DEMOTE")}}{% verbatim %}
-                    </a>
-                </li>
-                {{ else }}
-                <li>
-                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-promote">
-                    <i class="fas fa-angle-double-up"></i> {% endverbatim %}{{translate("MEMBER.PROMOTE")}}{% verbatim %}
-                    </a>
-                </li>
-                {{/ifx}}
-                <li>
-                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-user-edit">
-                    <i class="fas fa-edit"></i> {% endverbatim %}{{translate("MEMBER.EDIT")}}{% verbatim %}
-                    </a>
-                </li>
-                <li>
-                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-user-password">
-                    <i class="fas fa-key"></i> {% endverbatim %}{{translate("MEMBER.CHANGE_PASSWORD")}}{% verbatim %}
-                    </a>
-                </li>
-                <li>
-                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-remove">
-                    <i class="fas fa-door-open"></i> {% endverbatim %}{{translate("MEMBER.REMOVE")}}{% verbatim %}
-                    </a>
-                </li>
-                {{/ifx}}
-            </ul>
-        </div>
-    </td>
-    {% endverbatim -%}
-</script>
-{% endif %}
-{% endblock %}
-
-{% block table_cell_template_extra %}
-    {% block table_cell_template_organisations %}
-    <script id="{{table.id}}-column-organisations" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td style="line-height: 2em;">
-        {{#if row.organisations.length }}
-            {{#each row.organisations }}
-                <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}}" title="{{this.description}}" data-text="{{this.name}}" style="font-size: 100%;">{{this.name}}</a><br>
-            {{/each}}
-        {{/if }}
-        {{#if row.pending_organisations.length }}
-            {{#each row.pending_organisations }}
-                <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}} membership-pending" title="{{this.description}}" data-text="{{this.name}}" style="font-size: 100%;">{{this.name}}</a><br>
-            {{/each}}
-        {{/if }}
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endblock %}
-{% endblock %}
-
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/organisations.html.twig b/templates/tables/organisations.html.twig
index 505e848..70e501e 100644
--- a/templates/tables/organisations.html.twig
+++ b/templates/tables/organisations.html.twig
@@ -7,6 +7,14 @@
 
 {% extends "tables/table-paginated.html.twig" %}
 
+{% use 'tables/partials/organisations/column-info.html.twig' %}
+{% use 'tables/partials/organisations/column-description.html.twig' %}
+{% use 'tables/partials/organisations/column-status.html.twig' %}
+{% use 'tables/partials/organisations/column-member_count.html.twig' %}
+{% use 'tables/partials/organisations/column-admin_count.html.twig' %}
+{% use 'tables/partials/organisations/column-join.html.twig' %}
+{% use 'tables/partials/organisations/column-actions.html.twig' %}
+
 {% block table %}
     <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
         <thead>
@@ -17,8 +25,8 @@
                 <th class="filter-select filter-metatext" data-column-name="status" data-column-template="#{{table.id}}-column-status" data-priority="2">{{translate("STATUS")}} <i class="fas fa-sort"></i></th>
                 {% endif -%}
                 {% if checkAccess('view_organisation_members') -%}
-                <th class="sorter-metanum" data-column-name="member_count" data-column-template="#{{table.id}}-column-memberCount" data-priority="2" style="min-width: 180px">{{translate("ORGANISATION.MEMBER_COUNT")}} <i class="fas fa-sort"></i></th>
-                <th class="sorter-metanum" data-column-name="admin_count" data-column-template="#{{table.id}}-column-adminCount" data-priority="2">{{translate("ORGANISATION.ADMIN_COUNT")}} <i class="fas fa-sort"></i></th>
+                <th class="sorter-metanum" data-column-name="member_count" data-column-template="#{{table.id}}-column-member_count" data-priority="2" style="min-width: 180px">{{translate("ORGANISATION.MEMBER_COUNT")}} <i class="fas fa-sort"></i></th>
+                <th class="sorter-metanum" data-column-name="admin_count" data-column-template="#{{table.id}}-column-admin_count" data-priority="2">{{translate("ORGANISATION.ADMIN_COUNT")}} <i class="fas fa-sort"></i></th>
                 {% endif -%}
                 <th data-column-template="#{{table.id}}-column-join" data-column-name="join" data-sorter="false" data-filter="false" data-priority="3">{{translate("JOIN")}}/{{translate("LEAVE")}}</th>
                 {% if hasRole('site-admin') or hasRole('organisations-admin') or (current_user.adminForOrganisations.count > 0) -%}
@@ -32,201 +40,13 @@
 {% endblock %}
 
 {% block table_cell_templates %}
-
-    {% block table_cell_template_info %}
-    <script id="{{table.id}}-column-info" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td data-text="{{row.name}}">
-            <strong>
-            {{#ifx row.is_member '==' 1 }}
-            <a href="{{site.uri.public}}/organisations/o/{{row.slug}}">{{row.name}}</a>
-            {{ else }}
-            {% endverbatim %}{% if hasRole('organisations-admin') or hasRole('site-admin') %}{% verbatim %}
-            <a href="{{site.uri.public}}/organisations/o/{{row.slug}}">{{row.name}}</a>
-            {% endverbatim %}{% else %}{% verbatim %}
-            {{row.name}}
-            {% endverbatim %}{% endif %}{% verbatim %}
-            {{/ifx }}
-            </strong>
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endblock %}
-
-    {% block table_cell_template_description %}
-    <script id="{{table.id}}-column-description" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td>
-            {{row.description}}
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endblock %}
-
-    {% block table_cell_template_status %}
-    {%- if hasRole('site-admin') or hasRole('organisations-admin') or (current_user.adminForOrganisations.count > 0) %}
-    <script id="{{table.id}}-column-status" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td
-            {{#ifx row.flag_approved '==' 1 }}
-                data-text="approved"
-            {{ else }}
-                data-text="pending"
-            {{/ifx }}
-        >
-            {{#ifx row.flag_approved '==' 1 }}
-                <span>
-                    {% endverbatim %}{{translate("APPROVED")}}{% verbatim %}
-                </span>
-            {{ else }}
-                <span class="text-yellow">
-                    {% endverbatim %}{{translate("PENDING")}}{% verbatim %}
-                </span>
-            {{/ifx }}
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endif -%}
-    {% endblock %}
-
-    {% block table_cell_template_memberCount %}
-    {%- if checkAccess('view_organisation_members') -%}
-    <script id="{{table.id}}-column-memberCount" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td>
-            {{row.member_count}}
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endif -%}
-    {% endblock %}
-
-    {% block table_cell_template_adminCount %}
-    {%- if checkAccess('view_organisation_members') -%}
-    <script id="{{table.id}}-column-adminCount" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td>
-            {{row.admin_count}}
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endif -%}
-    {% endblock %}
-
-    {% block table_cell_template_join %}
-    <script id="{{table.id}}-column-join" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td>
-            <div class="btn-group">
-                {{#ifx row.is_pending '==' 1 }}
-                    <button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-cancelJoin" style="min-width: 70px">
-                        {% endverbatim %}{{translate("CANCEL")}}{% verbatim %}
-                    </button>
-                {{ else }}
-                    {{#ifx row.is_member '==' 1 }}
-                        <button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-leave" style="min-width: 70px">
-                            {% endverbatim %}{{translate("LEAVE")}}{% verbatim %}
-                        </button>
-                    {{ else }}
-                        {% endverbatim %}{% if (organisationConfig.membership.single_membership == 0) or ((current_user.organisations.count == 0) and (current_user.pendingOrganisations.count == 0)) %}{% verbatim %}
-                        <button type="button" data-slug="{{row.slug}}" class="btn btn-success js-organisation-join" style="min-width: 70px">
-                            {% endverbatim %}{{translate("JOIN")}}{% verbatim %}
-                        </button>
-                        {% endverbatim %}{% endif %}{% verbatim %}
-                    {{/ifx}}
-                {{/ifx}}
-            </div>
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endblock %}
-
-    {% block table_cell_template_actions %}
-    {%- if hasRole('site-admin') or hasRole('organisations-admin') %}
-    <script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td>
-            <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                    {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
-                    <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                    {% endverbatim %}{% if checkAccess('update_organisation_field') %}{% verbatim %}
-                    <li>
-                        <a href="#" data-slug="{{row.slug}}" class="js-organisation-edit">
-                        <i class="fas fa-edit"></i> {% endverbatim %}{{translate("ORGANISATION.EDIT")}}{% verbatim %}
-                        </a>
-                    </li>
-                    {% endverbatim %}{% endif %}{% verbatim %}
-                    {% endverbatim %}{% if checkAccess('merge_organisations') %}{% verbatim %}
-                    <li>
-                        <a href="#" data-slug="{{row.slug}}" class="js-organisation-merge">
-                        <i class="fas fa-object-group"></i> {% endverbatim %}{{translate("ORGANISATION.MERGE")}}{% verbatim %}
-                        </a>
-                    </li>
-                    {% endverbatim %}{% endif %}{% verbatim %}
-                    {% endverbatim %}{% if checkAccess('approve_organisation') %}{% verbatim %}
-                    {{#ifx row.flag_approved '==' 0 }}
-                    <li>
-                        <a href="#" data-slug="{{row.slug}}" class="js-organisation-approveRegistration">
-                        <i class="fas fa-thumbs-up"></i> {% endverbatim %}{{translate("ORGANISATION.REGISTRATION.APPROVE")}}{% verbatim %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" data-slug="{{row.slug}}" class="js-organisation-denyRegistration">
-                        <i class="fas fa-thumbs-down"></i> {% endverbatim %}{{translate("ORGANISATION.REGISTRATION.DENY")}}{% verbatim %}
-                        </a>
-                    </li>
-                    {{/ifx }}
-                    {% endverbatim %}{% endif %}{% verbatim %}
-                    {% endverbatim %}{% if checkAccess('delete_organisation') %}{% verbatim %}
-                    {{#ifx row.flag_approved '==' 1 }}
-                    <li>
-                        <a href="#" data-slug="{{row.slug}}" class="js-organisation-delete">
-                        <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("ORGANISATION.DELETE")}}{% verbatim %}
-                        </a>
-                    </li>
-                    {{/ifx }}
-                    {% endverbatim %}{% endif %}{% verbatim %}
-                </ul>
-            </div>
-        </td>
-        {% endverbatim -%}
-    </script>
-   {%- elseif (current_user.adminForOrganisations.count > 0) -%}
-    <script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td>
-            {{#ifx row.is_admin '==' 1 }}
-            <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                    {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
-                    <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                    <li>
-                        <a href="#" data-slug="{{row.slug}}" class="js-organisation-edit">
-                        <i class="fas fa-edit"></i> {% endverbatim %}{{translate("ORGANISATION.EDIT")}}{% verbatim %}
-                        </a>
-                    </li>
-                    {{#ifx row.flag_approved '==' 0 }}
-                    {{#ifx row.registrant_id '==' {% endverbatim %}{{current_user.id}}{% verbatim %} }}
-                    <li>
-                        <a href="#" data-slug="{{row.slug}}" class="js-organisation-cancelRegistration">
-                        <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("ORGANISATION.REGISTRATION.CANCEL")}}{% verbatim %}
-                        </a>
-                    </li>
-                    {{/ifx}}
-                    {{/ifx}}
-                </ul>
-            </div>
-            {{/ifx }}
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endif -%}
-    {% endblock %}
-
-    {% block table_cell_template_extra %}{% endblock %}
+    {{ block('table_cell_template_info') }}
+    {{ block('table_cell_template_description') }}
+    {{ block('table_cell_template_status') }}
+    {{ block('table_cell_template_member_count') }}
+    {{ block('table_cell_template_admin_count') }}
+    {{ block('table_cell_template_join') }}
+    {{ block('table_cell_template_actions') }}
 {% endblock %}
+
+
diff --git a/templates/tables/partials/deleted-organisations/column-actions.html.twig b/templates/tables/partials/deleted-organisations/column-actions.html.twig
new file mode 100644
index 0000000..7398f17
--- /dev/null
+++ b/templates/tables/partials/deleted-organisations/column-actions.html.twig
@@ -0,0 +1,26 @@
+{% block table_cell_template_actions %}
+<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td>
+        <div class="btn-group">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-restore">
+                    <i class="fas fa-trash-restore"></i> {% endverbatim %}{{translate("ORGANISATION.RESTORE_DELETED")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-permenentDelete">
+                    <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("ORGANISATION.PERMENENT_DELETE")}}{% verbatim %}
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </td>
+    {% endverbatim -%}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/deleted-organisations/column-info.html.twig b/templates/tables/partials/deleted-organisations/column-info.html.twig
new file mode 100644
index 0000000..b1ae03d
--- /dev/null
+++ b/templates/tables/partials/deleted-organisations/column-info.html.twig
@@ -0,0 +1,11 @@
+{% block table_cell_template_info %}
+<script id="{{table.id}}-column-info" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td data-text="{{row.name}}">
+        <strong>
+        <a href="{{site.uri.public}}/organisations/o/{{row.slug}}">{{row.name}}</a>
+        </strong>
+    </td>
+    {% endverbatim -%}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisation-members/column-actions.html.twig b/templates/tables/partials/organisation-members/column-actions.html.twig
new file mode 100644
index 0000000..5338156
--- /dev/null
+++ b/templates/tables/partials/organisation-members/column-actions.html.twig
@@ -0,0 +1,56 @@
+{% block table_cell_template_actions %}
+{% if checkAccess('update_organisation_field', { 'organisation': organisation, 'fields': [ 'members' ] }) or isOrganisationAdmin(organisation) %}
+<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td class="uf-table-fit-width">
+        <div class="btn-group">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
+            <ul class="dropdown-menu dropdown-menu-right-responsive" role="menu">
+                {{#ifx row.membership_approved '!=' 1 }}
+                <li>
+                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-accept">
+                    <i class="fas fa-thumbs-up"></i> {% endverbatim %}{{translate("ORGANISATION.JOIN_REQUEST.ACCEPT")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-reject">
+                    <i class="fas fa-thumbs-down"></i> {% endverbatim %}{{translate("ORGANISATION.JOIN_REQUEST.REJECT")}}{% verbatim %}
+                    </a>
+                </li>
+                {{ else }}
+                {{#ifx row.organisation_admin '==' 1 }}
+                <li>
+                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-demote">
+                    <i class="fas fa-angle-double-down"></i> {% endverbatim %}{{translate("MEMBER.DEMOTE")}}{% verbatim %}
+                    </a>
+                </li>
+                {{ else }}
+                <li>
+                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-promote">
+                    <i class="fas fa-angle-double-up"></i> {% endverbatim %}{{translate("MEMBER.PROMOTE")}}{% verbatim %}
+                    </a>
+                </li>
+                {{/ifx}}
+                <li>
+                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-user-edit">
+                    <i class="fas fa-edit"></i> {% endverbatim %}{{translate("MEMBER.EDIT")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-user-password">
+                    <i class="fas fa-key"></i> {% endverbatim %}{{translate("MEMBER.CHANGE_PASSWORD")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-remove">
+                    <i class="fas fa-door-open"></i> {% endverbatim %}{{translate("MEMBER.REMOVE")}}{% verbatim %}
+                    </a>
+                </li>
+                {{/ifx}}
+            </ul>
+        </div>
+    </td>
+    {% endverbatim -%}
+</script>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisation-members/column-status.html.twig b/templates/tables/partials/organisation-members/column-status.html.twig
new file mode 100644
index 0000000..f81009b
--- /dev/null
+++ b/templates/tables/partials/organisation-members/column-status.html.twig
@@ -0,0 +1,20 @@
+{% block table_cell_template_status %}
+<script id="{{table.id}}-column-status" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td
+        {{#ifx row.membership_approved '==' 0 }}
+            data-text="pending"
+        {{ else }}
+            data-text="accepted"
+        {{/ifx }}
+    >
+        {{#ifx row.membership_approved '==' 0 }}
+            <span class="text-yellow">{% endverbatim %}{{translate("PENDING")}}{% verbatim %}</span>
+        {{ else }}
+            <span>{% endverbatim %}{{translate("ACCEPTED")}}{% verbatim %}</span>
+            {{#ifx row.organisation_admin '==' 1 }}<span class="text-secondary">({% endverbatim %}{{translate("ADMIN")}}{% verbatim %})</span>{{/ifx}}
+        {{/ifx }}
+    </td>
+    {% endverbatim -%}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisations/column-actions.html.twig b/templates/tables/partials/organisations/column-actions.html.twig
new file mode 100644
index 0000000..4da90ba
--- /dev/null
+++ b/templates/tables/partials/organisations/column-actions.html.twig
@@ -0,0 +1,86 @@
+{% block table_cell_template_actions %}
+{%- if hasRole('site-admin') or hasRole('organisations-admin') %}
+<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td>
+        <div class="btn-group">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                {% endverbatim %}{% if checkAccess('update_organisation_field') %}{% verbatim %}
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-edit">
+                    <i class="fas fa-edit"></i> {% endverbatim %}{{translate("ORGANISATION.EDIT")}}{% verbatim %}
+                    </a>
+                </li>
+                {% endverbatim %}{% endif %}{% verbatim %}
+                {% endverbatim %}{% if checkAccess('merge_organisations') %}{% verbatim %}
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-merge">
+                    <i class="fas fa-object-group"></i> {% endverbatim %}{{translate("ORGANISATION.MERGE")}}{% verbatim %}
+                    </a>
+                </li>
+                {% endverbatim %}{% endif %}{% verbatim %}
+                {% endverbatim %}{% if checkAccess('approve_organisation') %}{% verbatim %}
+                {{#ifx row.flag_approved '==' 0 }}
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-approveRegistration">
+                    <i class="fas fa-thumbs-up"></i> {% endverbatim %}{{translate("ORGANISATION.REGISTRATION.APPROVE")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-denyRegistration">
+                    <i class="fas fa-thumbs-down"></i> {% endverbatim %}{{translate("ORGANISATION.REGISTRATION.DENY")}}{% verbatim %}
+                    </a>
+                </li>
+                {{/ifx }}
+                {% endverbatim %}{% endif %}{% verbatim %}
+                {% endverbatim %}{% if checkAccess('delete_organisation') %}{% verbatim %}
+                {{#ifx row.flag_approved '==' 1 }}
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-delete">
+                    <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("ORGANISATION.DELETE")}}{% verbatim %}
+                    </a>
+                </li>
+                {{/ifx }}
+                {% endverbatim %}{% endif %}{% verbatim %}
+            </ul>
+        </div>
+    </td>
+    {% endverbatim -%}
+</script>
+{%- elseif (current_user.adminForOrganisations.count > 0) -%}
+<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td>
+        {{#ifx row.is_admin '==' 1 }}
+        <div class="btn-group">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-edit">
+                    <i class="fas fa-edit"></i> {% endverbatim %}{{translate("ORGANISATION.EDIT")}}{% verbatim %}
+                    </a>
+                </li>
+                {{#ifx row.flag_approved '==' 0 }}
+                {{#ifx row.registrant_id '==' {% endverbatim %}{{current_user.id}}{% verbatim %} }}
+                <li>
+                    <a href="#" data-slug="{{row.slug}}" class="js-organisation-cancelRegistration">
+                    <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("ORGANISATION.REGISTRATION.CANCEL")}}{% verbatim %}
+                    </a>
+                </li>
+                {{/ifx}}
+                {{/ifx}}
+            </ul>
+        </div>
+        {{/ifx }}
+    </td>
+    {% endverbatim -%}
+</script>
+{% endif -%}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisations/column-admin_count.html.twig b/templates/tables/partials/organisations/column-admin_count.html.twig
new file mode 100644
index 0000000..165899c
--- /dev/null
+++ b/templates/tables/partials/organisations/column-admin_count.html.twig
@@ -0,0 +1,11 @@
+{% block table_cell_template_admin_count %}
+{%- if checkAccess('view_organisation_members') -%}
+<script id="{{table.id}}-column-adminCount" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td>
+        {{row.admin_count}}
+    </td>
+    {% endverbatim -%}
+</script>
+{% endif -%}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisations/column-description.html.twig b/templates/tables/partials/organisations/column-description.html.twig
new file mode 100644
index 0000000..6f93bd9
--- /dev/null
+++ b/templates/tables/partials/organisations/column-description.html.twig
@@ -0,0 +1,9 @@
+{% block table_cell_template_description %}
+<script id="{{table.id}}-column-description" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td>
+        {{row.description}}
+    </td>
+    {% endverbatim -%}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisations/column-info.html.twig b/templates/tables/partials/organisations/column-info.html.twig
new file mode 100644
index 0000000..c03499a
--- /dev/null
+++ b/templates/tables/partials/organisations/column-info.html.twig
@@ -0,0 +1,19 @@
+{% block table_cell_template_info %}
+<script id="{{table.id}}-column-info" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td data-text="{{row.name}}">
+        <strong>
+        {{#ifx row.is_member '==' 1 }}
+        <a href="{{site.uri.public}}/organisations/o/{{row.slug}}">{{row.name}}</a>
+        {{ else }}
+        {% endverbatim %}{% if hasRole('organisations-admin') or hasRole('site-admin') %}{% verbatim %}
+        <a href="{{site.uri.public}}/organisations/o/{{row.slug}}">{{row.name}}</a>
+        {% endverbatim %}{% else %}{% verbatim %}
+        {{row.name}}
+        {% endverbatim %}{% endif %}{% verbatim %}
+        {{/ifx }}
+        </strong>
+    </td>
+    {% endverbatim -%}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisations/column-join.html.twig b/templates/tables/partials/organisations/column-join.html.twig
new file mode 100644
index 0000000..535369f
--- /dev/null
+++ b/templates/tables/partials/organisations/column-join.html.twig
@@ -0,0 +1,27 @@
+{% block table_cell_template_join %}
+<script id="{{table.id}}-column-join" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td>
+        <div class="btn-group">
+            {{#ifx row.is_pending '==' 1 }}
+                <button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-cancelJoin" style="min-width: 70px">
+                    {% endverbatim %}{{translate("CANCEL")}}{% verbatim %}
+                </button>
+            {{ else }}
+                {{#ifx row.is_member '==' 1 }}
+                    <button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-leave" style="min-width: 70px">
+                        {% endverbatim %}{{translate("LEAVE")}}{% verbatim %}
+                    </button>
+                {{ else }}
+                    {% endverbatim %}{% if (organisationConfig.membership.single_membership == 0) or ((current_user.organisations.count == 0) and (current_user.pendingOrganisations.count == 0)) %}{% verbatim %}
+                    <button type="button" data-slug="{{row.slug}}" class="btn btn-success js-organisation-join" style="min-width: 70px">
+                        {% endverbatim %}{{translate("JOIN")}}{% verbatim %}
+                    </button>
+                    {% endverbatim %}{% endif %}{% verbatim %}
+                {{/ifx}}
+            {{/ifx}}
+        </div>
+    </td>
+    {% endverbatim -%}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisations/column-member_count.html.twig b/templates/tables/partials/organisations/column-member_count.html.twig
new file mode 100644
index 0000000..0422aa7
--- /dev/null
+++ b/templates/tables/partials/organisations/column-member_count.html.twig
@@ -0,0 +1,11 @@
+{% block table_cell_template_member_count %}
+{%- if checkAccess('view_organisation_members') -%}
+<script id="{{table.id}}-column-memberCount" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td>
+        {{row.member_count}}
+    </td>
+    {% endverbatim -%}
+</script>
+{% endif -%}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/organisations/column-status.html.twig b/templates/tables/partials/organisations/column-status.html.twig
new file mode 100644
index 0000000..0521dca
--- /dev/null
+++ b/templates/tables/partials/organisations/column-status.html.twig
@@ -0,0 +1,25 @@
+{% block table_cell_template_status %}
+{%- if hasRole('site-admin') or hasRole('organisations-admin') or (current_user.adminForOrganisations.count > 0) %}
+<script id="{{table.id}}-column-status" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td
+        {{#ifx row.flag_approved '==' 1 }}
+            data-text="approved"
+        {{ else }}
+            data-text="pending"
+        {{/ifx }}
+    >
+        {{#ifx row.flag_approved '==' 1 }}
+            <span>
+                {% endverbatim %}{{translate("APPROVED")}}{% verbatim %}
+            </span>
+        {{ else }}
+            <span class="text-yellow">
+                {% endverbatim %}{{translate("PENDING")}}{% verbatim %}
+            </span>
+        {{/ifx }}
+    </td>
+    {% endverbatim -%}
+</script>
+{% endif -%}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/users/column-actions.html.twig b/templates/tables/partials/users/column-actions.html.twig
new file mode 100644
index 0000000..180cb7a
--- /dev/null
+++ b/templates/tables/partials/users/column-actions.html.twig
@@ -0,0 +1,56 @@
+{% block table_cell_template_actions %}
+<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td class="uf-table-fit-width">
+        <div class="btn-group">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
+            <ul class="dropdown-menu dropdown-menu-right-responsive" role="menu">
+                {{#ifx row.flag_verified '==' 0 }}
+                <li>
+                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-activate">
+                    <i class="fas fa-bolt"></i> {% endverbatim %}{{translate("USER.ACTIVATE")}}{% verbatim %}
+                    </a>
+                </li>
+                {{/ifx }}
+                <li>
+                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-edit">
+                    <i class="fas fa-edit"></i> {% endverbatim %}{{translate("USER.EDIT")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-roles">
+                    <i class="fas fa-id-card"></i> {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-organisations">
+                    <i class="fas fa-sitemap"></i> {% endverbatim %}{{translate("ORGANISATION.MANAGE")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-password">
+                    <i class="fas fa-key"></i> {% endverbatim %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% verbatim %}
+                    </a>
+                </li>
+                <li>
+                {{#ifx row.flag_enabled '==' 1 }}
+                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-disable">
+                    <i class="fas fa-minus-circle"></i> {% endverbatim %}{{translate("USER.DISABLE")}}{% verbatim %}
+                    </a>
+                {{ else }}
+                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-enable">
+                    <i class="fas fa-plus-circle"></i> {% endverbatim %}{{translate("USER.ENABLE")}}{% verbatim %}
+                    </a>
+                {{/ifx }}
+                </li>
+                <li>
+                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-delete">
+                    <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("USER.DELETE")}}{% verbatim %}
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </td>
+    {% endverbatim -%}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/partials/users/column-organisations.html.twig b/templates/tables/partials/users/column-organisations.html.twig
new file mode 100644
index 0000000..f6f63d8
--- /dev/null
+++ b/templates/tables/partials/users/column-organisations.html.twig
@@ -0,0 +1,18 @@
+{% block table_cell_template_organisations %}
+<script id="{{table.id}}-column-organisations" type="text/x-handlebars-template">
+    {%- verbatim %}
+    <td style="line-height: 2em;">
+    {{#if row.organisations.length }}
+        {{#each row.organisations }}
+            <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}}" title="{{this.description}}" data-text="{{this.name}}" style="font-size: 100%;">{{this.name}}</a><br>
+        {{/each}}
+    {{/if }}
+    {{#if row.pending_organisations.length }}
+        {{#each row.pending_organisations }}
+            <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}} membership-pending" title="{{this.description}}" data-text="{{this.name}}" style="font-size: 100%;">{{this.name}}</a><br>
+        {{/each}}
+    {{/if }}
+    </td>
+    {% endverbatim -%}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tables/users.html.twig b/templates/tables/users.html.twig
index e1305f7..5854c8d 100644
--- a/templates/tables/users.html.twig
+++ b/templates/tables/users.html.twig
@@ -21,82 +21,8 @@
     </table>
 {% endblock %}
 
-
-{% block table_cell_template_actions %}
-<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
-    {%- verbatim %}
-    <td class="uf-table-fit-width">
-        <div class="btn-group">
-            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
-            <ul class="dropdown-menu dropdown-menu-right-responsive" role="menu">
-                {{#ifx row.flag_verified '==' 0 }}
-                <li>
-                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-activate">
-                    <i class="fas fa-bolt"></i> {% endverbatim %}{{translate("USER.ACTIVATE")}}{% verbatim %}
-                    </a>
-                </li>
-                {{/ifx }}
-                <li>
-                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-edit">
-                    <i class="fas fa-edit"></i> {% endverbatim %}{{translate("USER.EDIT")}}{% verbatim %}
-                    </a>
-                </li>
-                <li>
-                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-roles">
-                    <i class="fas fa-id-card"></i> {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %}
-                    </a>
-                </li>
-                <li>
-                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-organisations">
-                    <i class="fas fa-sitemap"></i> {% endverbatim %}{{translate("ORGANISATION.MANAGE")}}{% verbatim %}
-                    </a>
-                </li>
-                <li>
-                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-password">
-                    <i class="fas fa-key"></i> {% endverbatim %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% verbatim %}
-                    </a>
-                </li>
-                <li>
-                {{#ifx row.flag_enabled '==' 1 }}
-                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-disable">
-                    <i class="fas fa-minus-circle"></i> {% endverbatim %}{{translate("USER.DISABLE")}}{% verbatim %}
-                    </a>
-                {{ else }}
-                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-enable">
-                    <i class="fas fa-plus-circle"></i> {% endverbatim %}{{translate("USER.ENABLE")}}{% verbatim %}
-                    </a>
-                {{/ifx }}
-                </li>
-                <li>
-                    <a href="#" data-user_name="{{row.user_name}}" class="js-user-delete">
-                    <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("USER.DELETE")}}{% verbatim %}
-                    </a>
-                </li>
-            </ul>
-        </div>
-    </td>
-    {% endverbatim -%}
-</script>
-{% endblock %}
-
-{% block table_cell_template_extra %}
-    {% block table_cell_template_organisations %}
-    <script id="{{table.id}}-column-organisations" type="text/x-handlebars-template">
-        {%- verbatim %}
-        <td style="line-height: 2em;">
-        {{#if row.organisations.length }}
-            {{#each row.organisations }}
-                <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}}" title="{{this.description}}" data-text="{{this.name}}" style="font-size: 100%;">{{this.name}}</a><br>
-            {{/each}}
-        {{/if }}
-        {{#if row.pending_organisations.length }}
-            {{#each row.pending_organisations }}
-                <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}} membership-pending" title="{{this.description}}" data-text="{{this.name}}" style="font-size: 100%;">{{this.name}}</a><br>
-            {{/each}}
-        {{/if }}
-        </td>
-        {% endverbatim -%}
-    </script>
-    {% endblock %}
+{% block table_cell_templates %}
+    {{ parent() }}
+    {{ block('table_cell_template_organisations', 'tables/partials/users/column-organisations.html.twig') }}
 {% endblock %}