diff --git a/edx_sga/templates/staff_graded_assignment/show.html b/edx_sga/templates/staff_graded_assignment/show.html
index af66c47e..cc22273d 100644
--- a/edx_sga/templates/staff_graded_assignment/show.html
+++ b/edx_sga/templates/staff_graded_assignment/show.html
@@ -33,14 +33,14 @@
       <% } else { %>
         <span id="upload_label">{% trans "Upload your assignment" %}</span>
       <% } %>
-      <div class="upload" aria-describedby="upload_label" role="alert" aria-live="assertive" tabindex="1">
+      <div class="upload" aria-describedby="upload_label" role="alert" aria-live="assertive" tabindex="-1">
         <input class="fileupload" type="file" name="assignment"/>
         <button>Select a file</button>
       </div>
     </p>
     <% } %>
     <% if (error) { %>
-      <p class="error" role="alert" aria-live="assertive" tabindex="1"><%= error %></p>
+      <p class="error" role="alert" aria-live="assertive" tabindex="-1"><%= error %></p>
     <% } %>
   </script>
 
@@ -104,7 +104,7 @@
            <% } %>
           </td>
           <td>
-            <div class="upload" aria-live="assertive" role="alert" tabindex="1">
+            <div class="upload" aria-live="assertive" role="alert" tabindex="-1">
               <input class="fileupload" type="file" name="annotated"/>
               <button>Upload annotated file</button>
             </div>
@@ -138,21 +138,28 @@
       <header role="banner"><h2>{% trans "Staff Debug" %}</h2></header>
       <br/>
       <div class="staff_info" style="display: block; white-space: normal">
-        <span tabindex="1">is_released = {{ is_released }}</span> <br/>
-        <span tabindex="1">location = {{ location }}</span><br/>
+        <span>is_released = {{ is_released }}</span> <br/>
+        <span>location = {{ location }}</span><br/>
         <br/>
         <table summary="${_('Module Fields')}">
-          <tr><th tabindex="1">{% trans "Module Fields" %}</th></tr>
-          {% for name, field in fields %}
-          <tr>
-            <td tabindex="1">{{name}}</td>
-            <td>
-              <pre style="display:inline-block; margin: 0;"  tabindex="1">{{field}}</pre>
-            </td>
-          </tr>
+          <thead>
+            <tr>
+              <th>{% trans "Module Fields" %}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for name, field in fields %}
+              <tr>
+                <td>{{name}}</td>
+                <td>
+                  <pre style="display:inline-block; margin: 0;">{{field}}</pre>
+                </td>
+              </tr>
           {% endfor %}
-        </table><br/>
-        <span tabindex="1">category = {{category}}</span>
+          </tbody>
+        </table>
+        <br/>
+        <span>category = {{category}}</span>
       </div>
     </div>
   </section>
@@ -169,7 +176,7 @@
           <input id="submission_id-input" type="hidden" name="submission_id"/>
           <div>Grade for <span id="student-name"/></div>
           <div>Grade: <input id="grade-input" name="grade"/>
-            <span class="error" role="alert" aria-live="assertive" tabindex="1"></span></div>
+            <span class="error" role="alert" aria-live="assertive" tabindex="-1"></span></div>
           <div>Comment: <textarea id="comment-input" name="comment" rows="4"></textarea></div>
           <div>
             <button type="submit">{% trans "Submit" %}</button>