Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java
===================================================================
diff -u -r86c25c80d92701a94c3161575c76c363891402ad -rb4eeced9a946a0a62d6b51698addd3db798c0498
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java	(.../QaQuestionDTO.java)	(revision 86c25c80d92701a94c3161575c76c363891402ad)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java	(.../QaQuestionDTO.java)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
@@ -32,29 +32,23 @@
  */
 public class QaQuestionDTO implements Comparable<QaMonitoredUserDTO> {
     private Long uid;
-    private String question;
+    private String name;
+    private String description;
     private String displayOrder;
     private String feedback;
     private boolean required;
     private int minWordsLimit;
 
     public QaQuestionDTO(QaQueContent qaQuestion) {
-	this.question = qaQuestion.getQbQuestion().getName();
+	this.name = qaQuestion.getQbQuestion().getName();
+	this.description = qaQuestion.getQbQuestion().getDescription();
 	this.displayOrder = String.valueOf(qaQuestion.getDisplayOrder());
 	this.feedback = qaQuestion.getQbQuestion().getFeedback() != null ? qaQuestion.getQbQuestion().getFeedback() : "";
 	this.required = qaQuestion.getQbQuestion().isAnswerRequired();
 	this.minWordsLimit = qaQuestion.getQbQuestion().getMinWordsLimit();
 	this.uid = qaQuestion.getUid();
     }
 
-    public QaQuestionDTO(String question, String displayOrder, String feedback, boolean required, int minWordsLimit) {
-	this.question = question;
-	this.displayOrder = displayOrder;
-	this.feedback = feedback;
-	this.required = required;
-	this.minWordsLimit = minWordsLimit;
-    }
-
     @Override
     public int compareTo(QaMonitoredUserDTO o) {
 	if (o == null) {
@@ -110,30 +104,38 @@
     }
 
     /**
-     * @return Returns the question.
+     * @return Returns the name.
      */
-    public String getQuestion() {
-	return question;
+    public String getName() {
+	return name;
     }
 
     /**
-     * @param question
-     *            The question to set.
+     * @param name
+     *            The name to set.
      */
-    public void setQuestion(String question) {
-	this.question = question;
+    public void setName(String question) {
+	this.name = question;
     }
+    
+    public String getDescription() {
+	return description;
+    }
 
+    public void setDescription(String description) {
+	this.description = description;
+    }
+
     /**
-     * @return Is this question required?
+     * @return Is this name required?
      */
     public boolean isRequired() {
 	return required;
     }
 
     /**
      * @param required
-     *            Is this question required
+     *            Is this name required
      */
     public void setRequired(boolean required) {
 	this.required = required;
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r86c25c80d92701a94c3161575c76c363891402ad -rb4eeced9a946a0a62d6b51698addd3db798c0498
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 86c25c80d92701a94c3161575c76c363891402ad)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
@@ -226,56 +226,50 @@
 		</c:if>
 
 		<!-- End advanced settings and notices -->
+		<form:hidden path="toolSessionID" id="tool-session-id" />
+		<form:hidden path="userID" />
+		<form:hidden path="sessionMapID" />
+		<form:hidden path="questionIndex" />
+		<form:hidden path="totalQuestionCount" />
 
+		<div class="panel">
+			<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
+		</div>
 
-			<form:hidden path="toolSessionID" id="tool-session-id" />
-			<form:hidden path="userID" />
-			<form:hidden path="sessionMapID" />
-			<form:hidden path="questionIndex" />
-			<form:hidden path="totalQuestionCount" />
-
+		<lams:errors/>
 			
-
-			<div class="panel">
-				<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
-			</div>
-
-			<lams:errors/>
-			
-			<c:choose>
-				<c:when test="${(generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential') && hasEditRight}">
-
-					<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-						<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}">
-							<p>
-								<fmt:message key="label.feedback.seq" />&nbsp;
-								<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />&nbsp;
-								<fmt:message key="label.questions.simple" />
-							</p>
-						</c:if>
-					</c:if>
-
-					<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}">
+		<c:choose>
+			<c:when test="${(generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential') && hasEditRight}">
+				<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
+					<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}">
 						<p>
-							<fmt:message key="label.questions.remaining" />&nbsp;
-							<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+							<fmt:message key="label.feedback.seq" />&nbsp;
+							<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />&nbsp;
+							<fmt:message key="label.questions.simple" />
 						</p>
 					</c:if>
+				</c:if>
 
-					<jsp:include page="/learning/SequentialAnswersContent.jsp" />
-				</c:when>
+				<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}">
+					<p>
+						<fmt:message key="label.questions.remaining" />&nbsp;
+						<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+					</p>
+				</c:if>
 
