diff --git a/styles/components/_accordion_table.scss b/styles/components/_accordion_table.scss
index 6db69c98..a3adf754 100644
--- a/styles/components/_accordion_table.scss
+++ b/styles/components/_accordion_table.scss
@@ -38,6 +38,7 @@
     .accordion-table__items {
       .accordion-table__item__toggler {
         @include icon-link-color($color-blue, $color-gray-lightest);
+        float: right;
         margin-left: -$gap;
         color: $color-blue;
 
diff --git a/styles/elements/_panels.scss b/styles/elements/_panels.scss
index 572a165a..0036e474 100644
--- a/styles/elements/_panels.scss
+++ b/styles/elements/_panels.scss
@@ -107,6 +107,10 @@
     }
   }
 
+  .panel__footer {
+    padding: 3 * $gap;
+  }
+
   hr {
     border: 0;
     border-bottom: 1px dashed $color-gray-light;
diff --git a/styles/sections/_application_list.scss b/styles/sections/_application_list.scss
index 3b7ad134..da0a3f77 100644
--- a/styles/sections/_application_list.scss
+++ b/styles/sections/_application_list.scss
@@ -35,8 +35,6 @@
   }
 
   .icon-link {
-    float: right;
-
     .icon--info {
       bottom: -1px;
       left: 4px;
diff --git a/templates/fragments/applications/environments.html b/templates/fragments/applications/environments.html
index afc16c9a..48f6ba1c 100644
--- a/templates/fragments/applications/environments.html
+++ b/templates/fragments/applications/environments.html
@@ -2,8 +2,8 @@
 
 <div class="application-list-item">
   <header>
-    <div class="list-header">
-      <div class='left'>
+    <div class="accordion-table__header">
+      <div class='accordion-table__title'>
         <div class='h3'>{{ 'portfolios.applications.environments_heading' | translate }}</div>
       </div>
       <a class='icon-link'>
@@ -36,7 +36,7 @@
         </tr>
 
         <tr scope='rowgroup' v-for='member in members_list' v-show='environmentsState[name].isVisible' class='accordion-table__item__expanded'>
-          <td class='table-cell--expand'>
+          <td>
             <div>
               <span v-html='member'></span>
             </div>
diff --git a/templates/portfolios/applications/edit.html b/templates/portfolios/applications/edit.html
index 86189109..db842f80 100644
--- a/templates/portfolios/applications/edit.html
+++ b/templates/portfolios/applications/edit.html
@@ -16,20 +16,24 @@
         {% include "fragments/applications/edit_application_form.html" %}
 
       </div>
-      <div class="action-group">
-        <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
+      <div class="panel__footer">
+        <div class="action-group">
+          <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
+        </div>
       </div>
     </div>
   </form>
 
     <div class="accordion-table responsive-table-wrapper panel">
         {% include "fragments/applications/environments.html" %}
-      <div class="action-group">
-        <a class='icon-link'>
-          {{ "portfolios.applications.add_environment" | translate }}
-          {{ Icon('plus-circle-solid') }}
-        </a>
-        <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
+      <div class="panel__footer">
+        <div class="action-group">
+          <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
+          <a class='icon-link'>
+            {{ "portfolios.applications.add_environment" | translate }}
+            {{ Icon('plus-circle-solid') }}
+          </a>
+        </div>
       </div>
     </div>
 
diff --git a/translations.yaml b/translations.yaml
index bb319617..4b47c464 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -580,7 +580,7 @@ portfolios:
     existing_application_title: '{application_name} Application Settings'
     new_application_title: New Application
     settings_heading: Application Settings
-    environments_heading: Environments
+    environments_heading: Application Environments
     environments_description: Each environment created within an application is logically separated from one another for easier management and security.
     update_button_text: Save
     create_button_text: Create