diff --git a/templates/fragments/environments.html b/templates/applications/fragments/environments.html
similarity index 100%
rename from templates/fragments/environments.html
rename to templates/applications/fragments/environments.html
diff --git a/templates/fragments/members.html b/templates/applications/fragments/members.html
similarity index 97%
rename from templates/fragments/members.html
rename to templates/applications/fragments/members.html
index 823dcbc7..a138f88f 100644
--- a/templates/fragments/members.html
+++ b/templates/applications/fragments/members.html
@@ -12,9 +12,9 @@
   new_member_form,
   action) %}
 
-  <div class="subheading"  id="application-members">
+  <h3  id="application-members">
     {{ 'portfolios.applications.settings.team_members' | translate }}
-  </div>
+  </h3>
 
   {% if g.matchesPath("application-members") %}
       {% include "fragments/flash.html" %}
@@ -143,7 +143,7 @@
                 </td>
                 <td>
                   {% for env in member.environment_roles %}
-                    {{ env.environment_name }}{% if not env == member.environment_roles[-1]%},{% endif %}
+                    {{ env.environment_name }}<br>
                   {% endfor %}
                 </td>
                 <td>
diff --git a/templates/applications/new/step_3.html b/templates/applications/new/step_3.html
index 94521d8b..3094c52e 100644
--- a/templates/applications/new/step_3.html
+++ b/templates/applications/new/step_3.html
@@ -2,7 +2,7 @@
 {% extends "applications/base.html" %}
 
 
-{% from "fragments/members.html" import MemberManagementTemplate with context %}
+{% from "applications/fragments/members.html" import MemberManagementTemplate with context %}
 {% set secondary_breadcrumb = 'portfolios.applications.new_application_title' | translate %}
 
 {% block portfolio_header %}
@@ -16,16 +16,16 @@
     {{ ('portfolios.applications.new.step_3_description' | translate) }}
   </p>
   <hr class="panel__break">
-  
+
   {{ MemberManagementTemplate(
-    application, 
+    application,
     members,
     new_member_form,
     "applications.update_new_application_step_3") }}
-    
+
 
   <span class="action-group-footer">
-    <a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}">  
+    <a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}">
       Return to Application Settings
     </a>
     <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_2', application_id=application.id) }}">
@@ -35,6 +35,5 @@
       Cancel
     </a>
   </span>
-  
-{% endblock %}
 
+{% endblock %}
diff --git a/templates/applications/settings.html b/templates/applications/settings.html
index 15cee284..cb610743 100644
--- a/templates/applications/settings.html
+++ b/templates/applications/settings.html
@@ -2,8 +2,8 @@
 
 {% from "components/alert.html" import Alert %}
 {% from "components/delete_confirmation.html" import DeleteConfirmation %}
-{% from "fragments/environments.html" import EnvironmentManagementTemplate %}
-{% from "fragments/members.html" import MemberManagementTemplate with context %}
+{% from "applications/fragments/environments.html" import EnvironmentManagementTemplate with context %}
+{% from "applications/fragments/members.html" import MemberManagementTemplate with context %}
 {% from "components/modal.html" import Modal %}
 {% from "components/pagination.html" import Pagination %}
 {% from "components/save_button.html" import SaveButton %}