-				<c:otherwise>
+				<jsp:include page="/learning/SequentialAnswersContent.jsp" />
+			</c:when>
 
-					<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-						<fmt:message key="label.feedback.combined" /> &nbsp <c:out
-							value="${generalLearnerFlowDTO.remainingQuestionCount}" />
-						<fmt:message key="label.questions.simple" />
-					</c:if>
+			<c:otherwise>
+				<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
+					<fmt:message key="label.feedback.combined" /> &nbsp <c:out
+						value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+					<fmt:message key="label.questions.simple" />
+				</c:if>
 
-					<jsp:include page="/learning/CombinedAnswersContent.jsp" />
-				</c:otherwise>
-			</c:choose>
+				<jsp:include page="/learning/CombinedAnswersContent.jsp" />
+			</c:otherwise>
+		</c:choose>
 
 	<div id="footer"></div>
 
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -rb4eeced9a946a0a62d6b51698addd3db798c0498
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
@@ -2,24 +2,25 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:forEach var="questionEntry"
-	items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-	<c:forEach var="answerEntry"
-		items="${generalLearnerFlowDTO.mapAnswers}">
+<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
+	<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswers}">
 
 		<c:if test="${questionEntry.key == answerEntry.key}">
 			<div class="row no-gutter">
 				<div class="col-xs-12">
 					<div class="panel panel-default">
 						<div class="panel-heading">
 							<div class="panel-title">
-								<strong> <fmt:message key="label.question" /> <c:out
-										value="${questionEntry.key}" /> 
+								<strong> 
+									<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" />
 								</strong>
 							</div>
 						</div>
+						
 						<div class="panel-body">
-							<div class="panel"><c:out value="${questionEntry.value.question}" escapeXml="false" /></div>
+							<div class="panel">
+								<c:out value="${questionEntry.value.description}" escapeXml="false" />
+							</div>
 						
 							<div class="answer-req">
 								<fmt:message key="label.learning.yourAnswer" /> 
@@ -81,19 +82,15 @@
 
 <c:if test="${hasEditRight}">
 	<div class="right-buttons">
-		<button name="btnCombined"
-			type="button"
-			onclick="javascript:submitMethod('submitAnswersContent');"
-			class="btn btn-default pull-right voffset5">
+		<button name="btnCombined" type="button" class="btn btn-default pull-right voffset5"
+			onclick="javascript:submitMethod('submitAnswersContent');">
 			<fmt:message key="button.submitAllContent" />
 		</button>
 	</div>
 </c:if>
 
-
 <script type="text/javascript">
 	window.onload = function() {
 		document.getElementById("answer1").focus();
 	}
 </script>
-
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r86c25c80d92701a94c3161575c76c363891402ad -rb4eeced9a946a0a62d6b51698addd3db798c0498
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 86c25c80d92701a94c3161575c76c363891402ad)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.sessionMapID]}" />
 
 <lams:html>
@@ -51,41 +50,41 @@
 		</c:if>
 		<!-- End announcements -->
 
-			<form:hidden path="toolSessionID" />
-			<form:hidden path="userID" />
-			<form:hidden path="sessionMapID" />
-			<form:hidden path="totalQuestionCount" />
+		<form:hidden path="toolSessionID" />
+		<form:hidden path="userID" />
+		<form:hidden path="sessionMapID" />
+		<form:hidden path="totalQuestionCount" />
 
