From 3e3166a00927bef4c9ee089601e888f8be12482b Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Mon, 6 Jan 2020 13:09:38 +0500
Subject: [PATCH 01/27] span changed to button for MCQs and Multi-rating
 questions to make them accessible.

---
 problem_builder/public/css/questionnaire.css    | 4 +++-
 problem_builder/public/js/questionnaire.js      | 3 ++-
 problem_builder/templates/html/mcqblock.html    | 4 ++--
 problem_builder/templates/html/ratingblock.html | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 32367f6f..5553a49b 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -12,7 +12,9 @@
     width: 34px;
     vertical-align: top;
     cursor: pointer;
-    float: none;
+    border: 0;
+    padding: 0;
+    background: 0 0;
 }
 
 .mentoring .questionnaire .feedback {
diff --git a/problem_builder/public/js/questionnaire.js b/problem_builder/public/js/questionnaire.js
index 9550ed46..4b3d96de 100644
--- a/problem_builder/public/js/questionnaire.js
+++ b/problem_builder/public/js/questionnaire.js
@@ -131,6 +131,7 @@ function MCQBlock(runtime, element) {
 
             // We're showing previous answers, so go ahead and display results as well
             if (choiceInputDOM.prop('checked')) {
+                choiceResultDOM.find('span.sr-only').remove();
                 display_message(result.message, messageView, options.checkmark);
                 if (result.status === "correct") {
                     choiceDOM.addClass('correct');
@@ -230,7 +231,7 @@ function MRQBlock(runtime, element) {
                 var choiceDOM = choiceInputDOM.closest('.choice');
                 var choiceResultDOM = $('.choice-result', choiceDOM);
                 var choiceTipsDOM = $('.choice-tips', choiceDOM);
-
+                choiceResultDOM.find('span.sr-only').remove();
                 /* show hint if checked or max_attempts is disabled */
                 if (!hide_results &&
                     (result.completed || choiceInputDOM.prop('checked') || options.max_attempts <= 0)) {
diff --git a/problem_builder/templates/html/mcqblock.html b/problem_builder/templates/html/mcqblock.html
index b7804ffe..c8268aa4 100644
--- a/problem_builder/templates/html/mcqblock.html
+++ b/problem_builder/templates/html/mcqblock.html
@@ -10,10 +10,10 @@ <h4 class="question-title" id="heading_{{ self.html_id }}">{{ self.display_name_
       <label class="choice-label"
              for="{{ self.html_id }}_{{ forloop.counter }}"
              aria-describedby="feedback_{{ self.html_id }} choice_tips_{{ self.html_id }}-{{ forloop.counter }}">
-        <span class="choice-result fa icon-2x"
+        <button class="choice-result fa icon-2x"
               aria-label=""
               data-label_correct="{% trans "Correct" %}"
-              data-label_incorrect="{% trans "Incorrect" %}"></span>
+              data-label_incorrect="{% trans "Incorrect" %}"></button>
         <span class="choice-selector">
           <input type="radio" name="{{ self.name }}" value="{{ choice.value }}"
             id="{{ self.html_id }}_{{ forloop.counter }}"
diff --git a/problem_builder/templates/html/ratingblock.html b/problem_builder/templates/html/ratingblock.html
index 78e9be98..23896750 100644
--- a/problem_builder/templates/html/ratingblock.html
+++ b/problem_builder/templates/html/ratingblock.html
@@ -9,8 +9,8 @@ <h4 class="question-title" id="heading_{{ self.html_id }}">{{ self.display_name_
     <div class="choice" aria-live="polite" aria-atomic="true">
       <label class="choice-label"
              aria-describedby="feedback_{{ self.html_id }} choice_tips_{{ self.html_id }}-{{ i }}">
-        <span class="choice-result fa icon-2x" aria-label=""
-              data-label_correct="{% trans "Correct" %}" data-label_incorrect="{% trans "Incorrect" %}"></span>
+        <button class="choice-result fa icon-2x" aria-label=""
+              data-label_correct="{% trans "Correct" %}" data-label_incorrect="{% trans "Incorrect" %}"></button>
         <span class="choice-selector">
           <input type="radio" name="{{ self.name }}" value="{{i}}"
             {% if self.student_choice == i and not hide_prev_answer %} checked{%else%} data-student-choice='{{self.student_choice}}'{% endif %}
@@ -32,8 +32,8 @@ <h4 class="question-title" id="heading_{{ self.html_id }}">{{ self.display_name_
     <div class="choice" aria-live="polite" aria-atomic="true">
       <label class="choice-label"
              aria-describedby="feedback_{{ self.html_id }} choice_tips_{{ self.html_id }}-{{ forloop.counter }}">
-        <span class="choice-result fa icon-2x" aria-label=""
-              data-label_correct="{% trans "Correct" %}" data-label_incorrect="{% trans "Incorrect" %}"></span>
+        <button class="choice-result fa icon-2x" aria-label=""
+              data-label_correct="{% trans "Correct" %}" data-label_incorrect="{% trans "Incorrect" %}"></button>
         <span class="choice-selector">
           <input type="radio" name="{{ self.name }}" value="{{ choice.value }}"
             {% if self.student_choice == choice.value and not hide_prev_answer %} checked{%else%} data-student-choice='{{self.student_choice}}'{% endif %}

From 89c585f7513de7cfb851b2285cd1d64cc5a2e628 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Mon, 6 Jan 2020 13:11:29 +0500
Subject: [PATCH 02/27] version changed

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e1b79596..8ff3d4b2 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
 
 # Constants #########################################################
 
-VERSION = '3.4.4'
+VERSION = '3.4.5'
 
 # Functions #########################################################
 

From dd3b4f89f4d8d3a77c9f81e12f8b66066fb78f3d Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Thu, 9 Jan 2020 15:45:58 +0500
Subject: [PATCH 03/27] Accessibility: Overall checkmark made accessible via
 keyboard

---
 problem_builder/templates/html/mentoring_with_steps.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/problem_builder/templates/html/mentoring_with_steps.html b/problem_builder/templates/html/mentoring_with_steps.html
index 19a1ce10..ffdfa008 100644
--- a/problem_builder/templates/html/mentoring_with_steps.html
+++ b/problem_builder/templates/html/mentoring_with_steps.html
@@ -14,9 +14,9 @@ <h3>{{ title }}</h3>
     {% endfor %}
 
     <div class="submit">
-      <span class="step-overall-checkmark fa icon-2x fa-fw" aria-label=""
+      <button class="step-overall-checkmark fa icon-2x fa-fw" aria-label=""
           data-label_correct="{% trans "Correct" %}" data-label_incorrect="{% trans "Incorrect" %}"
-          data-label_partial="{% trans "Partially correct" %}"></span>
+          data-label_partial="{% trans "Partially correct" %}"></button>
       <input type="button" class="input-main" value="{% trans "Submit" %}" disabled="disabled" />
       <input type="button" class="input-next" value="{% trans "Next Step" %}" disabled="disabled" />
       <input type="button" class="input-review" value="{% trans "Review grade" %}" disabled="disabled" />

From ba7cce5f4124bfab64e807695fffa6c61d2eeff6 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Thu, 9 Jan 2020 15:47:10 +0500
Subject: [PATCH 04/27] version updated

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e1b79596..8ff3d4b2 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
 
 # Constants #########################################################
 
-VERSION = '3.4.4'
+VERSION = '3.4.5'
 
 # Functions #########################################################
 

From 9142dd070eea26bd246530911cf867ab7745590b Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Wed, 15 Jan 2020 16:45:03 +0500
Subject: [PATCH 05/27] style fix for step-overall-checkmark

---
 problem_builder/public/css/questionnaire.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 18550a04..3bf66a6b 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -141,3 +141,9 @@
     right: auto;
     left: 3px;
 }
+
+.assessment-question-block .submit button.step-overall-checkmark {
+    border: 0;
+    padding: 0;
+    background: 0 0;
+}

From 22e3fe1af956beb0f74fffdd2a299cbf9b52523c Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Thu, 16 Jan 2020 16:48:09 +0500
Subject: [PATCH 06/27] padding added

---
 problem_builder/public/css/questionnaire.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 3bf66a6b..23387fea 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -145,5 +145,6 @@
 .assessment-question-block .submit button.step-overall-checkmark {
     border: 0;
     padding: 0;
-    background: 0 0;
+    background: none;
+    padding-top: 4px;
 }

From 8ba4a7233937a63261292c37838d8eb532098efe Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Fri, 17 Jan 2020 19:04:57 +0500
Subject: [PATCH 07/27] padding removed

---
 problem_builder/public/css/questionnaire.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 23387fea..09372cab 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -146,5 +146,4 @@
     border: 0;
     padding: 0;
     background: none;
-    padding-top: 4px;
 }

From 194394cfd748875c2fb1d6b2a648914238461c19 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Tue, 21 Jan 2020 11:55:50 +0500
Subject: [PATCH 08/27] shadow removed

---
 problem_builder/public/css/questionnaire.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 09372cab..218827f1 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -146,4 +146,5 @@
     border: 0;
     padding: 0;
     background: none;
+    box-shadow: none !important;
 }

From 4c1dc83e5737292eeb68bddeb81f25b27e92837c Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Tue, 21 Jan 2020 11:56:58 +0500
Subject: [PATCH 09/27] outline removed

---
 problem_builder/public/css/questionnaire.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 218827f1..93a2d957 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -147,4 +147,5 @@
     padding: 0;
     background: none;
     box-shadow: none !important;
+    outline: none;
 }

From a29dc6c7d89687c534c3b9eb35f2f3f6b07b9665 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Tue, 21 Jan 2020 13:12:32 +0500
Subject: [PATCH 10/27] shadow removed

---
 problem_builder/public/css/questionnaire.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 8febdcfb..d4368c90 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -15,6 +15,8 @@
     border: 0;
     padding: 0;
     background: 0 0;
+    outline: none;
+    box-shadow: none !important;
 }
 
 .mentoring .questionnaire .feedback {

From f17f4d9aa8f14148b328bc0b4e2b56487b9edc08 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Wed, 22 Jan 2020 11:41:07 +0500
Subject: [PATCH 11/27] outline added

---
 problem_builder/public/css/questionnaire.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index d4368c90..d443c2be 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -15,7 +15,6 @@
     border: 0;
     padding: 0;
     background: 0 0;
-    outline: none;
     box-shadow: none !important;
 }
 

From f8a2daa2e027761f079efbfb6470cc2d53a6fb32 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Wed, 22 Jan 2020 11:41:43 +0500
Subject: [PATCH 12/27] outline removed

---
 problem_builder/public/css/questionnaire.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 93a2d957..218827f1 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -147,5 +147,4 @@
     padding: 0;
     background: none;
     box-shadow: none !important;
-    outline: none;
 }

From 83824ac9983130b241cd993acac9895699d75cf6 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Wed, 22 Jan 2020 20:43:29 +0500
Subject: [PATCH 13/27] Style refinement

---
 problem_builder/public/css/problem-builder.css | 14 +++++++++-----
 problem_builder/public/css/questionnaire.css   | 16 +++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/problem_builder/public/css/problem-builder.css b/problem_builder/public/css/problem-builder.css
index a4bc5a11..b8961634 100644
--- a/problem_builder/public/css/problem-builder.css
+++ b/problem_builder/public/css/problem-builder.css
@@ -139,8 +139,8 @@
 }
 
 .mentoring .choice-label {
-    display: table-cell;
-    vertical-align: middle;
+    /*display: table-cell;*/
+    /*vertical-align: middle;*/
 }
 
 .mentoring .choice-label span.low {
@@ -162,7 +162,6 @@
 .mentoring .choice.incorrect .choice-tips-container.active {
     border-color: #c1373f;
 }
-
 .mentoring .choice-result::before {
     content: "";
     display: block;
@@ -170,11 +169,16 @@
 }
 
 .mentoring .choice-result {
-    display: block;
-    float: left;
+    display: none !important;
     height: 33.33px;
 }
 
+.mentoring .checkmark-correct,
+.mentoring .checkmark-incorrect{
+    display: inline-block !important;
+    margin: -11px 0 0 -35px;
+}
+
 .mentoring .checkmark-correct::before {
     content: "\f00c";
 }
diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index d443c2be..a7dc7e08 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -8,7 +8,7 @@
 }
 
 .mentoring .questionnaire .choice-result {
-    display: table-cell;
+    display: inline-block;
     width: 34px;
     vertical-align: top;
     cursor: pointer;
@@ -26,15 +26,15 @@
 .mentoring div[data-block-type=pb-mrq] .questionnaire .choice-result {
     display: inline-block;
     padding: 0;
-    margin: 0 5px;
+    /*margin: 0 5px;*/
     background: none;
     border: none;
     outline: none;
 }
 
 .mentoring .questionnaire .choice {
-    overflow-y: hidden;
-    display: table-row;
+    padding: 0 0 0 30px;
+    line-height: 0.5;
 }
 
 .mentoring .questionnaire .choice-result.checkmark-correct,
@@ -109,18 +109,20 @@
 }
 
 .mentoring .choices-list .choice-selector {
-    display: table-cell;
+    display: inline-block;
+    vertical-align: top;
 }
 
 .mentoring .choices-list .choice-label-text {
-    display: table-cell;
+    display: inline-block;
     padding-left: 0.4em;
     padding-right: 0.4em;
+    width: calc(100% - 47px);
 }
 
 .mentoring .choice-tips-container,
 .mentoring .choice-label {
-    display: table-cell;
+    display: inline-block;
     vertical-align: top;
     width: 50%;
 }

From 9c4d7fb8352544618d45980a214d6ceb0dd9f286 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Wed, 22 Jan 2020 22:12:13 +0500
Subject: [PATCH 14/27]  style refined

---
 .../public/css/problem-builder.css            | 24 ++++++++++++-------
 problem_builder/public/css/questionnaire.css  |  7 +++---
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/problem_builder/public/css/problem-builder.css b/problem_builder/public/css/problem-builder.css
index b8961634..7b8c830e 100644
--- a/problem_builder/public/css/problem-builder.css
+++ b/problem_builder/public/css/problem-builder.css
@@ -138,11 +138,6 @@
     vertical-align: top;
 }
 
-.mentoring .choice-label {
-    /*display: table-cell;*/
-    /*vertical-align: middle;*/
-}
-
 .mentoring .choice-label span.low {
     line-height: inherit;
 }
@@ -170,13 +165,23 @@
 
 .mentoring .choice-result {
     display: none !important;
-    height: 33.33px;
+    height: 17px;
 }
 
 .mentoring .checkmark-correct,
-.mentoring .checkmark-incorrect{
+.mentoring .checkmark-incorrect,
+.mentoring .checkmark-partially-correct {
     display: inline-block !important;
-    margin: -11px 0 0 -35px;
+    margin: -7px 0 0 -35px;
+}
+
+.mentoring .sb-review-score .checkmark-correct,
+.mentoring .sb-review-score .checkmark-incorrect,
+.mentoring .sb-review-score .checkmark-partially-correct,
+.mentoring  .submit .checkmark-correct,
+.mentoring  .submit .checkmark-incorrect,
+.mentoring  .submit .checkmark-partially-correct{
+    margin: 0;
 }
 
 .mentoring .checkmark-correct::before {
@@ -247,7 +252,8 @@
 }
 
 .mentoring .results-section {
-    margin-left: 50px;
+    /*margin-left: 50px;*/
+    display: inline-block;
 }
 
 .mentoring .results-section p {
diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index a7dc7e08..9b2b0eb7 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -10,7 +10,7 @@
 .mentoring .questionnaire .choice-result {
     display: inline-block;
     width: 34px;
-    vertical-align: top;
+    vertical-align: middle;
     cursor: pointer;
     border: 0;
     padding: 0;
@@ -35,6 +35,7 @@
 .mentoring .questionnaire .choice {
     padding: 0 0 0 30px;
     line-height: 0.5;
+    clear: both;
 }
 
 .mentoring .questionnaire .choice-result.checkmark-correct,
@@ -110,7 +111,7 @@
 
 .mentoring .choices-list .choice-selector {
     display: inline-block;
-    vertical-align: top;
+    vertical-align: middle;
 }
 
 .mentoring .choices-list .choice-label-text {
@@ -123,7 +124,7 @@
 .mentoring .choice-tips-container,
 .mentoring .choice-label {
     display: inline-block;
-    vertical-align: top;
+    vertical-align: middle;
     width: 50%;
 }
 

From c75913e59329d19e0b42701570878e61f8765430 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Wed, 22 Jan 2020 22:16:17 +0500
Subject: [PATCH 15/27] removed unnecessary code

---
 problem_builder/public/css/problem-builder.css | 2 +-
 problem_builder/public/css/questionnaire.css   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/problem_builder/public/css/problem-builder.css b/problem_builder/public/css/problem-builder.css
index 7b8c830e..dc1a40fb 100644
--- a/problem_builder/public/css/problem-builder.css
+++ b/problem_builder/public/css/problem-builder.css
@@ -157,6 +157,7 @@
 .mentoring .choice.incorrect .choice-tips-container.active {
     border-color: #c1373f;
 }
+
 .mentoring .choice-result::before {
     content: "";
     display: block;
@@ -252,7 +253,6 @@
 }
 
 .mentoring .results-section {
-    /*margin-left: 50px;*/
     display: inline-block;
 }
 
diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 9b2b0eb7..0ad16bab 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -26,7 +26,6 @@
 .mentoring div[data-block-type=pb-mrq] .questionnaire .choice-result {
     display: inline-block;
     padding: 0;
-    /*margin: 0 5px;*/
     background: none;
     border: none;
     outline: none;

From ad3f8834d7805af831d31ab4cade47b3a39bce1e Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Thu, 23 Jan 2020 13:26:45 +0500
Subject: [PATCH 16/27] position issue fixed

---
 problem_builder/public/css/problem-builder.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/problem_builder/public/css/problem-builder.css b/problem_builder/public/css/problem-builder.css
index dc1a40fb..5c9c453c 100644
--- a/problem_builder/public/css/problem-builder.css
+++ b/problem_builder/public/css/problem-builder.css
@@ -143,7 +143,7 @@
 }
 
 .mentoring .choice-tips-container .choice-tips {
-    position: relative;
+    position: absolute;
 }
 
 .mentoring .choice .choice-tips-container.with-tips {

From 909e0e079ef3055afcfb37a8c1008a867c9f3756 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Thu, 23 Jan 2020 17:39:30 +0500
Subject: [PATCH 17/27] ratingblock issue fixed

---
 problem_builder/public/css/problem-builder.css  | 1 +
 problem_builder/public/css/questionnaire.css    | 6 +++++-
 problem_builder/templates/html/ratingblock.html | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/problem_builder/public/css/problem-builder.css b/problem_builder/public/css/problem-builder.css
index 5c9c453c..12fd5db9 100644
--- a/problem_builder/public/css/problem-builder.css
+++ b/problem_builder/public/css/problem-builder.css
@@ -144,6 +144,7 @@
 
 .mentoring .choice-tips-container .choice-tips {
     position: absolute;
+    top: 0;
 }
 
 .mentoring .choice .choice-tips-container.with-tips {
diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 0ad16bab..40f07bc0 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -110,11 +110,12 @@
 
 .mentoring .choices-list .choice-selector {
     display: inline-block;
-    vertical-align: middle;
+    vertical-align: top;
 }
 
 .mentoring .choices-list .choice-label-text {
     display: inline-block;
+    vertical-align: middle;
     padding-left: 0.4em;
     padding-right: 0.4em;
     width: calc(100% - 47px);
@@ -127,6 +128,9 @@
     width: 50%;
 }
 
+.mentoring  .choice-tips{ top: 0 !important;}
+
+
 /*RTL Specified CSS*/
 
 .rtl .mentoring .questionnaire .choice-tips,
diff --git a/problem_builder/templates/html/ratingblock.html b/problem_builder/templates/html/ratingblock.html
index 23896750..8c05a6b2 100644
--- a/problem_builder/templates/html/ratingblock.html
+++ b/problem_builder/templates/html/ratingblock.html
@@ -8,11 +8,12 @@ <h4 class="question-title" id="heading_{{ self.html_id }}">{{ self.display_name_
     {% for i in '12345' %}
     <div class="choice" aria-live="polite" aria-atomic="true">
       <label class="choice-label"
+             for = "{{ i }}radio"
              aria-describedby="feedback_{{ self.html_id }} choice_tips_{{ self.html_id }}-{{ i }}">
         <button class="choice-result fa icon-2x" aria-label=""
               data-label_correct="{% trans "Correct" %}" data-label_incorrect="{% trans "Incorrect" %}"></button>
         <span class="choice-selector">
-          <input type="radio" name="{{ self.name }}" value="{{i}}"
+          <input type="radio" id="{{ i }}radio" name="{{ self.name }}" value="{{i}}"
             {% if self.student_choice == i and not hide_prev_answer %} checked{%else%} data-student-choice='{{self.student_choice}}'{% endif %}
           />
         </span>

From fe6c469523757f9de2003ea7821b195bd02eac7e Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Fri, 24 Jan 2020 17:11:52 +0500
Subject: [PATCH 18/27] Tip positioning have been fixed.

---
 problem_builder/public/css/problem-builder.css |  5 -----
 problem_builder/public/css/questionnaire.css   | 11 +++++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/problem_builder/public/css/problem-builder.css b/problem_builder/public/css/problem-builder.css
index 12fd5db9..cc5cc80e 100644
--- a/problem_builder/public/css/problem-builder.css
+++ b/problem_builder/public/css/problem-builder.css
@@ -142,11 +142,6 @@
     line-height: inherit;
 }
 
-.mentoring .choice-tips-container .choice-tips {
-    position: absolute;
-    top: 0;
-}
-
 .mentoring .choice .choice-tips-container.with-tips {
     border-left: 2px solid #ddd;
 }
diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 40f07bc0..3ec4e087 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -33,7 +33,7 @@
 
 .mentoring .questionnaire .choice {
     padding: 0 0 0 30px;
-    line-height: 0.5;
+    /*line-height: 0.5;*/
     clear: both;
 }
 
@@ -47,7 +47,7 @@
 .mentoring .questionnaire .feedback {
     display: none;
     color: #3c3c3c;
-    position: absolute;
+    position: static;
     top: 0;
     right: 0;
     background: transparent;
@@ -55,7 +55,7 @@
     font-size: 14px;
     padding: 0 20px;
     width: 300px;
-    min-height: 40px;
+    min-height: 33px;
     max-height: 180px;
     z-index: 10000;
 }
@@ -120,12 +120,15 @@
     padding-right: 0.4em;
     width: calc(100% - 47px);
 }
-
+.mentoring .choice-tips-container{
+    width: calc(50% - 10px) !important;
+}
 .mentoring .choice-tips-container,
 .mentoring .choice-label {
     display: inline-block;
     vertical-align: middle;
     width: 50%;
+    min-height: 33px;
 }
 
 .mentoring  .choice-tips{ top: 0 !important;}

From a67015aae985daf9563f964e0fa53e765d61ebfe Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Fri, 24 Jan 2020 17:42:35 +0500
Subject: [PATCH 19/27] Tip positioning have been fixed.

---
 problem_builder/public/css/questionnaire.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 3ec4e087..16ec5b8d 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -86,6 +86,7 @@
 .mentoring .questionnaire .choice-tips p,
 .mentoring .questionnaire .feedback p {
     color: #3c3c3c;
+    margin: 5px 0;
 }
 
 .mentoring .questionnaire .choice-tips .close,

From 9cb2eb6d532d2a7458755f96132000dbe69acbb6 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Thu, 9 Jan 2020 15:45:58 +0500
Subject: [PATCH 20/27] Accessibility: Overall checkmark made accessible via
 keyboard

---
 problem_builder/templates/html/mentoring_with_steps.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/problem_builder/templates/html/mentoring_with_steps.html b/problem_builder/templates/html/mentoring_with_steps.html
index 19a1ce10..ffdfa008 100644
--- a/problem_builder/templates/html/mentoring_with_steps.html
+++ b/problem_builder/templates/html/mentoring_with_steps.html
@@ -14,9 +14,9 @@ <h3>{{ title }}</h3>
     {% endfor %}
 
     <div class="submit">
-      <span class="step-overall-checkmark fa icon-2x fa-fw" aria-label=""
+      <button class="step-overall-checkmark fa icon-2x fa-fw" aria-label=""
           data-label_correct="{% trans "Correct" %}" data-label_incorrect="{% trans "Incorrect" %}"
-          data-label_partial="{% trans "Partially correct" %}"></span>
+          data-label_partial="{% trans "Partially correct" %}"></button>
       <input type="button" class="input-main" value="{% trans "Submit" %}" disabled="disabled" />
       <input type="button" class="input-next" value="{% trans "Next Step" %}" disabled="disabled" />
       <input type="button" class="input-review" value="{% trans "Review grade" %}" disabled="disabled" />

From d8a49f2e5cf9bf4d1987dc6ae67fbd293dc203a9 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Wed, 15 Jan 2020 16:45:03 +0500
Subject: [PATCH 21/27] style fix for step-overall-checkmark

---
 problem_builder/public/css/questionnaire.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 16ec5b8d..cbd3d18b 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -154,3 +154,9 @@
     right: auto;
     left: 3px;
 }
+
+.assessment-question-block .submit button.step-overall-checkmark {
+    border: 0;
+    padding: 0;
+    background: 0 0;
+}

From aea56ef9463fcb98cb4aee7ba6bea9e9f84d2588 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Thu, 16 Jan 2020 16:48:09 +0500
Subject: [PATCH 22/27] padding added

---
 problem_builder/public/css/questionnaire.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index cbd3d18b..2931917d 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -158,5 +158,6 @@
 .assessment-question-block .submit button.step-overall-checkmark {
     border: 0;
     padding: 0;
-    background: 0 0;
+    background: none;
+    padding-top: 4px;
 }

From 5b9011b2971641ccb95955cb3a5023b0774ffeca Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Fri, 17 Jan 2020 19:04:57 +0500
Subject: [PATCH 23/27] padding removed

---
 problem_builder/public/css/questionnaire.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 2931917d..877fe1c9 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -159,5 +159,4 @@
     border: 0;
     padding: 0;
     background: none;
-    padding-top: 4px;
 }

From bfcb5b02dc6875dc87585130eb943a47104329a9 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Tue, 21 Jan 2020 11:55:50 +0500
Subject: [PATCH 24/27] shadow removed

---
 problem_builder/public/css/questionnaire.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 877fe1c9..d99dd3d0 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -159,4 +159,5 @@
     border: 0;
     padding: 0;
     background: none;
+    box-shadow: none !important;
 }

From b5fd90f47286df1b5a4b35cf87acfb4d97a538da Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Tue, 21 Jan 2020 11:56:58 +0500
Subject: [PATCH 25/27] outline removed

---
 problem_builder/public/css/questionnaire.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index d99dd3d0..9507f8d9 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -160,4 +160,5 @@
     padding: 0;
     background: none;
     box-shadow: none !important;
+    outline: none;
 }

From db6c05e246b0ad6eaf2e685b9e00934ffbfd0aee Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Wed, 22 Jan 2020 11:41:43 +0500
Subject: [PATCH 26/27] outline removed

---
 problem_builder/public/css/questionnaire.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/problem_builder/public/css/questionnaire.css b/problem_builder/public/css/questionnaire.css
index 9507f8d9..d99dd3d0 100644
--- a/problem_builder/public/css/questionnaire.css
+++ b/problem_builder/public/css/questionnaire.css
@@ -160,5 +160,4 @@
     padding: 0;
     background: none;
     box-shadow: none !important;
-    outline: none;
 }

From 7d178f8cbe5a105e9cf15ae0cd1cbf992aa13091 Mon Sep 17 00:00:00 2001
From: Muhammad Usman <m.usman@arbisoft.com>
Date: Fri, 24 Jan 2020 23:28:54 +0500
Subject: [PATCH 27/27] version updated

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index bccd6021..392cc659 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
 
 # Constants #########################################################
 
-VERSION = '3.4.8'
+VERSION = '3.4.9'
 
 # Functions #########################################################