diff --git a/management/templates/aliases.html b/management/templates/aliases.html
index 6c8b0376..77351f2e 100644
--- a/management/templates/aliases.html
+++ b/management/templates/aliases.html
@@ -45,21 +45,40 @@
       </div>
     </div>
   </div>
-  <div class="form-group">
+<div class="form-group">
+  <fieldset>
+    <legend>
     <label for="addaliasSenders" class="col-sm-1 control-label">Permitted Senders</label>
+    </legend>
+
     <div class="col-sm-10">
       <div class="radio">
-        <label>
-          <input id="addaliasForwardsToNotAdvanced" name="addaliasForwardsToDivToggle" type="radio" checked onclick="$('#addaliasForwardsToDiv').toggle(false)">
-          Any mail user listed in the Forwards To box can send mail claiming to be from <span class="regularalias">the alias address</span><span class="catchall domainalias">any address on the alias domain</span>.
+        <label for="addaliasForwardsToNotAdvanced">
+          <input id="addaliasForwardsToNotAdvanced"
+                 name="addaliasForwardsToDivToggle"
+                 type="radio"
+                 checked
+                 onclick="$('#addaliasForwardsToDiv').toggle(false)">
+          Any mail user listed in the Forwards To box can send mail claiming to be from
+          <span class="regularalias">the alias address</span>
+          <span class="catchall domainalias">any address on the alias domain</span>.
         </label>
       </div>
+
       <div class="radio">
-        <label>
-          <input id="addaliasForwardsToAdvanced" name="addaliasForwardsToDivToggle" type="radio" id="addaliasForwardsToDivShower" onclick="$('#addaliasForwardsToDiv').toggle(true)">
-          I&rsquo;ll enter the mail users that can send mail claiming to be from <span class="regularalias">the alias address</span><span class="catchall domainalias">any address on the alias domain</span>.
+        <label for="addaliasForwardsToAdvanced">
+          <input id="addaliasForwardsToAdvanced"
+                 name="addaliasForwardsToDivToggle"
+                 type="radio"
+                 onclick="$('#addaliasForwardsToDiv').toggle(true)">
+          I&rsquo;ll enter the mail users that can send mail claiming to be from
+          <span class="regularalias">the alias address</span>
+          <span class="catchall domainalias">any address on the alias domain</span>.
         </label>
       </div>
+    </div>
+  </fieldset>
+</div>
       <div id="addaliasForwardsToDiv" style="margin-top: .5em; margin-left: 1.4em; display: none;">
         <textarea class="form-control" rows="3" id="addaliasSenders" placeholder="one user per line or separated by commas"></textarea>
       </div>
diff --git a/management/templates/index.html b/management/templates/index.html
index 42e7d636..ce1c15d3 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -215,11 +215,11 @@
           </div>
         </div>
 
-        <div id="global_modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="errorModalTitle" aria-hidden="true">
+        <div id="global_modal" class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="errorModalTitle">
           <div class="modal-dialog modal-sm">
             <div class="modal-content">
               <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close Dialog">&times;</button>
                 <h4 class="modal-title" id="errorModalTitle"> </h4>
               </div>
               <div class="modal-body">