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>
-