diff --git a/runestone/assess/js/mchoice.js b/runestone/assess/js/mchoice.js
index 314bf871e..23e43ab22 100644
--- a/runestone/assess/js/mchoice.js
+++ b/runestone/assess/js/mchoice.js
@@ -180,6 +180,16 @@ MultipleChoice.prototype.renderMCFormOpts = function () {
     if (this.random) {
         this.randomizeAnswers();
     }
+    var fieldset = document.createElement("fieldset");
+
+    var legend = document.createElement("legend");
+    legend.className = "sr-only";
+
+    var questionText = $(this.containerDiv).find("p").first().text();
+
+    legend.textContent = questionText;
+
+    fieldset.appendChild(legend);
 
     for (var j = 0; j < this.answerList.length; j++) {
         var k = this.indexArray[j];
@@ -192,6 +202,7 @@ MultipleChoice.prototype.renderMCFormOpts = function () {
         input.value = String(k);
         input.id = optid;
 
+        input.setAttribute("aria-describedby", this.divid + "_feedback");
         // Create the label for the input
         var label = document.createElement("label");
         var labelspan = document.createElement("span");
@@ -209,11 +220,11 @@ MultipleChoice.prototype.renderMCFormOpts = function () {
         this.optionArray.push(optObj);
 
         // add the option to the form
-        this.optsForm.appendChild(label);
-        this.optsForm.appendChild(document.createElement("br"));
-
-
+        fieldset.appendChild(label);
+        fieldset.appendChild(document.createElement("br"));
     }
+
+    this.optsForm.appendChild(fieldset);
 };
 
 MultipleChoice.prototype.renderMCFormButtons = function () {
@@ -458,9 +469,11 @@ MultipleChoice.prototype.renderMCMAFeedBack = function () {
     if (this.correct) {
         $(this.feedBackDiv).html(feedbackText);
         $(this.feedBackDiv).attr("class", "alert alert-success");
+        $(this.feedBackDiv).attr("role", "alert");
     } else {
         $(this.feedBackDiv).html(feedbackText);
         $(this.feedBackDiv).attr("class", "alert alert-danger");
+        $(this.feedBackDiv).attr("role", "alert");
     }
 };
 
@@ -500,12 +513,14 @@ MultipleChoice.prototype.renderMCMFFeedback = function (correct, feedbackText) {
     if (correct) {
         $(this.feedBackDiv).html(feedbackText);
         $(this.feedBackDiv).attr("class", "alert alert-success");
+        $(this.feedBackDiv).attr("role", "alert");
     } else {
         if (feedbackText == null) {
             feedbackText = "";
         }
         $(this.feedBackDiv).html(feedbackText);
         $(this.feedBackDiv).attr("class", "alert alert-danger");
+        $(this.feedBackDiv).attr("role", "alert");
     }
 };
 
diff --git a/runestone/assess/multiplechoice.py b/runestone/assess/multiplechoice.py
index 694c06322..9d582a898 100644
--- a/runestone/assess/multiplechoice.py
+++ b/runestone/assess/multiplechoice.py
@@ -176,6 +176,7 @@ class MChoice(Assessment):
         'hide_labels':directives.flag,
     })
 
+
     def run(self):
         """
             process the multiplechoice directive and generate html for output.
@@ -190,8 +191,8 @@ def run(self):
             <div class="%(divclass)s choice-question">
                 <div class="image-background"></div>
                 <div class="petlja-problem-box-icon-holder"> </div>
-                <img src="../_static/img/%(questionType)s-img.svg" class="petlja-problem-image  %(questionType)s-image" />
-                <img src="../_static/img/qchoice-img.svg" class="petlja-problem-image-quiz  qchoice-image" /> 
+                <img src="../_static/img/%(questionType)s-img.svg" alt="choice-question-icon" class="petlja-problem-image  %(questionType)s-image" />
+                <img src="../_static/img/qchoice-img.svg" alt="choice-question-icon" class="petlja-problem-image-quiz  qchoice-image" /> 
             <ul data-component="multiplechoice" data-multipleanswers="%(multipleAnswers)s" data-hidelabels="%(hideLabels)s" %(random)s id="%(divid)s">
             '''
 
diff --git a/runestone/dragndrop/dragndrop.py b/runestone/dragndrop/dragndrop.py
index 5a19910dc..470bc5c1e 100644
--- a/runestone/dragndrop/dragndrop.py
+++ b/runestone/dragndrop/dragndrop.py
@@ -40,8 +40,8 @@ def setup(app):
 <div class="%(divclass)s dragndrop-question">
     <div class="image-background"></div>
     <div class="petlja-problem-box-icon-holder"> </div>
-    <img src="../_static/img/%(questionType)s-img.svg" class="petlja-problem-image  %(questionType)s-image" /> 
-    <img src="../_static/img/qchoice-img.svg" class="petlja-problem-image-quiz  qchoice-image" /> 
+    <img src="../_static/img/%(questionType)s-img.svg" alt="puzzle-icon" class="petlja-problem-image  %(questionType)s-image" /> 
+    <img src="../_static/img/qchoice-img.svg" alt="quiz-icon" class="petlja-problem-image-quiz  qchoice-image" /> 
 <ul data-component="dragndrop" id="%(divid)s">
     <span data-component="question">%(question)s</span>
 	%(feedback)s
diff --git a/runestone/dragndrop/js/dragndrop.js b/runestone/dragndrop/js/dragndrop.js
index bf7cfaa2e..32d836b1f 100644
--- a/runestone/dragndrop/js/dragndrop.js
+++ b/runestone/dragndrop/js/dragndrop.js
@@ -361,15 +361,18 @@ DragNDrop.prototype.renderFeedback = function () {
     if (!this.feedBackDiv) {
         this.renderFeedbackDiv();
     }
+    $(this.containerDiv).attr("aria-describedby", this.feedBackDiv.id);
     this.feedBackDiv.style.display = "block";
     var msgCorrect = $.i18n("msg_dragndrop_correct_answer");
     var msgIncorrect = $.i18n($.i18n("msg_dragndrop_incorrect_answer"), this.correctNum, this.incorrectNum, this.dragNum, this.unansweredNum);
     if (this.correct) {
         $(this.feedBackDiv).html(msgCorrect);
         $(this.feedBackDiv).attr("class", "alert alert-success draggable-feedback");
+         $(this.feedBackDiv).attr("role", "alert");
     } else {
         $(this.feedBackDiv).html(msgIncorrect + " " + this.feedback);
         $(this.feedBackDiv).attr("class", "alert alert-danger draggable-feedback");
+        $(this.feedBackDiv).attr("role", "alert");
     }
 };
 /*===================================
diff --git a/runestone/fitb/fitb.py b/runestone/fitb/fitb.py
index fddc50836..81110043d 100644
--- a/runestone/fitb/fitb.py
+++ b/runestone/fitb/fitb.py
@@ -134,8 +134,8 @@ def run(self):
         <div class="%(divclass)s fitb-question">
         <div class="image-background"></div>
         <div class="petlja-problem-box-icon-holder"> </div>
-        <img src="../_static/img/%(questionType)s-img.svg" class="petlja-problem-image  %(questionType)s-image" /> 
-        <img src="../_static/img/qchoice-img.svg" class="petlja-problem-image-quiz  qchoice-image" /> 
+        <img src="../_static/img/%(questionType)s-img.svg" alt="questionmark-icon" class="petlja-problem-image  %(questionType)s-image" /> 
+        <img src="../_static/img/qchoice-img.svg" alt="questionmark-icon" class="petlja-problem-image-quiz  qchoice-image" /> 
         
         <div data-component="fillintheblank" id="%(divid)s">
             '''
diff --git a/runestone/fitb/js/fitb.js b/runestone/fitb/js/fitb.js
index 2a28a2151..f6a0bfa1f 100644
--- a/runestone/fitb/js/fitb.js
+++ b/runestone/fitb/js/fitb.js
@@ -75,6 +75,9 @@ FITB.prototype.renderFITBInput = function () {
     // Set the class for the text inputs, then store references to them.
     let ba = $(this.containerDiv).find(':input');
     ba.attr('class', 'form form-control selectwidthauto');
+    ba.each((index, input) => {
+        $(input).attr('id', this.divid + "_input_" + index);
+    });
     this.blankArray = ba.toArray();
 };
 
@@ -257,6 +260,13 @@ FITB.prototype.isCompletelyBlank = function () {
 };
 
 FITB.prototype.renderFITBFeedback = function () {
+    
+    $(this.feedBackDiv).attr("role", "alert");
+
+    for (var j = 0; j < this.blankArray.length; j++) {
+        $(this.blankArray[j]).attr("aria-describedby", this.feedBackDiv.id);
+    }
+    
     if (this.correct) {
         $(this.feedBackDiv).attr("class", "alert alert-success");
         for (var j = 0; j < this.blankArray.length; j++) {