diff --git a/templates/forms/inputs/organisation-description.html.twig b/templates/forms/inputs/organisation-description.html.twig
new file mode 100644
index 0000000..9042c56
--- /dev/null
+++ b/templates/forms/inputs/organisation-description.html.twig
@@ -0,0 +1,7 @@
+{% include "@uf-tweaks/forms/inputs/abstract/description.html.twig" with
+    {
+        "type" : "organisation",
+        "current_value" : organisation.description,
+        "col_width" : col_width
+    }
+%}
\ No newline at end of file
diff --git a/templates/forms/inputs/organisation-name.html.twig b/templates/forms/inputs/organisation-name.html.twig
new file mode 100644
index 0000000..2579cb7
--- /dev/null
+++ b/templates/forms/inputs/organisation-name.html.twig
@@ -0,0 +1,8 @@
+{% include "@uf-tweaks/forms/inputs/abstract/name.html.twig" with
+    {
+        "type" : "organisation",
+        "current_value" : organisation.name,
+        "field_name" : translate('ORGANISATION.NAME'),
+        "col_width" : col_width
+    }
+%}
\ No newline at end of file
diff --git a/templates/forms/inputs/organisation-slug.html.twig b/templates/forms/inputs/organisation-slug.html.twig
new file mode 100644
index 0000000..17e869e
--- /dev/null
+++ b/templates/forms/inputs/organisation-slug.html.twig
@@ -0,0 +1,7 @@
+{% include "@uf-tweaks/forms/inputs/abstract/slug.html.twig" with
+    {
+        "type" : "organisation",
+        "current_value" : organisation.slug,
+        "col_width" : col_width
+    }
+%}
\ No newline at end of file
diff --git a/templates/forms/organisation.html.twig b/templates/forms/organisation.html.twig
index 9a9cef2..38a274d 100644
--- a/templates/forms/organisation.html.twig
+++ b/templates/forms/organisation.html.twig
@@ -4,64 +4,26 @@
     </div>
     <div class="row">
         {% block organisation_form %}
