diff --git a/edx_sga/static/js/src/edx_sga.js b/edx_sga/static/js/src/edx_sga.js
index 38db877b..c99930a5 100644
--- a/edx_sga/static/js/src/edx_sga.js
+++ b/edx_sga/static/js/src/edx_sga.js
@@ -48,13 +48,19 @@ function StaffGradedAssignmentXBlock(runtime, element) {
                                     return;
                                 }
                             }
+                            var uploadElement = $(content).find(".upload");
+                            uploadElement.attr("role", "progressbar");
+                            uploadElement.attr("aria-valuemax", "100");
+                            uploadElement.attr("aria-valuemin", "0");
                             data.submit();
                         });
                 },
                 progressall: function(e, data) {
                     var percent = parseInt(data.loaded / data.total * 100, 10);
-                    $(content).find('.upload').text(
-                        'Uploading... ' + percent + '%');
+                    var uploadElement = $(content).find(".upload");
+                    uploadElement.text("Uploading... " + percent + "%");
+                    uploadElement.attr("aria-valuenow" , percent);
+                    uploadElement.attr("aria-valuetext" , "Uploading... " + percent + "%");
                 },
                 fail: function(e, data) {
                     /**
@@ -100,8 +106,10 @@ function StaffGradedAssignmentXBlock(runtime, element) {
                     }
                 }
             });
-
             updateChangeEvent(fileUpload);
+            if (!_.isUndefined(state.error)) {
+                $(content).find('p.error').focus();
+            }
         }
 
         function renderStaffGrading(data) {
@@ -169,10 +177,13 @@ function StaffGradedAssignmentXBlock(runtime, element) {
                 event.preventDefault();
                 if (isNaN(score)) {
                     form.find('.error').html('<br/>Grade must be a number.');
+                    form.find('.error').focus();
                 } else if (score !== parseInt(score)) {
                     form.find('.error').html('<br/>Grade must be an integer.');
+                    form.find('.error').focus();
                 } else if (score < 0) {
                     form.find('.error').html('<br/>Grade must be positive.');
+                    form.find('.error').focus();
                 } else if (score > max_score) {
                     form.find('.error').html('<br/>Maximum score is ' + max_score);
                 } else {
diff --git a/edx_sga/templates/staff_graded_assignment/edit.html b/edx_sga/templates/staff_graded_assignment/edit.html
index 4ef3d34a..876b6908 100644
--- a/edx_sga/templates/staff_graded_assignment/edit.html
+++ b/edx_sga/templates/staff_graded_assignment/edit.html
@@ -1,22 +1,23 @@
 {% load i18n %}
 
-<div id="staff-graded-assignment-edit">
-  <ul class="list-input settings-list">
+<div id="staff-graded-assignment-edit" role="form">
+  <div class="list-input settings-list">
     {% for field, value, validator in fields %}
-    <li class="field comp-setting-entry metadata_entry">
+    <div class="field comp-setting-entry metadata_entry">
       <div class="wrapper-comp-setting">
-        <label class="label setting-label" 
+        <label class="label setting-label"
           for="{{ field.name }}_input">{{ field.display_name }}</label>
-        <input class="input setting-input" type="text" 
-               id="{{ field.name }}_input" name="{{ field.name}}" 
+        <input class="input setting-input" type="text" aria-describedby="{{ field.name }}_hint"
+               id="{{ field.name }}_input" name="{{ field.name}}"
                value="{{ value }}" data-validator="{{ validator }}"/>
       </div>
-      <span class="tip setting-help">{{ field.help }}</span>
-    </li>
+      <span id="{{ field.name }}_hint" class="tip setting-help">{{ field.help }}</span>
+    </div>
     {% endfor %}
-  </ul>
+  </div>
 </div>
 
 <script type="application/javascript">
- $("ul.action-modes").html(' <li class="view-button sga_editor_tab">{% trans "Settings" %}</li>')
+ $("ul.action-modes").html(' <li class="view-button sga_editor_tab" aria-label="settings">{% trans "Settings" %}</li>')
+ $("h2.modal-window-title").attr("tabindex","0");
 </script>
diff --git a/edx_sga/templates/staff_graded_assignment/show.html b/edx_sga/templates/staff_graded_assignment/show.html
index 7eac9d9e..1280ad59 100644
--- a/edx_sga/templates/staff_graded_assignment/show.html
+++ b/edx_sga/templates/staff_graded_assignment/show.html
@@ -1,14 +1,15 @@
 {% load i18n %}
 
 <div class="sga-block" data-state="{{ student_state }}" data-max-size="{{ max_file_size }}"
-     data-staff="{{ is_course_staff }}">
+     data-staff="{{ is_course_staff }}" role="article" aria-describedby="title">
   <script type="text/template" id="sga-tmpl">
     <% if (display_name) { %>
-       <b><%= display_name %></b>
+       <b id="title"><%= display_name %></b>
     <% } %>
     <% if (uploaded) { %>
-      <p><b>File uploaded</b> 
-        <a href="<%= downloadUrl %>"><%= uploaded.filename %></a></p>
+      <br/>
+      <label for="file_uploaded"><b>File uploaded</b></label>
+        <a href="<%= downloadUrl %>" role="link" id="file_uploaded"><%= uploaded.filename %></a>
     <% } else { %>
       <p>No file has been uploaded.</p>
     <% } %>
@@ -18,28 +19,28 @@
           <b>Instructor comment</b> <%= graded.comment %>
         <% } %>
         <% if (annotated) { %><br/>
-          <b>Annotated file from instructor</b>
-          <a href="<%= annotatedUrl %>"><%= annotated.filename %></a>
+          <b id="annotated_file">Annotated file from instructor</b>
+          <a href="<%= annotatedUrl %>" aria-describedby="annotated_file"><%= annotated.filename %></a>
         <% } %>
       </p>
     <% } else if (uploaded) { %>
-      {% trans "This assignment has not yet been graded." %}
+      <p>{% trans "This assignment has not yet been graded." %}</p>
     <% } %>
     <% if (upload_allowed) { %>
     <p>
       <% if (uploaded) { %>
-        {% trans "Upload a different file" %}
+        <span id="upload_label">{% trans "Upload a different file" %}</span>
       <% } else { %>
-        {% trans "Upload your assignment" %}
+        <span id="upload_label">{% trans "Upload your assignment" %}</span>
       <% } %>
-      <div class="upload">
+      <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"><%= error %></p>
+      <p class="error" role="alert" aria-live="assertive" tabindex="1"><%= error %></p>
     <% } %>
   </script>
 
@@ -90,7 +91,7 @@
           </td>
           <td>
             <% if (assignment.may_grade) { %>
-              <a class="enter-grade-button button" href="#{{ id }}-enter-grade">
+              <a class="enter-grade-button button" href="#{{ id }}-enter-grade" role="button">
                 <% if (assignment.needs_approval) { %>
                   {% trans "Approve grade" %}
                 <% } else { %>
@@ -100,7 +101,7 @@
            <% } %>
           </td>
           <td>
-            <div class="upload">
+            <div class="upload" aria-live="assertive" role="alert" tabindex="1">
               <input class="fileupload" type="file" name="annotated"/>
               <button>Upload annotated file</button>
             </div>
@@ -110,14 +111,14 @@
     </table>
   </script>
 
-  <div aria-hidden="true" class="wrap-instructor-info">
+  <div class="wrap-instructor-info">
     <a class="instructor-info-action" id="grade-submissions-button"
        href="#{{ id }}-grade">{% trans "Grade Submissions" %}</a>
     <a class="instructor-info-action" id="staff-debug-info-button"
        href="#{{ id }}-debug">{% trans "Staff Debug Info" %}</a>
   </div>
 
-  <section aria-hidden="true" class="modal staff-modal" id="{{ id }}-grade" style="height: 75%">
+  <section class="modal staff-modal" id="{{ id }}-grade" style="height: 75%">
     <div class="inner-wrapper" style="color: black; overflow: auto;">
       <header><h2><span class="display_name">{{ display_name }}</span> - {% trans "Staff Graded Assignment" %}</h2></header>
       <br/>
@@ -127,32 +128,32 @@
     </div>
   </section>
 
-  <section aria-hidden="true" class="modal staff-modal" 
+  <section class="modal staff-modal"
            style="height: 80%" id="{{ id }}-debug">
     <div class="inner-wrapper" style="color: black">
-      <header><h2>{% trans "Staff Debug" %}</h2></header>
+      <header role="banner"><h2>{% trans "Staff Debug" %}</h2></header>
       <br/>
       <div class="staff_info" style="display: block; white-space: normal">
-        is_released = {{ is_released }}<br/>
-        location = {{ location }}<br/>
+        <span tabindex="1">is_released = {{ is_released }}</span> <br/>
+        <span tabindex="1">location = {{ location }}</span><br/>
         <br/>
         <table summary="${_('Module Fields')}">
-          <tr><th>{% trans "Module Fields" %}</th></tr>
+          <tr><th tabindex="1">{% trans "Module Fields" %}</th></tr>
           {% for name, field in fields %}
           <tr>
-            <td>{{name}}</td>
+            <td tabindex="1">{{name}}</td>
             <td>
-              <pre style="display:inline-block; margin: 0;">{{field}}</pre>
+              <pre style="display:inline-block; margin: 0;"  tabindex="1">{{field}}</pre>
             </td>
           </tr>
           {% endfor %}
         </table><br/>
-        category = {{category}}
+        <span tabindex="1">category = {{category}}</span>
       </div>
     </div>
   </section>
 
-  <section aria-hidden="true" class="modal grade-modal" id="{{ id }}-enter-grade">
+  <section  class="modal grade-modal" id="{{ id }}-enter-grade">
     <div class="inner-wrapper" style="color: black">
       <header><h2>
         {% trans "Enter Grade" %}
@@ -164,7 +165,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"></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>