-			<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
+		<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
 
 				<div class="row no-gutter">
 					<div class="col-xs-12">
 						<div class="panel panel-default">
 							<div class="panel-heading panel-title">
-								<strong> <fmt:message key="label.question" /> <c:out value="${questionEntry.key}" escapeXml="false" />:
-								</strong> <br>
-								<c:out value="${questionEntry.value.question}" escapeXml="false" />
+								<strong>
+									<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" /> 
+								</strong> 
+								<br>
+								
+								<c:out value="${questionEntry.value.description}" escapeXml="false" />
 							</div>
+							
 							<div class="panel-body">
 
 								<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
 									<c:if test="${answerEntry.key == questionEntry.key}">
-
 										<h5>
 											<fmt:message key="label.learning.yourAnswer" />
 										</h5>
 
 										<div class="panel" id="answer${questionEntry.key}">
 											<c:out value="${answerEntry.value}" escapeXml="false" />
 										</div>
-
-
 									</c:if>
 								</c:forEach>
 
+								<!-- Feedback -->
 								<c:if test="${(questionEntry.value.feedback != '') && (questionEntry.value.feedback != null) }">
-									<!-- Feedback -->
-
 									<div class="row no-gutter">
 										<div class="col-xs-12">
 											<div class="panel panel-default voffset5" id="feedback${questionEntry.key}">
@@ -98,72 +97,64 @@
 											</div>
 										</div>
 									</div>
-
-									<!-- End feedback -->
 								</c:if>
 
-
-
 							</div>
-							<!-- End panel body -->
 						</div>
 					</div>
 				</div>
 				<div class="shading-bg">
 					<p></p>
+				</div>
 
+		</c:forEach>
 
+		<hr class="msg-hr" />
 
-				</div>
+		<div class="voffset10">
+			<c:if test="${!generalLearnerFlowDTO.noReeditAllowed}">
+				<button type="button" name="redoQuestions" class="btn btn-default pull-left"
+					onclick="submitMethod('redoQuestions');">
+					<fmt:message key="label.redo" />
+				</button>
+			</c:if>
 
-			</c:forEach>
+			<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
+				<button name="viewAllResults" type="button" onclick="submitMethod('storeAllResults');"
+					class="btn btn-default pull-right">
+					<fmt:message key="label.allResponses" />
+				</button>
+			</c:if>
 
-			<hr class="msg-hr" />
+			<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
+				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
+					<div class="space-bottom-top align-right">
+						<button type="button" id="finishButton" 
+							onclick="javascript:submitMethod('storeAllResults');return false" class="btn btn-primary pull-right na">
+							<c:choose>
+								<c:when test="${sessionMap.isLastActivity}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.endLearning" />
+								</c:otherwise>
+							</c:choose>
 
-			<div class="voffset10">
-				<c:if test="${!generalLearnerFlowDTO.noReeditAllowed}">
-					<button type="button" name="redoQuestions" class="btn btn-default pull-left"
-						onclick="submitMethod('redoQuestions');">
-						<fmt:message key="label.redo" />
-					</button>
+						</button>
+					</div>
 				</c:if>
 
-				<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
-					<button name="viewAllResults" type="button" onclick="submitMethod('storeAllResults');"
-						class="btn btn-default pull-right">
-						<fmt:message key="label.allResponses" />
+				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
+					<button name="forwardtoReflection" type="button" onclick="javascript:submitMethod('storeAllResults');"
+						class="btn btn-primary pull-right">
+						<fmt:message key="label.continue" />
 					</button>
 				</c:if>
+			</c:if>
 
-				<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
-					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
-						<div class="space-bottom-top align-right">
-							<button type="button" id="finishButton" 
-								onclick="javascript:submitMethod('storeAllResults');return false" class="btn btn-primary pull-right na">
-								<c:choose>
-									<c:when test="${sessionMap.isLastActivity}">
-										<fmt:message key="button.submit" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="button.endLearning" />
-									</c:otherwise>
-								</c:choose>
+		</div>
 