-            {% block organisation_field_name %}
-            {% if 'name' not in form.fields.hidden %}
-            <div class="col-sm-12">
-                <div class="form-group">
-                    <label>{{translate("ORGANISATION.NAME")}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
-                        <input type="text" class="form-control" name="name" autocomplete="off" value="{{organisation.name}}" placeholder="{{translate("ORGANISATION.NAME.EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
-                    </div>
-                </div>
-            </div>
-            {% endif %}
+            {% block input_organisation_name %}
+                {% include "forms/inputs/organisation-name.html.twig" with { 'col_width': 'col-sm-12' } %}
             {% endblock %}
 
-            {% block organisation_field_slug %}
-            {% if 'slug' not in form.fields.hidden %}
-            <div class="col-sm-12">
-                <div class="form-group">
-                    <label>{{translate("SLUG")}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-tag fa-fw"></i></span>
-                        <input type="text" class="form-control" name="slug" autocomplete="off" value="{{organisation.slug}}" placeholder="{{translate("SLUG")}}" {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly>
-                        {% if 'slug' not in form.fields.disabled %}
-                            <span class="input-group-btn" data-toggle="buttons">
-                                <label class="btn btn-primary">
-                                    <input type="checkbox" id="form-organisation-slug-override" autocomplete="off"> {{translate("OVERRIDE")}}
-                                </label>
-                            </span>
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-            {% else %}
-            <input type="hidden" name="slug" autocomplete="off" value="{{organisation.slug}}">
-            {% endif %}
+            {% block input_organisation_slug %}
+                {% include "forms/inputs/organisation-slug.html.twig" with { 'col_width': 'col-sm-12' } %}
             {% endblock %}
 
-            {% block organisation_field_description %}
-            {% if 'description' not in form.fields.hidden %}
-            <div class="col-sm-12">
-                <div class="form-group">
-                    <label for="input_description">{{translate("DESCRIPTION")}}</label>
-                    <textarea id="input_description" class="form-control" type="text" name="description" {% if 'description' in form.fields.disabled %}disabled{% endif %} rows=6>{{organisation.description}}</textarea>
-                </div>
-            </div>
-            {% endif %}
+            {% block input_organisation_description %}
+                {% include "forms/inputs/organisation-description.html.twig" with { 'col_width': 'col-sm-12' } %}
             {% endblock %}
         {% endblock %}
     </div><br>
     <div class="row">
-        {% block organisation_form_buttons %}
         <div class="col-xs-6 col-sm-4">
             <button type="submit" class="btn btn-block btn-lg btn-success">{{form.submit_text}}</button>
         </div>
         <div class="col-xs-4 col-sm-3 pull-right">
             <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate("CANCEL")}}</button>
         </div>
-        {% endblock %}
     </div>
 </form>
 <!-- Include validation rules -->
diff --git a/templates/navigation/partials/sidebar-organisations.html.twig b/templates/navigation/partials/sidebar-organisations.html.twig
new file mode 100644
index 0000000..6cf5216
--- /dev/null
+++ b/templates/navigation/partials/sidebar-organisations.html.twig
@@ -0,0 +1,28 @@
+{% if checkAccess('uri_organisations') %}
+    <li>
+        <a href="{{site.uri.public}}/organisations"><i class="fas fa-sitemap fa-fw"></i> <span>{{ translate("ORGANISATION", 2) }}</span></a>
+    </li>
+{% endif %}
+{% if current_user.organisations.count() > 0 %}
+    {% if organisationConfig.membership.single_membership == false %}
+        <li>
+            <a href="#" data-toggle="collapse" data-target="#submenu-organisations" aria-expanded="false"><i class="fa fa-fw fa-sitemap"></i> <span>{{ translate("ORGANISATION.SELF") }}</span> <i class="fa fa-fw pull-right fa-angle-down"></i></a>
+            <ul id="submenu-organisations" class="collapsable collapse" aria-expanded="false" style="height: 1px;">
+            {% for organisation in current_user.organisations %}
+                {% if organisation.flag_approved or isOrganisationRegistrant(organisation) %}
+                <li>
+                    <a href="{{site.uri.public}}/organisations/o/{{organisation.slug}}"><i class="fas fa-angle-double-right"></i> <span>{{organisation.name}}</span></a>
+                </li>
+                {% endif %}
+            {% endfor %}
+            </ul>
+        </li>
+    {% else %}
+        {% set organisation = current_user.organisations.0 %}
+        {% if organisation.flag_approved or isOrganisationRegistrant(organisation) %}
+        <li>
+            <a href="{{site.uri.public}}/organisations/o/{{organisation.slug}}"><i class="fas fa-sitemap fa-fw"></i> <span>{{ translate("ORGANISATION.SELF") }}</span></a>
+        </li>
+        {% endif %}
+    {% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/templates/navigation/sidebar-menu.html.twig b/templates/navigation/sidebar-menu.html.twig
index b08d4bb..4546711 100644
--- a/templates/navigation/sidebar-menu.html.twig
+++ b/templates/navigation/sidebar-menu.html.twig
@@ -1,37 +1,6 @@
 {% extends "@admin/navigation/sidebar-menu.html.twig" %}
 
-{% block organisations_nav %}
-    {% if checkAccess('uri_organisations') %}
-    <li>
-        <a href="{{site.uri.public}}/organisations"><i class="fas fa-sitemap fa-fw"></i> <span>{{ translate("ORGANISATION", 2) }}</span></a>
-    </li>
-    {% endif %}
-    {% if current_user.organisations.count() > 0 %}
-        {% if organisationConfig.membership.single_membership == false %}
-            <li>
-                <a href="#" data-toggle="collapse" data-target="#submenu-organisations" aria-expanded="false"><i class="fa fa-fw fa-sitemap"></i> <span>{{ translate("ORGANISATION.SELF") }}</span> <i class="fa fa-fw pull-right fa-angle-down"></i></a>
-                <ul id="submenu-organisations" class="collapsable collapse" aria-expanded="false" style="height: 1px;">
-                {% for organisation in current_user.organisations %}
-                    {% if organisation.flag_approved or isOrganisationRegistrant(organisation) %}
-                    <li>
-                        <a href="{{site.uri.public}}/organisations/o/{{organisation.slug}}"><i class="fas fa-angle-double-right"></i> <span>{{organisation.name}}</span></a>
-                    </li>
-                    {% endif %}
-                {% endfor %}
-                </ul>
-            </li>
-        {% else %}
-            {% set organisation = current_user.organisations.0 %}
-            {% if organisation.flag_approved or isOrganisationRegistrant(organisation) %}
-            <li>
-                <a href="{{site.uri.public}}/organisations/o/{{organisation.slug}}"><i class="fas fa-sitemap fa-fw"></i> <span>{{ translate("ORGANISATION.SELF") }}</span></a>
-            </li>
-            {% endif %}
-        {% endif %}
-    {% endif %}
-{% endblock %}
-
 {% block navigation %}
     {{ parent() }}
-    {{ block('organisations_nav') }}
+    {% include "navigation/partials/sidebar-organisations.html.twig" %}
 {% endblock %}