diff --git a/templates/fragments/applications/edit_team.html b/templates/fragments/applications/edit_team.html
index 2283c70e..d5d9f300 100644
--- a/templates/fragments/applications/edit_team.html
+++ b/templates/fragments/applications/edit_team.html
@@ -1,48 +1,46 @@
 {% from "components/options_input.html" import OptionsInput %}
 
-<form method='POST' id="team" action='{{ url_for("applications.update_team", application_id=application.id) }}' autocomplete="off" enctype="multipart/form-data">
-  {{ team_form.csrf_token }}
+{{ team_form.csrf_token }}
 
-  {% for member_form in team_form.members %}
-    {% set environment_roles_form = member_form.environment_roles %}
-    {% set permissions_form = member_form.permission_sets %}
+{% for member_form in team_form.members %}
+  {% set environment_roles_form = member_form.environment_roles %}
+  {% set permissions_form = member_form.permission_sets %}
 
-    <toggler inline-template>
-      <li class="accordion-table__item">
-        <div class="accordion-table__item-content row">
-          <div class="col col--grow">{{ member_form.user_name.data }}</div>
-          <div class="col col--grow">{{ OptionsInput(permissions_form.perms_team_mgmt, label=False, watch=True) }}</div>
-          <div class="col col--grow">{{ OptionsInput(permissions_form.perms_env_mgmt, label=False, watch=True) }}</div>
-          <div class="col col--grow">{{ OptionsInput(permissions_form.perms_del_env, label=False, watch=True) }}</div>
-          <div class="col col--grow icon-link icon-link--large accordion-table__item__toggler">
-            {% set open_html %}
-              {{ "portfolios.applications.team_settings.environments" | translate }} ({{ environment_roles_form | length }}) {{ Icon('caret_down') }}
-            {% endset %}
+  <toggler inline-template>
+    <li class="accordion-table__item">
+      <div class="accordion-table__item-content row">
+        <div class="col col--grow">{{ member_form.user_name.data }}</div>
+        <div class="col col--grow">{{ OptionsInput(permissions_form.perms_team_mgmt, label=False, watch=True) }}</div>
+        <div class="col col--grow">{{ OptionsInput(permissions_form.perms_env_mgmt, label=False, watch=True) }}</div>
+        <div class="col col--grow">{{ OptionsInput(permissions_form.perms_del_env, label=False, watch=True) }}</div>
+        <div class="col col--grow icon-link icon-link--large accordion-table__item__toggler">
+          {% set open_html %}
+            {{ "portfolios.applications.team_settings.environments" | translate }} ({{ environment_roles_form | length }}) {{ Icon('caret_down') }}
+          {% endset %}
 
-            {% set close_html %}
-              {{ "portfolios.applications.team_settings.environments" | translate }} ({{ environment_roles_form | length }}) {{ Icon('caret_up') }}
-            {% endset %}
+          {% set close_html %}
+            {{ "portfolios.applications.team_settings.environments" | translate }} ({{ environment_roles_form | length }}) {{ Icon('caret_up') }}
+          {% endset %}
 
-            {{
-              ToggleButton(
-                open_html=open_html,
-                close_html=close_html,
-                section_name="environments"
-              )
-            }}
-          </div>
+          {{
+            ToggleButton(
+              open_html=open_html,
+              close_html=close_html,
+              section_name="environments"
+            )
+          }}
         </div>
-        {% call ToggleSection(section_name="environments") %}
-          <ul>
-            {% for environment_form in environment_roles_form %}
-              <li class="accordion-table__item__expanded">
-                {{ environment_form.environment_name.data }}
-              </li>
-            {% endfor %}
-          </ul>
-        {% endcall %}
-      {{ member_form.user_id() }}
-      </li>
-    </toggler>
-  {% endfor %}
-</form>
+      </div>
+      {% call ToggleSection(section_name="environments") %}
+        <ul>
+          {% for environment_form in environment_roles_form %}
+            <li class="accordion-table__item__expanded">
+              {{ environment_form.environment_name.data }}
+            </li>
+          {% endfor %}
+        </ul>
+      {% endcall %}
+    {{ member_form.user_id() }}
+    </li>
+  </toggler>
+{% endfor %}
diff --git a/templates/portfolios/applications/team.html b/templates/portfolios/applications/team.html
index d08e6e0b..c7270c05 100644
--- a/templates/portfolios/applications/team.html
+++ b/templates/portfolios/applications/team.html
@@ -46,68 +46,68 @@
 
     <section class="member-list application-list" id="application-members">
       <base-form inline-template>
