Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r242fb55e2d8a84388c3a7eb168f86c4f4ab2437b -rf0997a08e6b5eeae233351103cfe619432f88016
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 242fb55e2d8a84388c3a7eb168f86c4f4ab2437b)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision f0997a08e6b5eeae233351103cfe619432f88016)
@@ -11,7 +11,7 @@
 					<div class="panel panel-default">
 						<div class="panel-heading">
 							<div class="panel-title">
-								<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" />
+								<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() !=1}"><c:out value="${questionEntry.key}" />.</c:if>  <c:out value="${questionEntry.value.name}" escapeXml="false" />
 							</div>
 						</div>
 						
@@ -23,23 +23,21 @@
 							</c:if>
 						
 							<div class="answer-req">
-								<fmt:message key="label.learning.yourAnswer" /> 
 								<c:if test="${questionEntry.value.required}">
-									<small>
-										<mark>
-											<fmt:message key="label.required" />
-										</mark>
-									</small>
+									<span class="label label-danger pull-right"><fmt:message key="label.required" /></span>
 								</c:if> 
 								
 								<c:if test="${questionEntry.value.minWordsLimit != 0}">
-									<br/>
-									<fmt:message key="label.words.required" />: <span id="words-required-${questionEntry.key}"></span>
+									<button class="btn btn-xs btn-primary" type="button">
+									<strong><fmt:message key="label.words.required" />&nbsp;</strong><span id="words-required-${questionEntry.key}" class="badge"></span>
+									</button>
+									<div class="voffset5">&nbsp;</div>
 								</c:if>
 							</div>
 
 							<c:choose>
 								<c:when test="${hasEditRight}">
+									<c:set var="placeholder"><fmt:message key="label.learning.yourAnswer" />...</c:set>
 									<div data-sequence-id="${questionEntry.key}"
 										data-is-ckeditor="${generalLearnerFlowDTO.allowRichEditor}"
 										data-min-words-limit="${questionEntry.value.minWordsLimit}"
@@ -55,7 +53,7 @@
 
 											<c:otherwise>
 												<lams:textarea name="answer${questionEntry.key}"
-													id="answer${questionEntry.key}" rows="5"
+													id="answer${questionEntry.key}" rows="5" placeholder="${placeholder}"
 													class="form-control"><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
 											</c:otherwise>
 										</c:choose>
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rb4eeced9a946a0a62d6b51698addd3db798c0498 -rf0997a08e6b5eeae233351103cfe619432f88016
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision f0997a08e6b5eeae233351103cfe619432f88016)
@@ -62,14 +62,14 @@
 						<div class="panel panel-default">
 							<div class="panel-heading panel-title">
 								<strong>
-									<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" /> 
+									<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}">${questionEntry.key}.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" /> 
 								</strong> 
-								<br>
-								
-								<c:out value="${questionEntry.value.description}" escapeXml="false" />
 							</div>
 							
 							<div class="panel-body">
+								<div class="panel">
+									<c:out value="${questionEntry.value.description}" escapeXml="false" />
+								</div>
 
 								<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
 									<c:if test="${answerEntry.key == questionEntry.key}">
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e -rf0997a08e6b5eeae233351103cfe619432f88016
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision f0997a08e6b5eeae233351103cfe619432f88016)
@@ -319,7 +319,7 @@
 					<div class="col-xs-12">
 						<div class="panel panel-default">
 							<div class="panel-heading panel-title">
-								${status.count}. <c:out value="${userResponse.qaQuestion.qbQuestion.name}" escapeXml="false" />
+								<c:if test="${generalLearnerFlowDTO.userResponses.size() != 1}">${status.count}.&nbsp;</c:if> <c:out value="${userResponse.qaQuestion.qbQuestion.name}" escapeXml="false" />
 							</div>
 							
 							<div class="panel-body">
@@ -375,7 +375,7 @@
 	
 				<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
 					<p>
-						${status.count}. <c:out value="${question.qbQuestion.name}" escapeXml="false" />
+					<c:if test="${generalLearnerFlowDTO.questions.size() != 1}">${status.count}.&nbsp;</c:if>	<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 -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e -rf0997a08e6b5eeae233351103cfe619432f88016
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision f0997a08e6b5eeae233351103cfe619432f88016)
@@ -301,7 +301,7 @@
 				<div class="col-xs-12">
 					<div class="panel panel-default">
 						<div class="panel-heading panel-title">
-							${status.count}. <c:out value="${userResponse.qaQuestion.qbQuestion.name}" escapeXml="false" />
+							<c:if test="${generalLearnerFlowDTO.userResponses.size() != 1}"> ${status.count}.</c:if> <c:out value="${userResponse.qaQuestion.qbQuestion.name}" escapeXml="false" /> 
 						</div>
 						
 						<div class="panel-body">
