Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb784c097aa626460dd6fb3c7d4f829c5b791f0f7 -r400c6f5c11c7d0001db120fd838bf820d2fb062a
--- lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b784c097aa626460dd6fb3c7d4f829c5b791f0f7)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
@@ -117,8 +117,8 @@
 label.tip.moveQuestionUp  =Moves question up
 questions.none.submitted  =No question(s) submitted. Please add at least one question.
 count.finished.session  =Finished session count:
-label.feedback.seq  =Number of questions presented in this activity:
-label.feedback.combined  =Number of questions presented in this activity:
+label.feedback.seq  =Number of questions:
+label.feedback.combined  =Number of questions:
 label.questions.simple  =questions.
 label.questions.remaining  =Remaining question count:
 label.end.questions  =End of the questions.
Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rb784c097aa626460dd6fb3c7d4f829c5b791f0f7 -r400c6f5c11c7d0001db120fd838bf820d2fb062a
--- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision b784c097aa626460dd6fb3c7d4f829c5b791f0f7)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
@@ -83,7 +83,7 @@
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 label.allResponses  =View all responses
 label.learning.forceFinish  =You are required to finish this activity now.
-label.learning.yourAnswer  =Your answer:
+label.learning.yourAnswer  =Your answer
 label.show  =Show
 label.response.hidden  =Hidden
 button.try.again  =Try again
@@ -117,8 +117,8 @@
 label.tip.moveQuestionUp  =Moves question up
 questions.none.submitted  =No question(s) submitted. Please add at least one question.
 count.finished.session  =Finished session count:
-label.feedback.seq  =Number of questions presented in this activity:
-label.feedback.combined  =Number of questions presented in this activity:
+label.feedback.seq  =Number of questions:
+label.feedback.combined  =Number of questions:
 label.questions.simple  =questions.
 label.questions.remaining  =Remaining question count:
 label.end.questions  =End of the questions.
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r7fa9e136f00bdd477aec73bf7fa6fbf0afe1bd95 -r400c6f5c11c7d0001db120fd838bf820d2fb062a
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 7fa9e136f00bdd477aec73bf7fa6fbf0afe1bd95)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
@@ -9,53 +9,55 @@
 			<div class="row no-gutter">
 				<div class="col-xs-12">
 					<div class="panel panel-default">
+					<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1 }">
 						<div class="panel-heading">
 							<div class="panel-title">
 								<strong> 
-									<fmt:message key="label.question" /> 
-									<c:out value="${questionEntry.key}" /> 
+									<fmt:message key="label.question" />&nbsp;<c:out value="${questionEntry.key}" /> <c:out value="${items}"></c:out> 
 								</strong>
 							</div>
 						</div>
+						</c:if>
 						<div class="panel-body">
 							<div class="panel">
 								<c:out value="${questionEntry.value.question}" escapeXml="false" />
 							</div>
 						
 							<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}"
 										<c:if test="${questionEntry.value.minWordsLimit != 0}">class="min-words-limit-enabled"</c:if>>
 										<c:choose>
 											<c:when test="${generalLearnerFlowDTO.allowRichEditor}">
 												<lams:CKEditor id="answer${questionEntry.key}"
-													value="${answerEntry.value}"
+													value="${answerEntry.value}" 
 													contentFolderID="${sessionMap.learnerContentFolder}"
 													toolbarSet="DefaultLearner">
 												</lams:CKEditor>
 											</c:when>
 
 											<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 -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r400c6f5c11c7d0001db120fd838bf820d2fb062a
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
@@ -61,18 +61,21 @@
 				<div class="row no-gutter">
 					<div class="col-xs-12">
 						<div class="panel panel-default">
+						<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}">
 							<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><fmt:message key="label.question" />&nbsp;<c:out value="${questionEntry.key}" escapeXml="false" /></strong>
 							</div>
+						</c:if>	
 							<div class="panel-body">
+							<div class="panel">
+								<c:out value="${questionEntry.value.question}" escapeXml="false" />
+							</div>	
 
 								<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
 									<c:if test="${answerEntry.key == questionEntry.key}">
 
 										<h5>
