diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss
index 37658ac1..c58d2e0d 100644
--- a/styles/components/_portfolio_layout.scss
+++ b/styles/components/_portfolio_layout.scss
@@ -273,24 +273,17 @@
     .accordion-table__item-content.form-row {
       margin-bottom: 0;
       margin-top: 0;
-      padding-bottom: 0;
+      padding: 0;
     }
 
     li.accordion-table__item__expanded {
       height: auto;
     }
 
-    .environment-list__item {
-      position: relative;
-      height: 7rem;
-    }
-
     span.accordion-table__item__toggler.icon-link {
       font-size: $small-font-size;
       font-weight: $font-normal;
-      position: absolute;
-      left: -$gap * 1.25;
-      bottom: 0;
+      float: unset;
     }
 
     a.application-list-item__environment__csp_link.icon-link {
diff --git a/styles/elements/_panels.scss b/styles/elements/_panels.scss
index 46b8917b..b8d306cf 100644
--- a/styles/elements/_panels.scss
+++ b/styles/elements/_panels.scss
@@ -61,11 +61,6 @@
   &__content {
     margin: ($gap * 2) 0;
     padding: 0 ($gap * 2);
-
-    @include media($medium-screen) {
-      margin: ($gap * 4) 0;
-      padding: 0 ($gap * 4);
-    }
   }
 
   &__body {
diff --git a/templates/applications/settings.html b/templates/applications/settings.html
index 58a5b17d..49fad8d7 100644
--- a/templates/applications/settings.html
+++ b/templates/applications/settings.html
@@ -64,14 +64,12 @@
     user_can_delete_app_member=user_can(permissions.DELETE_APPLICATION_MEMBER),
   ) }}
 
-  <div class="subheading">    
-    {{ 'common.resource_names.environments' | translate }}
-  </div>
-  <div class="panel">
+  <h3>{{ 'common.resource_names.environments' | translate }}</h3>
+  <section class="panel" id="application-environments">
     {% if g.matchesPath("application-environments") %}
       {% include "fragments/flash.html" %}
     {% endif %}
-    <div class="panel__content">
+    <div class="panel__content panel__content">
       <div class="accordion-table accordion-table-list">
         <ul class="accordion-table__items">
           {% for env in environments_obj %}
@@ -84,44 +82,36 @@
                       <span>
                         {{ env['name'] }}
                       </span>
-                      {% if env['pending'] %}
+                      {% set members_button = "portfolios.applications.member_count" | translate({'count': env['member_count']}) %}
+                      {{
+                        ToggleButton(
+                          open_html=members_button,
+                          close_html=members_button,
+                          section_name="members"
+                        )
+                      }}
+                      <br>
+                      {% if env['pending'] -%}
                         <span class='usa-label'>PROCESSING</span>
-                      {% endif %}
-                      {% if env['pending'] %}
-                        <span class="icon-link">
-                          {% set edit_environment_button %}
-                            {{ Icon('edit') }}
-                          {% endset %}
-
-                          {{
-                          ToggleButton(
-                            open_html=edit_environment_button,
-                            close_html=edit_environment_button,
-                            section_name="edit"
-                            )
-                          }}
-                        </span>
-                      {% endif %}
-                      <span class="accordion-table__item__toggler icon-link">
-                        {% set members_button = "portfolios.applications.member_count" | translate({'count': env['member_count']}) %}
-                        {{
-                          ToggleButton(
-                            open_html=members_button,
-                            close_html=members_button,
-                            section_name="members"
-                          )
-                        }}
-                      </span>
+                      {% else %}
+                        <a href='{{ url_for("applications.access_environment", environment_id=env.id)}}' target='_blank' rel='noopener noreferrer' class='application-list-item__environment__csp_link icon-link'>
+                          <span>{{ "portfolios.applications.csp_link" | translate }} {{ Icon('link', classes="icon--tiny") }}</span>
+                        </a>
+                      {%- endif %}
                     </div>
                   </div>
                   <div class="form-col form-col--third">
-                    {% if env['pending'] %}
-                      <em>Cloud service provider link unavailable</em>
-                    {% else %}
-                      <a href='{{ url_for("applications.access_environment", environment_id=env.id)}}' target='_blank' rel='noopener noreferrer' class='application-list-item__environment__csp_link icon-link'>
-                        <span>{{ "portfolios.applications.csp_link" | translate }} {{ Icon('link', classes="icon--tiny") }}</span>
-                      </a>
-                    {% endif %}
+                      {% set edit_environment_button %}
+                        <span>Edit</span>
+                      {% endset %}
+
+                      {{
+                      ToggleButton(
+                        open_html=edit_environment_button,
+                        close_html=edit_environment_button,
+                        section_name="edit"
+                        )
+                      }}
                   </div>
                 </div>
 
@@ -161,8 +151,8 @@
       {% include "applications/fragments/add_new_environment.html" %}
       </div>
     {% endif %}
-  </div>
-  
+  </section>
+
   <hr>
 
   {% if user_can(permissions.DELETE_APPLICATION) %}
diff --git a/templates/components/toggle_list.html b/templates/components/toggle_list.html
index bb16d87e..ce649f69 100644
--- a/templates/components/toggle_list.html
+++ b/templates/components/toggle_list.html
@@ -1,11 +1,11 @@
 {% macro ToggleButton(action, open_html, close_html, section_name) %}
-  <span v-on:click="toggleSection('{{ section_name }}')">
-    <div v-if="selectedSection === '{{ section_name }}'">
+  <span v-on:click="toggleSection('{{ section_name }}')" class="accordion-table__item__toggler">
+    <span v-if="selectedSection === '{{ section_name }}'">
       {{ close_html }}
-    </div>
-    <div v-else>
+    </span>
+    <span v-else>
       {{ open_html }}
-    </div>
+    </span>
   </span>
 {% endmacro %}