-        <div class='responsive-table-wrapper panel'>
-          {% if g.matchesPath("application-members") %}
-            {% include "fragments/flash.html" %}
-          {% endif %}
-          <header>
-            <div class="responsive-table-wrapper__header">
-              <div class="responsive-table-wrapper__title row">
-                <div class="h3">
-                  {{ "portfolios.applications.team_settings.section.title" | translate({ "application_name": application.name }) }}
+        <form method='POST' id="team" action='{{ url_for("applications.update_team", application_id=application.id) }}' autocomplete="off" enctype="multipart/form-data">
+          <div class='responsive-table-wrapper panel'>
+            {% if g.matchesPath("application-members") %}
+              {% include "fragments/flash.html" %}
+            {% endif %}
+            <header>
+              <div class="responsive-table-wrapper__header">
+                <div class="responsive-table-wrapper__title row">
+                  <div class="h3">
+                    {{ "portfolios.applications.team_settings.section.title" | translate({ "application_name": application.name }) }}
+                  </div>
+                  <a class="icon-link">
+                    {{ Icon('info') }}
+                    {{ "portfolios.admin.settings_info" | translate }}
+                  </a>
                 </div>
-                <a class="icon-link">
-                  {{ Icon('info') }}
-                  {{ "portfolios.admin.settings_info" | translate }}
-                </a>
-              </div>
-            </header>
+              </header>
 
-          <div class="accordion-table accordion-table-list">
-            <div class="accordion-table__head row">
-              <div class="col col--grow">
-                {{ "common.name" | translate }}
+            <div class="accordion-table accordion-table-list">
+              <div class="accordion-table__head row">
+                <div class="col col--grow">
+                  {{ "common.name" | translate }}
+                </div>
+                <div class="col col--grow">
+                  {{ "portfolios.applications.team_settings.section.table.team_management" | translate }}
+                </div>
+                <div class="col col--grow">
+                  {{ "portfolios.applications.team_settings.section.table.environment_management" | translate }}
+                </div>
+                <div class="col col--grow">
+                  {{ "portfolios.applications.team_settings.section.table.delete_access" | translate }}
+                </div>
+                <div class="col col--grow">
+                  &nbsp;
+                </div>
               </div>
-              <div class="col col--grow">
-                {{ "portfolios.applications.team_settings.section.table.team_management" | translate }}
-              </div>
-              <div class="col col--grow">
-                {{ "portfolios.applications.team_settings.section.table.environment_management" | translate }}
-              </div>
-              <div class="col col--grow">
-                {{ "portfolios.applications.team_settings.section.table.delete_access" | translate }}
-              </div>
-              <div class="col col--grow">
-                &nbsp;
+              <ul class="accordion-table__items">
+                {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
+                  {% include "fragments/applications/edit_team.html" %}
+                {% elif user_can(permissions.VIEW_APPLICATION_MEMBER) %}
+                  {% include "fragments/applications/read_only_team.html" %}
+                {% endif %}
+              </ul>
+            </div>
+
+            <div class="panel__footer">
+              <div class="action-group save">
+                {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
+                  {{ SaveButton(text=('common.save' | translate), element="input", form="team") }}
+                {% endif %}
+
+                {% set new_member_modal_name = "add-app-mem" %}
+                {% if user_can(permissions.CREATE_APPLICATION_MEMBER) %}
+                  <a class="icon-link modal-link" v-on:click="openModal('{{ new_member_modal_name }}')">
+                    {{ "portfolios.admin.add_new_member" | translate }}
+                    {{ Icon("plus") }}
+                  </a>
+                {% endif %}
               </div>
             </div>
-            <ul class="accordion-table__items">
-              {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
-                {% include "fragments/applications/edit_team.html" %}
-              {% elif user_can(permissions.VIEW_APPLICATION_MEMBER) %}
-                {% include "fragments/applications/read_only_team.html" %}
-              {% endif %}
-            </ul>
           </div>
-
-          <div class="panel__footer">
-            <div class="action-group save">
-              {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
-                {{ SaveButton(text=('common.save' | translate), element="input", form="team") }}
-              {% endif %}
-
-              {% set new_member_modal_name = "add-app-mem" %}
-              {% if user_can(permissions.CREATE_APPLICATION_MEMBER) %}
-                <a class="icon-link modal-link" v-on:click="openModal('{{ new_member_modal_name }}')">
-                  {{ "portfolios.admin.add_new_member" | translate }}
-
-                  {{ Icon("plus") }}
-                </a>
-              {% endif %}
-            </div>
-          </div>
-
-        </div>
+        </form>
       </base-form>
       {% if user_can(permissions.CREATE_APPLICATION_MEMBER) %}
         {% import "fragments/applications/new_member_modal_content.html" as member_steps %}