-											<fmt:message key="label.learning.yourAnswer" />
+											<fmt:message key="label.learning.yourAnswer" />:
 										</h5>
 
 										<div class="panel" id="answer${questionEntry.key}">
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r400c6f5c11c7d0001db120fd838bf820d2fb062a
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
@@ -318,10 +318,11 @@
 				<div class="row no-gutter">
 					<div class="col-xs-12">
 						<div class="panel panel-default">
+						<c:if test="${generalLearnerFlowDTO.userResponses.size() != 1}">
 							<div class="panel-heading panel-title">
-								<fmt:message key="label.question" />
-								${status.count}:
+								<fmt:message key="label.question" />&nbsp;${status.count}
 							</div>
+						</c:if>	
 							<div class="panel-body">
 								<div class="panel">
 									<c:out value="${userResponse.qaQuestion.question}" escapeXml="false" />
@@ -368,16 +369,18 @@
 	
 			<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
 				<h4>
-					<fmt:message key="label.other.answers" />
+					<fmt:message key="label.other.answers" /> 
 				</h4>
 	
 				<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
-					<p>
-						<strong> <fmt:message key="label.question" /> ${status.count}:
-						</strong>
+					<div class="panel">
+					    <c:if test="${generalLearnerFlowDTO.questions.size() != 1}">
+							<strong> <fmt:message key="label.question" />&nbsp;${status.count}:
+							</strong>
+						</c:if>
 						<c:out value="${question.question}" escapeXml="false" />
-					</p>
-	
+					</div>	
+
 					<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
 						<lams:Alert id="rating-info" type="info" close="false">
 							<fmt:message key="label.comment.minimum.number.words">
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r400c6f5c11c7d0001db120fd838bf820d2fb062a
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
@@ -301,8 +301,7 @@
 				<div class="col-xs-12">
 					<div class="panel panel-default">
 						<div class="panel-heading panel-title">
-							<fmt:message key="label.question" />
-							${status.count}:
+							<fmt:message key="label.question" />&nbsp;${status.count}:
 						</div>
 						<div class="panel-body">
 							<div class="panel">
@@ -362,14 +361,13 @@
 
 		<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
 			<h4>
-				<fmt:message key="label.other.answers" />
+				<fmt:message key="label.other.answers" /> 
 			</h4>
 
 			<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
 
 				<p>
-					<strong> <fmt:message key="label.question" /> ${status.count}:
-					</strong>
+					<strong><fmt:message key="label.question" /> ${status.count}:</strong>
 					<c:out value="${question.question}" escapeXml="false" />
 				</p>
 
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r7fa9e136f00bdd477aec73bf7fa6fbf0afe1bd95 -r400c6f5c11c7d0001db120fd838bf820d2fb062a
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 7fa9e136f00bdd477aec73bf7fa6fbf0afe1bd95)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
@@ -11,34 +11,34 @@
 		<div class="row no-gutter">
 			<div class="col-xs-12">
 				<div class="panel panel-default">
+				<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1 }">
 					<div class="panel-heading">
 						<div class="panel-title">
-							<strong> <fmt:message key="label.question" /> <c:out value="${questionEntry.key}" />
+							<strong> <fmt:message key="label.question" />&nbsp;<c:out value="${questionEntry.key}" />
 							</strong>
 						</div>
 					</div>
+				</c:if>	
 					<div class="panel-body">
 						<div class="panel">
 							<c:out value="${questionEntry.value.question}" escapeXml="false" />
 						</div>
 						<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}"
@@ -47,7 +47,7 @@
 								</c:when>
 
 								<c:otherwise>
-									<lams:textarea name="answer" id="answer" rows="5" class="form-control">
+									<lams:textarea name="answer" id="answer" rows="5" placeholder="${placeholder}" class="form-control">
 										<c:out value='${generalLearnerFlowDTO.currentAnswer}' escapeXml='false' />
 									</lams:textarea>
 								</c:otherwise>