diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss
index 73e554d5..3640dbc1 100644
--- a/styles/components/_portfolio_layout.scss
+++ b/styles/components/_portfolio_layout.scss
@@ -113,7 +113,8 @@
       ul {
         padding-left: 0;
       }
-      .application-edit__env-list-item {
+      .block-list__footer {
+        border-bottom: none;
       }
     }
   }
diff --git a/templates/portfolios/applications/edit.html b/templates/portfolios/applications/edit.html
index 947903ab..9d7761c2 100644
--- a/templates/portfolios/applications/edit.html
+++ b/templates/portfolios/applications/edit.html
@@ -8,9 +8,9 @@
 
   <div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div>
 
-  <div class="panel">
-    <div class="panel__content">
-      <form method="POST" action="{{ url_for('portfolios.edit_application', portfolio_id=portfolio.id, application_id=application.id) }}">
+  <form method="POST" action="{{ url_for('portfolios.edit_application', portfolio_id=portfolio.id, application_id=application.id) }}">
+    <div class="panel">
+      <div class="panel__content">
 
         {% include "fragments/edit_application_form.html" %}
 
@@ -34,11 +34,11 @@
           </ul>
         </div>
 
-        <div class="action-group">
-          <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
-        </div>
-      </form>
+      </div>
     </div>
-  </div>
+    <div class="action-group">
+      <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
+    </div>
+  </form>
 
 {% endblock %}
diff --git a/templates/portfolios/applications/new.html b/templates/portfolios/applications/new.html
index 00c8dae2..343bb10a 100644
--- a/templates/portfolios/applications/new.html
+++ b/templates/portfolios/applications/new.html
@@ -14,11 +14,10 @@
 
   <div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div>
 
-  <div class="panel">
-    <div class="panel__content">
-
-      <new-application inline-template v-bind:initial-data='{{ form.data|tojson }}' modal-name='{{ modalName }}'>
-        <form method="POST" action="{{ url_for('portfolios.create_application', portfolio_id=portfolio.id) }}" v-on:submit="handleSubmit">
+  <new-application inline-template v-bind:initial-data='{{ form.data|tojson }}' modal-name='{{ modalName }}'>
+    <form method="POST" action="{{ url_for('portfolios.create_application', portfolio_id=portfolio.id) }}" v-on:submit="handleSubmit">
+      <div class="panel">
+        <div class="panel__content">
 
           {% call Modal(name=modalName, dismissable=False) %}
             <h1>Create application !{ name }</h1>
@@ -72,13 +71,14 @@
             </div>
           </div>
 
-          <div class="action-group">
-            <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.create_button_text' | translate }}</button>
-          </div>
-        </form>
-      </new-application>
 
-    </div>
-  </div>
+        </div>
+      </div>
+
+      <div class="action-group">
+        <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.create_button_text' | translate }}</button>
+      </div>
+    </form>
+  </new-application>
 
 {% endblock %}