diff --git a/question/questiontypes/multichoice/display.html b/question/questiontypes/multichoice/display.html
index 04482ce2f51..0fddc3f8c86 100644
--- a/question/questiontypes/multichoice/display.html
+++ b/question/questiontypes/multichoice/display.html
@@ -6,7 +6,7 @@
   <img class="qimage" src="<?php echo $q->imageurl; ?>" alt="" />
 <?php } ?>
 
-<div class="ablock">
+<div class="ablock clearfix">
   <div class="prompt">
     <?php echo $answerprompt; ?>
   </div>
diff --git a/question/questiontypes/question.html b/question/questiontypes/question.html
index 2c6d61a5c29..83b73a280ec 100644
--- a/question/questiontypes/question.html
+++ b/question/questiontypes/question.html
@@ -18,8 +18,10 @@
   </div>
   <div class="grading">
     <?php $this->print_question_grading_details($question, $state, $cmoptions, $options); ?>
-  </div>
-  <div class="history">
-    <?php echo $history; ?>
-  </div>
-</td></tr></table>
\ No newline at end of file
+	</div>
+	<?php if ($history) { ?>
+		<div class="history">
+			<?php echo $history; ?>
+		</div>
+	<?php } ?>
+</td></tr></table>
diff --git a/question/questiontypes/shortanswer/display.html b/question/questiontypes/shortanswer/display.html
index 90c0cf0bd25..811f0673a03 100644
--- a/question/questiontypes/shortanswer/display.html
+++ b/question/questiontypes/shortanswer/display.html
@@ -6,7 +6,7 @@
   <img class="qimage" src="<?php echo $q->imageurl; ?>" alt="" />
 <?php } ?>
 
-<div class="ablock">
+<div class="ablock clearfix">
   <div class="prompt">
     <?php echo get_string("answer", "quiz").': '; ?>
   </div>
@@ -14,17 +14,16 @@
   <div class="answer">
     <input type="text" <?php echo "$readonly $inputname $value"; ?> size="80"/>
   </div>
+  <?php if ($feedback) { ?>
+    <div class="feedback">
+      <?php echo $feedback ?>
+    </div>
+  <?php } ?>
   <?php $this->print_question_submit_buttons($question, $state, $cmoptions, $options); ?>
 </div>
 
-<?php if ($feedback) { ?>
-  <div class="feedback">
-    <?php echo $feedback ?>
-  </div>
-<?php } ?>
-
 <?php if ($correctanswer) { ?>
-  <div class="correct">
+	<div class="correctness correct">
     <?php echo get_string('correctis', 'quiz', $correctanswer) ?>
   </div>
 <?php } ?>
diff --git a/question/questiontypes/truefalse/display.html b/question/questiontypes/truefalse/display.html
index b375e00bb0d..10ec788967b 100644
--- a/question/questiontypes/truefalse/display.html
+++ b/question/questiontypes/truefalse/display.html
@@ -6,7 +6,7 @@
   <img class="qimage" src="<?php echo $q->imageurl; ?>" alt="" />
 <?php } ?>
 
-<div class="ablock">
+<div class="ablock clearfix">
   <div class="prompt">
     <?php print_string('answer', 'quiz') ?>: 
   </div>
@@ -18,14 +18,13 @@
     <span <?php echo $falseclass; ?>>
         <?php echo $radiofalse ?>
     </span>
-    <?php $this->print_question_submit_buttons($question, $state, $cmoptions, $options); ?>
   </div>
+	<?php if ($feedback) { ?>
+		<div class="feedback">
+			<?php echo $feedback ?>
+		</div>
+	<?php } ?>
+	<?php $this->print_question_submit_buttons($question, $state, $cmoptions, $options); ?>
 </div>
 
-<?php if ($feedback) { ?>
-  <div class="feedback">
-    <?php echo $feedback ?>
-  </div>
-<?php } ?>
-
 </div>