-							</button>
-						</div>
-					</c:if>
 
-					<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
-						<button name="forwardtoReflection" type="button" onclick="javascript:submitMethod('storeAllResults');"
-							class="btn btn-primary pull-right">
-							<fmt:message key="label.continue" />
-						</button>
-					</c:if>
-				</c:if>
-
-			</div>
-
-
 		<div id="footer"></div>
 
 		</lams:Page>
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r86c25c80d92701a94c3161575c76c363891402ad -rb4eeced9a946a0a62d6b51698addd3db798c0498
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 86c25c80d92701a94c3161575c76c363891402ad)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
@@ -319,12 +319,12 @@
 					<div class="col-xs-12">
 						<div class="panel panel-default">
 							<div class="panel-heading panel-title">
-								<fmt:message key="label.question" />
-								${status.count}:
+								${status.count}. <c:out value="${userResponse.qaQuestion.qbQuestion.name}" escapeXml="false" />
 							</div>
+							
 							<div class="panel-body">
 								<div class="panel">
-									<c:out value="${userResponse.qaQuestion.qbQuestion.name}" escapeXml="false" />
+									<c:out value="${userResponse.qaQuestion.qbQuestion.description}" escapeXml="false" />
 								</div>
 	
 								<div class="row no-gutter">
@@ -373,9 +373,9 @@
 	
 				<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
 					<p>
-						<strong> <fmt:message key="label.question" /> ${status.count}:
+						<strong> 
+							${status.count}. <c:out value="${question.qbQuestion.name}" escapeXml="false" />
 						</strong>
-						<c:out value="${question.qbQuestion.name}" escapeXml="false" />
 					</p>
 	
 					<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r86c25c80d92701a94c3161575c76c363891402ad -rb4eeced9a946a0a62d6b51698addd3db798c0498
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 86c25c80d92701a94c3161575c76c363891402ad)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
@@ -301,12 +301,12 @@
 				<div class="col-xs-12">
 					<div class="panel panel-default">
 						<div class="panel-heading panel-title">
-							<fmt:message key="label.question" />
-							${status.count}:
+							${status.count}. <c:out value="${userResponse.qaQuestion.qbQuestion.name}" escapeXml="false" />
 						</div>
+						
 						<div class="panel-body">
 							<div class="panel">
-								<c:out value="${userResponse.qaQuestion.qbQuestion.name}" escapeXml="false" />
+								<c:out value="${userResponse.qaQuestion.qbQuestion.description}" escapeXml="false" />
 							</div>
 
 							<div class="row no-gutter">
@@ -368,9 +368,9 @@
 			<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
 
 				<p>
-					<strong> <fmt:message key="label.question" /> ${status.count}:
+					<strong> 
+						${status.count}. <c:out value="${question.qbQuestion.name}" escapeXml="false" />
 					</strong>
-					<c:out value="${question.qbQuestion.name}" escapeXml="false" />
 				</p>
 
 				<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -ree24c96be656069696dc59a7831ea64120531a61 -rb4eeced9a946a0a62d6b51698addd3db798c0498
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision ee24c96be656069696dc59a7831ea64120531a61)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
@@ -13,13 +13,14 @@
 				<div class="panel panel-default">
 					<div class="panel-heading">
 						<div class="panel-title">
-							<strong> <fmt:message key="label.question" /> <c:out value="${questionEntry.key}" />
+							<strong>
+								<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" />
 							</strong>
 						</div>
 					</div>
 					<div class="panel-body">
 						<div class="panel">
-							<c:out value="${questionEntry.value.question}" escapeXml="false" />
+							<c:out value="${questionEntry.value.description}" escapeXml="false" />
 						</div>
 						<div class="answer-req">
 							<fmt:message key="label.learning.yourAnswer" />