diff --git a/templates/components/modal.html b/templates/components/modal.html
index 43c1297a..970b444d 100644
--- a/templates/components/modal.html
+++ b/templates/components/modal.html
@@ -1,20 +1,22 @@
 {% from "components/icon.html" import Icon %}
 
 {% macro Modal(name, dismissable=False) -%}
-<div v-if='modals.{{name}} === true' v-cloak>
+  <template v-if='modals.{{name}} === true' v-cloak>
     <div class='modal {% if dismissable %}modal--dismissable{% endif%}'>
-      <div class='modal__dialog' role='dialog' aria-modal='true'>
-        <div class='modal__body'>
-            {{ caller() }}
+      <div class='modal__container'>
+        <div class='modal__dialog' role='dialog' aria-modal='true'>
+          <div class='modal__body'>
+              {{ caller() }}
 
-            {% if dismissable %}
-              <button type='button' class='icon-link modal__dismiss' v-on:click='closeModal("{{name}}")'>
-                {{ Icon('x') }}
-                <span>Close</span>
-              </button>
-            {% endif %}
+              {% if dismissable %}
+                <button type='button' class='icon-link modal__dismiss' v-on:click='closeModal("{{name}}")'>
+                  {{ Icon('x') }}
+                  <span>Close</span>
+                </button>
+              {% endif %}
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  </template>
 {%- endmacro %}
diff --git a/templates/member_edit.html b/templates/member_edit.html
index f0c1d991..db52347b 100644
--- a/templates/member_edit.html
+++ b/templates/member_edit.html
@@ -55,61 +55,76 @@
 
 {% call Modal(name='rolesModal', dismissable=False) %}
   <div class="block-list">
-
     <header class="block-list__header">
-      <h2>New Request <div class="subtitle">Add a user to an environment</div></h2>
-
+      <h2 class="block-list__title">
+        Environment access for Danny Knight
+        <div class='subtitle'>Project Name - Environment Name</div>
+      </h2>
     </header>
 
     <form method="post" action="">
-      <dl>
-        <div class='block-list__item'>
+      <ul>
+        <li class='block-list__item block-list__item--selectable'>
           <input type='radio' name='radio' id='radio-1' />
           <label for='radio-1'>
-            <dt>CCPO</dt>
-            <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugiat dicta voluptate vitae quasi, cumque rem dolores, quae quas cum in recusandae? Libero deleniti minus ab accusantium vel necessitatibus placeat, rerum?</dd>
+            <dl>
+              <dt>CCPO</dt>
+              <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugiat dicta voluptate vitae quasi, cumque rem dolores, quae quas cum in recusandae? Libero deleniti minus ab accusantium vel necessitatibus placeat, rerum?</dd>
+            </dl>
           </label>
-        </div>
-        <div class='block-list__item'>
+        </li>
+        <li class='block-list__item block-list__item--selectable'>
           <input type='radio' name='radio' id='radio-2' />
           <label for='radio-2'>
-            <dt>Security</dt>
-            <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quaerat vel ea, eaque, odio sint explicabo officia, debitis dolore, et repudiandae possimus deserunt eveniet laborum. Sunt blanditiis deleniti minus. Et, mollitia.</dd>
+            <dl>
+              <dt>Security</dt>
+              <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quaerat vel ea, eaque, odio sint explicabo officia, debitis dolore, et repudiandae possimus deserunt eveniet laborum. Sunt blanditiis deleniti minus. Et, mollitia.</dd>
+            </dl>
           </label>
-        </div>
-        <div class='block-list__item'>
+        </li>
+        <li class='block-list__item block-list__item--selectable'>
           <input type='radio' name='radio' id='radio-3' />
           <label for='radio-3'>
-            <dt>Audit</dt>
-            <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Autem itaque reprehenderit dolorum nobis voluptatibus quae, facilis voluptatum necessitatibus alias laboriosam, esse blanditiis culpa possimus tempore consectetur recusandae. Nihil, vel, dolorem!</dd>
+            <dl>
+              <dt>Audit</dt>
+              <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Autem itaque reprehenderit dolorum nobis voluptatibus quae, facilis voluptatum necessitatibus alias laboriosam, esse blanditiis culpa possimus tempore consectetur recusandae. Nihil, vel, dolorem!</dd>
+            </dl>
           </label>
-        </div>
-        <div class='block-list__item'>
+        </li>
+        <li class='block-list__item block-list__item--selectable'>
           <input type='radio' name='radio' id='radio-4' />
           <label for='radio-4'>
-            <dt>Application Developer</dt>
-            <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea esse ab consequuntur aliquam. Porro ea mollitia sapiente blanditiis quaerat quam beatae vitae adipisci quisquam dolore reiciendis tenetur, eius nemo quibusdam!</dd>
+            <dl>
+              <dt>Application Developer</dt>
+              <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea esse ab consequuntur aliquam. Porro ea mollitia sapiente blanditiis quaerat quam beatae vitae adipisci quisquam dolore reiciendis tenetur, eius nemo quibusdam!</dd>
+            </dl>
           </label>
-        </div>
-        <div class='block-list__item'>
+        </li>
+        <li class='block-list__item block-list__item--selectable'>
           <input type='radio' name='radio' id='radio-5' />
           <label for='radio-5'>
-            <dt>Dev Ops</dt>
-            <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Inventore incidunt obcaecati, quidem ullam sint iusto. Natus ex distinctio eveniet cumque laudantium veritatis nemo asperiores, esse hic quis perspiciatis, quia impedit.</dd>
+            <dl>
+              <dt>Dev Ops</dt>
+              <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Inventore incidunt obcaecati, quidem ullam sint iusto. Natus ex distinctio eveniet cumque laudantium veritatis nemo asperiores, esse hic quis perspiciatis, quia impedit.</dd>
+            </dl>
           </label>
-        </div>
-        <div class='block-list__item'>
+        </li>
+        <li class='block-list__item block-list__item--selectable'>
           <input type='radio' name='radio' id='radio-6' />
           <label for='radio-6'>
-            <dt>Billing</dt>
-            <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem delectus at, voluptatibus dolores, nobis temporibus. Ipsum dignissimos corrupti qui nisi et alias totam commodi maiores hic possimus ipsam error, ullam.</dd>
+            <dl>
+              <dt>Billing</dt>
+              <dd>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem delectus at, voluptatibus dolores, nobis temporibus. Ipsum dignissimos corrupti qui nisi et alias totam commodi maiores hic possimus ipsam error, ullam.</dd>
+            </dl>
           </label>
-        </div>
-      </dl>
+        </li>
+      </ul>
 
-      <div class='action-group'>
-        <a v-on:click="closeModal('rolesModal')" class='action-group__action usa-button'>Add Access</a>
-        <a class='action-group__action icon-link icon-link--danger' v-on:click="closeModal('rolesModal')">No Access</a>
+      <div class='block-list__footer'>
+        <div class='action-group'>
+          <a v-on:click="closeModal('rolesModal')" class='action-group__action usa-button'>Select Access Role</a>
+          <a class='action-group__action icon-link icon-link--danger' v-on:click="closeModal('rolesModal')">No Access</a>
+        </div>
       </div>
     </form>
 
@@ -207,4 +222,4 @@
 
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}