@@ -370,7 +370,7 @@
 			<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
 
 				<p>
-					${status.count}. <c:out value="${question.qbQuestion.name}" escapeXml="false" />
+					<c:if test="${generalLearnerFlowDTO.questions.size() != 1}">${status.count}.&nbsp;</c:if> <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 -r242fb55e2d8a84388c3a7eb168f86c4f4ab2437b -rf0997a08e6b5eeae233351103cfe619432f88016
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 242fb55e2d8a84388c3a7eb168f86c4f4ab2437b)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision f0997a08e6b5eeae233351103cfe619432f88016)
@@ -13,7 +13,7 @@
 				<div class="panel panel-default">
 					<div class="panel-heading">
 						<div class="panel-title">
-							<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" />
+							<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}"><c:out value="${questionEntry.key}" />.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" />
 						</div>
 					</div>
 					
@@ -25,23 +25,22 @@
 						</c:if>
 						
 						<div class="answer-req">
-							<fmt:message key="label.learning.yourAnswer" />
 							<c:if test="${questionEntry.value.required}">
-								<small>
-									<mark>
-										<fmt:message key="label.required" />
-									</mark>
-								</small>
+									<span class="label label-danger pull-right"><fmt:message key="label.required" /></span>
 							</c:if>
 							<c:if test="${questionEntry.value.minWordsLimit != 0}">
-								<br />
-								<fmt:message key="label.words.required" />: <span id="words-required-"></span>
+									<button class="btn btn-xs btn-primary" type="button">
+									<strong><fmt:message key="label.words.required" />&nbsp;</strong><span id="words-required-" class="badge"></span>
+									</button>
+									<div class="voffset5">&nbsp;</div>
 							</c:if>
 						</div>
 
 						<div data-sequence-id="${questionEntry.key}" data-is-ckeditor="${generalLearnerFlowDTO.allowRichEditor}"
 							data-min-words-limit="${questionEntry.value.minWordsLimit}"
 							<c:if test="${questionEntry.value.minWordsLimit != 0}">class="min-words-limit-enabled"</c:if>>
+							<c:set var="placeholder"><fmt:message key="label.learning.yourAnswer" />...</c:set>
+							
 							<c:choose>
 								<c:when test="${generalLearnerFlowDTO.allowRichEditor}">
 									<lams:CKEditor id="answer" value="${generalLearnerFlowDTO.currentAnswer}"
@@ -50,7 +49,7 @@
 								</c:when>
 
 								<c:otherwise>
-									<lams:textarea name="answer" id="answer" rows="5" class="form-control">
+									<lams:textarea name="answer" id="answer" rows="5" class="form-control" placeholder="${placeholder}"> 
 										<c:out value='${generalLearnerFlowDTO.currentAnswer}' escapeXml='false' />
 									</lams:textarea>
 								</c:otherwise>
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r265cd3e424cd797379c4c4d281550914a4dfdd22 -rf0997a08e6b5eeae233351103cfe619432f88016
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 265cd3e424cd797379c4c4d281550914a4dfdd22)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision f0997a08e6b5eeae233351103cfe619432f88016)
@@ -48,14 +48,14 @@
 		</div>
 	</c:if>
 				  	
-	<c:forEach var="questionDto" items="${questions}">
+	<c:forEach var="questionDto" items="${questions}" varStatus="loop">
 		<div class="panel panel-default"">
 			<div class="panel-heading">
 				<a href="javascript:launchPopup('<lams:WebAppURL/>monitoring/getPrintAnswers.do?questionUid=${questionDto.uid}&toolSessionID=${groupDto.sessionId}');"	
 					id="printAnswers" class="btn btn-default btn-xs pull-right"><i class="fa fa-print"></i></a>
-				<c:out value="${questionDto.name}" escapeXml="false"/>
-				<br>
-				<c:out value="${questionDto.description}" escapeXml="false"/>
+				<strong><c:if test="${questions.size() > 1}"><c:out value="${loop.index +1}"></c:out>.&nbsp;</c:if><c:out value="${questionDto.name}" escapeXml="false"/></strong>
+				</br>
+				<div><c:out value="${questionDto.description}" escapeXml="false"/></div>
 			</div>
 			<lams:TSTable numColumns="${content.allowRateAnswers ? (isCommentsEnabled ? 3 : 2) : (isCommentsEnabled ? 2 : 1)}"
 						  dataId="data-session-id='${groupDto.sessionId}' data-question-uid='${questionDto.uid}'">