diff --git a/webgoat-lessons/sql-injection/src/main/resources/html/SqlInjectionAdvanced.html b/webgoat-lessons/sql-injection/src/main/resources/html/SqlInjectionAdvanced.html
index 2c7e43b35..b4d883c50 100644
--- a/webgoat-lessons/sql-injection/src/main/resources/html/SqlInjectionAdvanced.html
+++ b/webgoat-lessons/sql-injection/src/main/resources/html/SqlInjectionAdvanced.html
@@ -54,7 +54,6 @@
     </div>
 </div>
 
-
 <div class="lesson-page-wrapper">
     <div class="adoc-content" th:replace="doc:SqlInjection_content6c.adoc"></div>
 </div>
@@ -161,23 +160,26 @@
         <div class="attack-output"></div>
     </div>
 </div>
+
 <div class="lesson-page-wrapper">
     <script th:src="@{/lesson_js/quiz.js}" language="JavaScript"></script>
     <link rel="import" type="application/json" th:href="@{/lesson_js/questions.json}"/>
     <div class="adoc-content" th:replace="doc:SqlInjection_quiz.adoc"></div>
-        <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
-        <div class="container-fluid">
-            <form id="quiz-form" class="attack-form" accept-charset="UNKNOWN"
-                  method="POST" name="form"
-                  action="SqlInjection/quiz"
-                  enctype="application/json;charset=UTF-8" role="form">
-            <div id="q_container"></div>
-                <br />
-            <input name="Quiz_solutions" value="Submit answers" type="SUBMIT"/>
-            </form>
+        <div class="attack-container">
+            <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
+            <div class="container-fluid">
+                <form id="quiz-form" class="attack-form" accept-charset="UNKNOWN"
+                      method="POST" name="form"
+                      action="SqlInjection/quiz"
+                      enctype="application/json;charset=UTF-8" role="form">
+                <div id="q_container"></div>
+                    <br />
+                <input name="Quiz_solutions" value="Submit answers" type="SUBMIT"/>
+                </form>
+            </div>
+            <div class="attack-feedback"></div>
+            <div class="attack-output"></div>
         </div>
-        <div class="attack-feedback"></div>
-        <div class="attack-output"></div>
 </div>
 
 
diff --git a/webgoat-lessons/sql-injection/src/main/resources/html/SqlInjectionMitigations.html b/webgoat-lessons/sql-injection/src/main/resources/html/SqlInjectionMitigations.html
index 021c7c468..e428f3335 100644
--- a/webgoat-lessons/sql-injection/src/main/resources/html/SqlInjectionMitigations.html
+++ b/webgoat-lessons/sql-injection/src/main/resources/html/SqlInjectionMitigations.html
@@ -34,9 +34,9 @@
                 <button type="submit" class="btn btn-primary">Submit</button>
             </div>
         </form>
+        <div class="attack-feedback"></div>
+        <div class="attack-output"></div>
     </div>
-    <div class="attack-feedback"></div>
-    <div class="attack-output"></div>
 </div>
 
 <div class="lesson-page-wrapper">
@@ -58,9 +58,9 @@
                 <button type="button" class="btn btn-primary" style="margin-top: 350%; margin-left: 60%;" onclick="ace_collect()">Submit</button>
             </div>
         </form>
+        <div class="attack-feedback"></div>
+        <div class="attack-output"></div>
     </div>
-    <div class="attack-feedback"></div>
-    <div class="attack-output"></div>
 </div>
 
 <div class="lesson-page-wrapper">
diff --git a/webgoat-lessons/sql-injection/src/main/resources/js/quiz.js b/webgoat-lessons/sql-injection/src/main/resources/js/quiz.js
index f2953165b..32fdaf41b 100644
--- a/webgoat-lessons/sql-injection/src/main/resources/js/quiz.js
+++ b/webgoat-lessons/sql-injection/src/main/resources/js/quiz.js
@@ -11,7 +11,7 @@ $(function () {
             let html = "";
             jQuery.each(questionsObj, function(i, obj) {
                 jQuery.each(obj, function(j, quest) {
-                  html += "<div id='question_" + j + "' class='quiz_question attack-container' name='question'><p>" + (j+1) + ".&nbsp;" + quest.text + "</p>";
+                  html += "<div id='question_" + j + "' class='quiz_question' name='question' style='border: solid 1px; padding: 4px; margin: 5px 2px 5px 2px'><p>" + (j+1) + ".&nbsp;" + quest.text + "</p>";
                   html += "<fieldset>";
                   jQuery.each(quest.solutions, function(k, solution) {
                     solution = "Solution " + k + ": " + solution;