Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -raaf6976b59bb85f699b14913f305574cc3ad2e9b -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision aaf6976b59bb85f699b14913f305574cc3ad2e9b)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -89,6 +89,7 @@
 label.authoring.true.false.true  =True
 label.authoring.true.false.feedback.on.true  =Feedback for the response 'True'.
 label.authoring.true.false.feedback.on.false  =Feedback for the response 'False'.
+label.authoring.true.false.add.true.false  =Add True/False
 label.authoring.numerical.question  =Numerical question
 label.authoring.numerical.answers  =Answers
 label.authoring.numerical.units  =Units
@@ -175,6 +176,7 @@
 label.learning.summary.minutes  =minutes
 label.learning.summary.grade  =Grade
 label.learning.summary.out.of.maximum  =out of a maximum of
+label.learning.summary.feedback  =Feedback
 monitoring.tab.summary  =Summary
 monitoring.tab.instructions  =Instruction
 monitoring.tab.statistics  =Statistic
Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -117,6 +117,7 @@
    answer_string text,
    answer_float float,
    answer_boolean boolean,
+   submitted_option_uid bigint,
    mark float,
    penalty float,
    primary key (uid)
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
diff -u -rb97c9857551b67fbe95d700328a8316c7ba42bf5 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision b97c9857551b67fbe95d700328a8316c7ba42bf5)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -88,14 +88,14 @@
     private Set<AssessmentUnit> units;
     
     // DTO fields:
-    private boolean complete;
-    
     private String answerString;
     
     private float answerFloat;
     
     private boolean answerBoolean;
     
+    private String questionFeedback;
+    
     private float mark;
     
     private float penalty;
@@ -444,13 +444,6 @@
 	this.units = units;
     }
     
-    public void setComplete(boolean complete) {
-	this.complete = complete;
-    }
-    public boolean isComplete() {
-	return complete;
-    }
-    
     public String getAnswerString() {
 	return answerString;
     }
@@ -472,6 +465,13 @@
 	this.answerBoolean = answerBoolean;
     }   
     
+    public void setQuestionFeedback(String questionFeedback) {
+	this.questionFeedback = questionFeedback;
+    }
+    public String getQuestionFeedback() {
+	return questionFeedback;
+    }
+    
     public Float getMark() {
 	return mark;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	(.../AssessmentQuestionResult.hbm.xml)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	(.../AssessmentQuestionResult.hbm.xml)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -68,6 +68,14 @@
         />
 
         <property
+            name="submittedOptionUid"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="submitted_option_uid"
+        />
+
+        <property
             name="mark"
             type="java.lang.Float"
             update="true"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -45,6 +45,7 @@
     private String answerString;
     private float answerFloat;
     private boolean answerBoolean;
+    private Long submittedOptionUid;    
     private float mark;
     private float penalty;
     private Set<AssessmentOptionAnswer> optionAnswers;
@@ -130,6 +131,19 @@
     }
     
     /**
+     * @hibernate.property column="submitted_option_uid"
+     * 
+     * @return Returns submittedOptionUid.
+     */
+    public Long getSubmittedOptionUid() {
+	return submittedOptionUid;
+    }
+
+    public void setSubmittedOptionUid(Long submittedOptionUid) {
+	this.submittedOptionUid = submittedOptionUid;
+    }
+    
+    /**
      * @hibernate.property column="mark"
      * 
      * @return Returns the mark.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -497,8 +497,7 @@
 		
 		if (isAnswerCorrect) {
 		    mark = option.getGrade()*maxMark;
-		    //for display purposes
-		    option.setAnswerBoolean(true);
+		    questionResult.setSubmittedOptionUid(option.getUid());
 		    break;
 		}
 	    }
@@ -509,15 +508,14 @@
 		    if ((answerFloat >= (option.getOptionFloat() - option.getAcceptedError()))
 			    && (answerFloat <= (option.getOptionFloat() + option.getAcceptedError()))) {
 			mark = option.getGrade() * maxMark;
-			//for display purposes
-			option.setAnswerBoolean(true);
+			questionResult.setSubmittedOptionUid(option.getUid());
 			break;
 		    }
 		}
 	    } catch (Exception e) {
 	    }
 	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_TRUE_FALSE) {
-	    if (question.getAnswerBoolean() == question.getCorrectAnswer()) {
+	    if ((question.getAnswerBoolean() == question.getCorrectAnswer()) && (question.getAnswerString() != null)) {
 		mark = maxMark;
 	    }
 	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r5ea7ebf8f81afa191dd6d761db613896ad530b4d -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 5ea7ebf8f81afa191dd6d761db613896ad530b4d)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -1214,7 +1214,7 @@
 	} else if ((type == AssessmentConstants.QUESTION_TYPE_NUMERICAL)) {
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	} else if ((type == AssessmentConstants.QUESTION_TYPE_TRUE_FALSE)) {
-	    question.setPenaltyFactor(1);
+	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	    question.setCorrectAnswer(questionForm.isCorrectAnswer());
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
 	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());	    
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -659,11 +659,6 @@
 		String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
 		question.setAnswerString(answerString);
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING) {
-//		for (AssessmentQuestionOption option : question.getQuestionOptions()) {
-//		    int statusIndex = WebUtil.readIntParam(request, AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_"
-//			    + option.getSequenceId());
-//		    option.setAnswerInt(statusIndex);
-//		}
 	    }
 	}
     }
@@ -682,6 +677,14 @@
 		    if (question.getUid().equals(questionResult.getAssessmentQuestion().getUid())) {
 			question.setMark(questionResult.getMark());
 			question.setPenalty(questionResult.getPenalty());
+			
+			question.setQuestionFeedback(null);
+			for (AssessmentQuestionOption questionOption : question.getQuestionOptions()) {
+			    if (questionOption.getUid().equals(questionResult.getSubmittedOptionUid())) {
+				question.setQuestionFeedback(questionOption.getFeedback());
+				break;
+			    }
+			}
 		    }
 		}		
 	    }
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -r988d9fce322beaf579b828d5694f2260bbc17b51 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 988d9fce322beaf579b828d5694f2260bbc17b51)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -27,13 +27,21 @@
 		    			defaultGrade: {
 		    			      required: true,
 		    			      digits: true
+		    			},
+		    			penaltyFactor: {
+		    			      required: true,
+		    			      number: true
 		    			}
 		    		},
 		    		messages: {
 		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    			defaultGrade: {
 		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+		    			},
+		    			penaltyFactor: {
+		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
 		    			}
 		    		},
 		    	    invalidHandler: function(form, validator) {
@@ -116,7 +124,7 @@
 					<fmt:message key="label.authoring.basic.penalty.factor" />
 					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
 				</div>
-				1
+				<html:text property="penaltyFactor" size="3" />
 				
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.general.feedback" />
@@ -146,12 +154,12 @@
 				<lams:FCKEditor id="feedbackOnIncorrect" value="${formBean.feedbackOnIncorrect}"
 					contentFolderID="${formBean.contentFolderID}" width="622px">
 				</lams:FCKEditor>				
-				
 			</html:form>
 			
+			<br><br>
 			<lams:ImgButtonWrapper>
 				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
-					<fmt:message key="label.authoring.choice.add.multiple.choice" /> 
+					<fmt:message key="label.authoring.true.false.add.true.false" /> 
 				</a>
 				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -145,6 +145,16 @@
 						</td>
 					</tr>
 				</c:if>
+				<c:if test="${assessment.allowOverallFeedbackAfterQuestion && (result.overallFeedback != null)}">
+					<tr>
+						<th style="width: 130px;" >
+							<fmt:message key="label.learning.summary.feedback" />
+						</th>
+						<td>
+							${result.overallFeedback}
+						</td>
+					</tr>			
+				</c:if>				
 			</table>
 		</c:if>			
 		
@@ -190,7 +200,13 @@
 				</c:forEach>
 			</table>
 		</form>
-
+<!--		
+		<c:if test="${finishedLock && assessment.allowOverallFeedbackAfterQuestion && (result.overallFeedback != null)}">
+			<div style="padding: 10px 45px 0px; font-weight: 700; color:#47bc23; ">
+				Overall Feedback: ${result.overallFeedback}
+			</div>
+		</c:if>
+-->
 		<!--Paging-->
 		<c:if test="${fn:length(sessionMap.pagedQuestions) > 1}">
 			<div style="text-align: center; padding-top: 60px;">
Index: lams_tool_assessment/web/pages/learning/parts/markandpenaltyarea.jsp
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/learning/parts/markandpenaltyarea.jsp	(.../markandpenaltyarea.jsp)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/web/pages/learning/parts/markandpenaltyarea.jsp	(.../markandpenaltyarea.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -1,23 +1,17 @@
 <c:if test="${finishedLock}">
 
 	<c:if test="${assessment.allowQuestionFeedback && (question.generalFeedback != null)}">
-		<div style="padding: 10px 15px 0px; font-style: italic">
+		<div style="padding: 10px 15px 0px; font-style: italic; color:#47bc23;">
 			<c:out value="${question.generalFeedback}" escapeXml="false" />
 		</div>
 	</c:if>
 	
-	<c:if test="${assessment.allowOverallFeedbackAfterQuestion && (result.overallFeedback != null)}">
-		<div style="padding: 10px 15px 0px; font-style: italic">
-			Overall Feedback: ${result.overallFeedback}
-		</div>
-	</c:if>
-	
 	<c:if test="${assessment.allowGradesAfterAttempt}">
-		<div style="padding: 10px 15px 20px; font-style: italic">
+		<div style="padding: 10px 15px 20px; font-style: italic; color:#47bc23;">
 			<fmt:message key="label.learning.marks.penalty" >
 				<fmt:param><fmt:formatNumber value="${question.mark}" maxFractionDigits="3"/></fmt:param>
 				<fmt:param>${question.defaultGrade}</fmt:param>
-				<fmt:param>${question.penalty}</fmt:param>
+				<fmt:param><fmt:formatNumber value="${question.penalty}" maxFractionDigits="2"/></fmt:param>
 			</fmt:message>
 		</div>	
 	</c:if>
Index: lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -28,11 +28,6 @@
 					</c:forEach>
 				</html:select>
 			</td>
-			<c:if test="${finishedLock && (option.answerInt != -1) && assessment.allowQuestionFeedback}">
-				<td style="padding:5px 10px 2px; vertical-align:middle; background:none; border-bottom:0px;" width="30%">
-					<c:out value="${option.feedback}" escapeXml="false" />
-				</td>		
-			</c:if>						
 		</tr>
 	</c:forEach>
 </table>		
Index: lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -45,7 +45,7 @@
 				<c:out value="${option.optionString}" escapeXml="false" />
 			</td>
 			<c:if test="${finishedLock && option.answerBoolean && assessment.allowQuestionFeedback}">
-				<td style="padding:5px 10px 2px; vertical-align:middle; background:none; border-bottom:0px;" width="30%">
+				<td style="padding:5px 10px 2px; vertical-align:middle; background:none; border-bottom:0px; font-style: italic; color:#47bc23;" width="30%">
 					<c:out value="${option.feedback}" escapeXml="false" />
 				</td>		
 			</c:if>
@@ -56,17 +56,17 @@
 <c:if test="${finishedLock && assessment.allowQuestionFeedback}">
 	<c:choose>
 		<c:when test="${question.mark == question.defaultGrade}">
-			<div style="padding: 15px 15px 0px; font-style: italic">
+			<div style="padding: 15px 15px 0px; font-style: italic; color:#47bc23;">
 				<c:out value="${question.feedbackOnCorrect}" escapeXml="false" />
 			</div>
 		</c:when>
 		<c:when test="${question.mark > 0}">
-			<div style="padding: 15px 15px 0px; font-style: italic">
+			<div style="padding: 15px 15px 0px; font-style: italic; color:#47bc23;">
 				<c:out value="${question.feedbackOnPartiallyCorrect}" escapeXml="false" />
 			</div>
 		</c:when>
 		<c:when test="${question.mark <= 0}">
-			<div style="padding: 15px 15px 0px; font-style: italic">
+			<div style="padding: 15px 15px 0px; font-style: italic; color:#47bc23;">
 				<c:out value="${question.feedbackOnIncorrect}" escapeXml="false" />
 			</div>
 		</c:when>		
Index: lams_tool_assessment/web/pages/learning/parts/numerical.jsp
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/learning/parts/numerical.jsp	(.../numerical.jsp)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/web/pages/learning/parts/numerical.jsp	(.../numerical.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -26,15 +26,9 @@
 	</tr>
 </table>		
 
-<c:if test="${finishedLock && (question.mark > 0) && assessment.allowQuestionFeedback}">
-	<c:forEach var="option" items="${question.questionOptions}">
-		<c:if test="${option.answerBoolean}">
-			<c:set var="optionFeedback" value="${option.feedback}" />	
-		</c:if>		
-	</c:forEach>		
-		
-	<div style="padding: 10px 15px 0px; font-style: italic">
-		<c:out value="${optionFeedback}" escapeXml="false" />
+<c:if test="${finishedLock && assessment.allowQuestionFeedback && (question.questionFeedback != null)}">
+	<div style="padding: 10px 15px 0px; font-style: italic; color:#47bc23;">
+		<c:out value="${question.questionFeedback}" escapeXml="false" />
 	</div>
 </c:if>	
 
Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -48,7 +48,7 @@
 	</table>	
 	
 	<c:if test="${finishedLock && assessment.allowQuestionFeedback}">
-		<div style="padding: 10px 15px 0px; font-style: italic">
+		<div style="padding: 10px 15px 0px; font-style: italic; color:#47bc23;">
 			<c:choose>
 				<c:when	test="${question.mark > 0}">
 					<c:out value="${question.feedbackOnCorrect}" escapeXml="false" />
Index: lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	(.../shortanswer.jsp)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	(.../shortanswer.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -26,15 +26,9 @@
 	</tr>
 </table>	
 
-<c:if test="${finishedLock && (question.mark > 0) && assessment.allowQuestionFeedback}">
-	<c:forEach var="option" items="${question.questionOptions}">
-		<c:if test="${option.answerBoolean}">
-			<c:set var="optionFeedback" value="${option.feedback}" />	
-		</c:if>		
-	</c:forEach>		
-		
-	<div style="padding: 10px 15px 0px; font-style: italic">
-		<c:out value="${optionFeedback}" escapeXml="false" />
+<c:if test="${finishedLock && assessment.allowQuestionFeedback && (question.questionFeedback != null)}">
+	<div style="padding: 10px 15px 0px; font-style: italic; color:#47bc23;">
+		<c:out value="${question.questionFeedback}" escapeXml="false" />
 	</div>
 </c:if>	
 
Index: lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
===================================================================
diff -u -r98ccad973dd8280fbae78c301f824877b2564c44 -r3dab7c956ec906f70368dfeb1fafde8e720a473c
--- lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	(.../truefalse.jsp)	(revision 98ccad973dd8280fbae78c301f824877b2564c44)
+++ lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	(.../truefalse.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
@@ -52,13 +52,13 @@
 
 <c:if test="${finishedLock && assessment.allowQuestionFeedback}">
 	<c:choose>
-		<c:when test="${(question.answerBoolean == question.correctAnswer) and (question.answerString != null)}">
-			<div style="padding: 15px 15px 0px; font-style: italic">
+		<c:when test="${question.answerBoolean and (question.answerString != null)}">
+			<div style="padding: 15px 15px 0px; font-style: italic; color:#47bc23;">
 				<c:out value="${question.feedbackOnCorrect}" escapeXml="false" />
 			</div>
 		</c:when>
-		<c:when test="${(question.answerBoolean != question.correctAnswer) and (question.answerString != null)}">
-			<div style="padding: 15px 15px 0px; font-style: italic">
+		<c:when test="${!question.answerBoolean and (question.answerString != null)}">
+			<div style="padding: 15px 15px 0px; font-style: italic; color:#47bc23;">
 				<c:out value="${question.feedbackOnIncorrect}" escapeXml="false" />
 			</div>
 		</c:when>