Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r5a2704204eda443d4fb54e97babed70b9d71ee60 -r067e828d94163bebff1b41b13e9503f1e6039dc4
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 5a2704204eda443d4fb54e97babed70b9d71ee60)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -1335,8 +1335,10 @@
 	sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT, assessment);
 	sessionMap.put(AssessmentConstants.CONFIG_KEY_HIDE_TITLES,
 		Boolean.valueOf(service.getConfigValue(AssessmentConstants.CONFIG_KEY_HIDE_TITLES)));
+	
+	boolean isBootstrap5 = WebUtil.readBooleanParam(request, "bootstrap5", false);
 
-	return "pages/learning/results" + (embedded ? "/allquestions" : "");
+	return "pages/learning/" + (isBootstrap5 ? "results" : "resultsbootstrap3") + (embedded ? "/allquestions" : "");
     }
 
     @RequestMapping(path = "/logLearnerInteractionEvent", method = RequestMethod.POST)
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/allquestions.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/allquestions.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/allquestions.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,340 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="assessment" value="${sessionMap.assessment}" />
+<c:set var="pageNumber" value="${sessionMap.pageNumber}" />
+<c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
+<c:set var="isLeadershipEnabled" value="${assessment.useSelectLeaderToolOuput}"/>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<c:set var="showQuestionMonitoringActionButtons" value="${not empty sessions}" />
+
+<c:if test="${param.embedded}">
+	<lams:css suffix="jquery.jRating"/>
+	<link href="<lams:WebAppURL/>includes/css/assessment.css" rel="stylesheet" type="text/css">
+</c:if>
+
+<link rel="stylesheet" type="text/css" href="${lams}css/bootstrap-slider.css" />
+<style>
+	tr.selected-by-groups td {
+		border-top: none !important;
+	}
+	
+	tr.selected-by-groups span {
+		font-weight: bold;
+	}
+	
+	.slider.slider-horizontal {
+		margin-left: 40px;
+	}
+	
+	.monitor-question-buttons {
+		text-align: right;
+		float: right;
+	}
+	
+	@media (min-width: 0px) and (max-width: 767px){
+		.discussion-sentiment-start-button {
+			padding: 1px 5px;
+		}
+	}
+	
+	.discussion-sentiment-start-button .fa-comments {
+		color: black !important;
+	}
+	
+	<c:if test="${param.embedded and empty toolSessionID and (assessment.allowDiscloseAnswers or assessment.allowDiscussionSentiment)}">	
+		.panel-heading .asterisk {
+			margin-right: 30px;
+		}
+	</c:if>
+</style>
+	
+<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap-slider.js"></script>
+<script type="text/javascript">
+	//var for jquery.jRating.js
+	var pathToImageFolder = "${lams}images/css/",
+	
+	//vars for rating.js
+		AVG_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message></spring:escapeBody>',
+		YOUR_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message></spring:escapeBody>',
+		COMMENTS_MIN_WORDS_LIMIT = 0,
+		MAX_RATES = 0,
+		MIN_RATES = 0,
+		LAMS_URL = '${lams}',
+		COUNT_RATED_ITEMS = true,
+		COMMENT_TEXTAREA_TIP_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.comment.textarea.tip"/></spring:escapeBody>',
+		WARN_COMMENTS_IS_BLANK_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.image.comment.blank"/></spring:escapeBody>',
+		ALLOW_RERATE = false;
+	<%-- Do not allow rating if it is a teacher view --%>
+	<c:if test="${not empty toolSessionID}">
+		var SESSION_ID = ${toolSessionID};
+	</c:if>
+	
+	function refreshToRating(questionUid) {
+		// LDEV-5052 Refresh page and scroll to the given ID on comment submit
+
+		// setting href does not navigate if url contains #, we still need a reload
+		location.hash = '#rating-table-' + questionUid;
+		location.reload();
+		return false;
+	}
+
+	<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscussionSentiment}">
+		function startDiscussionSentiment(toolQuestionUid, burningQuestionUid, markAsActive) {
+			// burningQuestionUid is not used in Assessment, but must be added for function signature consistency
+			
+			$('#discussion-sentiment-chart-panel-container-' + toolQuestionUid).load(
+				'${lams}learning/discussionSentiment/startMonitor.do',
+				{
+					toolQuestionUid : toolQuestionUid,
+					markAsActive    : markAsActive
+				},
+				function(){
+					$('#discussion-sentiment-start-button-' + toolQuestionUid).remove();
+				}
+			)
+		}
+	</c:if>
+	
+	$(document).ready(function() {
+		$("time.timeago").timeago();
+	
+		//initialize bootstrap-sliders if "Enable confidence level" option is ON
+		$('.bootstrap-slider').bootstrapSlider();
+
+		<c:if test="${param.showQuestionDetailsButton}">
+			tb_init('a.thickbox');
+		</c:if>
+	
+		<%-- Connect to command websocket only if it is learner UI --%>
+		<c:if test="${not empty toolSessionID}">
+			// command websocket stuff for refreshing
+			// trigger is an unique ID of page and action that command websocket code in Page.tag recognises
+			commandWebsocketHookTrigger = 'assessment-results-refresh-${assessment.contentId}';
+			// if the trigger is recognised, the following action occurs
+			commandWebsocketHook = function() {
+					// delay reload by a period to prevent flood of reloads from students
+					setTimeout(function(){
+						location.reload();
+					}, Math.round(8000 * Math.random()));
+				};
+		</c:if>
+
+		<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscussionSentiment}">
+			$.ajax({
+				url : '${lams}learning/discussionSentiment/checkMonitor.do',
+				data : {
+					toolContentId : ${assessment.contentId}
+				},
+				dataType : 'json',
+				success : function(result){
+					result.forEach(function(discussion){
+						startDiscussionSentiment(discussion.toolQuestionUid, null, false);
+					});
+				}
+			});
+		</c:if>
+	});
+</script>
+<lams:JSImport src="includes/javascript/rating.js" />
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+	
+<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">						
+							
+	<div class="panel panel-default">
+		<div class="panel-heading">			
+			<c:if test="${param.embedded and empty toolSessionID}">
+				<div class="monitor-question-buttons">
+					<c:if test="${assessment.allowDiscloseAnswers and showQuestionMonitoringActionButtons}">
+						<div class="btn-group-xs disclose-button-group" questionUid="${question.uid}">
+							<%-- Allow disclosing correct answers only for multiple choice questions --%>
+							<c:if test="${question.type == 1}">
+								<div class="btn btn-default disclose-correct-button"
+									<c:if test="${question.correctAnswersDisclosed}">
+										disabled="disabled"><i class="fa fa-check text-success">&nbsp;</i
+									</c:if>
+									>
+									<fmt:message key="label.disclose.correct.answers"/>
+								</div>
+							</c:if>
+							<div class="btn btn-default disclose-groups-button"
+								<c:if test="${question.groupsAnswersDisclosed}">
+									disabled="disabled"><i class="fa fa-check text-success">&nbsp;</i
+								</c:if>
+								>
+								<fmt:message key="label.disclose.groups.answers"/>
+							</div>
+						</div>
+					</c:if>
+					
+					<c:if test="${param.showQuestionDetailsButton or assessment.allowDiscussionSentiment}">
+						<div class="btn-group-xs voffset5">
+							<c:if test="${param.showQuestionDetailsButton}">
+								<a class="thickbox btn btn-default"
+								   href='<c:url value="/monitoring/questionSummary.do?sessionMapID=${sessionMapID}"/>&questionUid=${question.uid}&KeepThis=true&TB_iframe=true&modal=true'>
+									<i class="fa fa-info-circle"></i>&nbsp;<fmt:message key="label.monitoring.summary.results.question" />
+								</a>
+							</c:if>
+							
+							<c:if test="${assessment.allowDiscussionSentiment and showQuestionMonitoringActionButtons}">
+								<div id="discussion-sentiment-start-button-${question.uid}"
+								     class="btn btn-default discussion-sentiment-start-button"
+								     onClick="javascript:startDiscussionSentiment(${question.uid}, null, true)">
+									<i class="fa fa-comments"></i>&nbsp;<fmt:message key="label.monitoring.discussion.start"/>
+								</div>
+							</c:if>
+						</div>
+					</c:if>
+					
+				</div>
+			</c:if>
+			
+			<c:if test="${assessment.displayMaxMark}">
+				<span class="pull-right small loffset10" style="padding-top: 3px">
+					<fmt:message key="label.learning.max.mark">
+						<fmt:param value="${question.maxMark}" />
+					</fmt:message>
+				</span>
+			</c:if>
+				
+			<c:if test="${question.answerRequired}">
+				<span class="asterisk pull-right">
+					<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.answer.required"/>" 
+							alt="<fmt:message key="label.answer.required"/>"></i>
+				</span>
+			</c:if>
+			
+			<h3 class="panel-title" style="margin-bottom: 10px;font-size: initial;">
+				<c:if test="${assessment.numbered}">
+						${status.index + sessionMap.questionNumberingOffset}.
+				</c:if>
+
+  				<c:if test="${not sessionMap.hideTitles}">
+					${question.title}
+				</c:if>
+			</h3>
+			
+	
+							
+			<c:if test="${empty question.question}">
+				<!--  must have something here otherwise the question-numbers span does not float properly -->
+				&nbsp;
+			</c:if>
+			${question.question}
+		</div>
+					
+		<div class="panel-body" id="question-area-${status.index}">
+			<c:choose>
+				<c:when test="${question.type == 1}">
+					<c:set var="justificationEligible" value="true" />	
+					<%@ include file="multiplechoice.jsp"%>
+				</c:when>
+				<c:when test="${question.type == 2}">
+					<c:set var="justificationEligible" value="true" />	
+					<%@ include file="matchingpairs.jsp"%>
+				</c:when>
+				<c:when test="${question.type == 3}">
+					<c:set var="justificationEligible" value="false" />	
+					<%@ include file="vsa.jsp"%>
+				</c:when>
+				<c:when test="${question.type == 4}">
+					<c:set var="justificationEligible" value="true" />	
+					<%@ include file="numerical.jsp"%>
+				</c:when>
+				<c:when test="${question.type == 5}">
+					<c:set var="justificationEligible" value="true" />	
+					<%@ include file="truefalse.jsp"%>
+				</c:when>
+				<c:when test="${question.type == 6}">
+					<c:set var="justificationEligible" value="false" />	
+					<%@ include file="essay.jsp"%>
+				</c:when>
+				<c:when test="${question.type == 7}">
+					<c:set var="justificationEligible" value="true" />	
+					<%@ include file="ordering.jsp"%>
+				</c:when>
+				<c:when test="${question.type == 8}">
+					<c:set var="justificationEligible" value="true" />	
+					<c:set var="questionIndex" value="${status.index}"/>
+					<%@ include file="markhedging.jsp"%>
+				</c:when>			
+			</c:choose>
+			
+			<c:if test="${question.type != 8}">
+				<%@ include file="markandpenaltyarea.jsp"%>
+			</c:if>
+			
+			<c:if test="${not empty toolSessionID}">			
+				<%@ include file="historyresponses.jsp"%>
+				
+				<c:if test="${assessment.enableConfidenceLevels and question.type != 8}">
+					<%@ include file="confidencelevel.jsp"%>
+				</c:if>
+			</c:if>
+			
+			<c:if test="${justificationEligible and 
+							 (assessment.allowAnswerJustification or (question.type == 8 and question.hedgingJustificationEnabled))}">
+				<c:choose>
+					<c:when test="${assessment.allowDiscloseAnswers and question.groupsAnswersDisclosed and fn:length(sessions) > 1}">
+						<%-- Display a table with other groups' justifications --%>
+						<div class="question-type voffset20">
+							<fmt:message key="label.answer.justification" />
+						</div>
+						
+						<table class="table table-responsive table-striped table-bordered table-condensed">
+							<c:forEach var="session" items="${sessions}" varStatus="status">
+								<c:set var="sessionResults" value="" />
+								
+								<%-- Get the needed piece of information from a complicated questionSummaries structure --%>
+								<c:set var="questionSummary" value="${questionSummaries[question.uid]}" />
+								<c:set var="sessionResults" 
+									value="${questionSummary.questionResultsPerSession[status.index]}" />
+								<c:set var="sessionResults" value="${sessionResults[fn:length(sessionResults)-1]}" />
+
+								<c:if test="${not empty sessionResults.uid and not empty sessionResults.justification}">
+									<tr role="row">
+										<td width="30%">
+											<c:if test="${not empty session.groupLeader}">
+												<lams:Portrait userId="${session.groupLeader.userId}"/>&nbsp;
+											</c:if>
+											<c:choose>
+												<c:when test="${not empty toolSessionID and toolSessionID == session.sessionId}">
+													<b><fmt:message key="label.your.team"/></b>
+												</c:when>
+												<c:otherwise>
+													<%-- Sessions are named after groups --%>
+													<c:out value="${session.sessionName}" escapeXml="true"/> 
+												</c:otherwise>
+											</c:choose>
+										</td>
+										<td>
+											<c:out value="${sessionResults.justificationEscaped}" escapeXml="false" />
+										</td>
+									</tr>
+								</c:if>
+							</c:forEach>
+						</table>
+					</c:when>
+					<c:when test="${not empty toolSessionID and not empty question.justification}">
+						<%-- Display only own justification --%>
+						<div class="question-type voffset20">
+							<fmt:message key="label.answer.justification" />
+						</div>
+						<p>
+							<c:out value="${question.justificationHtml}" escapeXml="false" />
+						</p>
+					</c:when>
+				</c:choose>
+			</c:if>
+			
+			<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscussionSentiment}">
+				<div id="discussion-sentiment-chart-panel-container-${question.uid}"></div>
+			</c:if>
+		</div>
+					
+	</div>
+</c:forEach>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/confidencelevel.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/confidencelevel.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/confidencelevel.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,35 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:choose>
+	<c:when test="${assessment.confidenceLevelsType == 2}">
+		<c:set var="confidenceLabels">["<fmt:message key="label.not.confident" />", "<fmt:message key="label.confident" />", "<fmt:message key="label.very.confident" />"]</c:set>
+	</c:when>
+	<c:when test="${assessment.confidenceLevelsType == 3}">
+		<c:set var="confidenceLabels">["<fmt:message key="label.not.sure" />", "<fmt:message key="label.sure" />", "<fmt:message key="label.very.sure" />"]</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="confidenceLabels">["0", "50", "100%"]</c:set> 
+	</c:otherwise>
+</c:choose>
+
+<div class="question-type">
+	<fmt:message key="label.confidence" />
+</div>
+
+<div>
+	<input class="bootstrap-slider" type="text"
+		data-slider-enabled="false" data-slider-tooltip="hide"
+		<c:if test="${question.confidenceLevel != -1}">data-slider-value="${question.confidenceLevel}"</c:if>
+		data-slider-ticks-labels='${confidenceLabels}'
+		<c:choose>
+			<c:when test="${assessment.confidenceLevelsType == 2}">
+				data-slider-ticks="[0, 5, 10]"  data-slider-step="5"
+			</c:when>
+			<c:when test="${assessment.confidenceLevelsType == 3}">
+				data-slider-ticks="[0, 5, 10]" data-slider-step="5"
+			</c:when>
+			<c:otherwise>
+				data-slider-ticks="[0, 5, 10]" 
+			</c:otherwise>
+		</c:choose>
+		/>
+</div>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/essay.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/essay.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/essay.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,114 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.short.answer.answer" />
+	</div>
+	
+	<div class="table-responsive">
+		<table class="table table-condensed ${empty question.codeStyle ? 'table-hover' : ''}">
+			<tr>
+				<td>
+					<c:choose>
+						<c:when test="${empty question.codeStyle}">
+							${question.answer}
+						</c:when>
+						<c:otherwise>
+							<pre class="code-style" data-lang="${question.codeStyleMime}">${question.answer}</pre>
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+		</table>
+	</div>
+</c:if>
+
+<c:if test="${assessment.allowDiscloseAnswers && fn:length(sessions) > 1}">
+	<table class="table table-responsive table-striped table-bordered table-hover table-condensed" id="rating-table-${question.uid}">
+		<tr role="row">
+			<td colspan="2" class="text-center">
+				<b><fmt:message key="label.learning.summary.other.team.answers"/></b>
+				<c:if test="${question.groupsAnswersDisclosed and not empty toolSessionID}">
+					<button type="button" class="btn btn-xs btn-default pull-right" onClick="javascript:refreshToRating(${question.uid})">
+						<fmt:message key="label.refresh"/>
+					</button>
+				</c:if>
+			</td>
+		</tr>
+		<c:forEach var="session" items="${sessions}" varStatus="status">
+			<%-- Default answer value, when answers are not disclosed yet --%>
+			<c:set var="answer"><i><fmt:message key="label.not.yet.disclosed"/></i></c:set>
+			
+			<%-- Reset variable value --%>
+			<c:set var="showRating" value="false" />
+			<c:set var="sessionResults" value="" />
+			
+			<c:if test="${question.groupsAnswersDisclosed}">
+				<%-- Get the needed piece of information from a complicated questionSummaries structure --%>
+				<c:set var="questionSummary" value="${questionSummaries[question.uid]}" />
+				<c:set var="sessionResults" 
+					value="${questionSummary.questionResultsPerSession[status.index]}" />
+				<c:set var="sessionResults" value="${sessionResults[fn:length(sessionResults)-1]}" />
+				<c:choose>
+					<%-- If uid is NULL then it is a dummy session result, for a group that has not provided answers
+						 Do not display the group's rating then --%>
+					<c:when test="${empty sessionResults.uid}">
+						<c:set var="sessionResults" value="" />
+					</c:when>
+					<c:otherwise>
+						<c:set var="answer" value="${sessionResults.answer}" />
+						<c:set var="itemRatingDto" value="${itemRatingDtos[sessionResults.uid]}" />
+					</c:otherwise>
+				</c:choose>
+				<c:set var="canRate" value="${toolSessionID != session.sessionId and (!isLeadershipEnabled or isUserLeader)}" />
+				<c:set var="showRating" 
+					value="${canRate or (not empty itemRatingDto.commentDtos and (toolSessionID != session.sessionId or questionSummary.showOwnGroupRating))}" />
+			</c:if>
+			
+			<%-- Show answers for all other teams, and just rating if someone has already commented on this team's answer --%>
+			<c:if test="${not empty sessionResults and (toolSessionID != session.sessionId or showRating)}">
+				<tr role="row" ${toolSessionID == session.sessionId ? 'class="bg-success"' : ''}>
+					<td class="text-center" style="width: 20%" ${showRating ? 'rowspan="2"' : ''}>
+						<lams:Portrait userId="${session.groupLeader.userId}"/>&nbsp;
+						<c:choose>
+							<c:when test="${toolSessionID == session.sessionId}">
+								<b><fmt:message key="label.your.team"/></b>
+							</c:when>
+							<c:otherwise>
+								<%-- Sessions are named after groups --%>
+								<c:out value="${session.sessionName}" escapeXml="true"/> 
+							</c:otherwise>
+						</c:choose>
+					</td>
+					
+					<%-- Do not show your own answer --%> 
+					<c:if test="${toolSessionID != session.sessionId}">
+							<td>
+								<c:choose>
+									<c:when test="${empty question.codeStyle}">
+										<c:out value="${answer}" escapeXml="false" /> 
+									</c:when>
+									<c:otherwise>
+										<pre class="code-style" data-lang="${question.codeStyleMime}">${answer}</pre>
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+					</c:if>
+
+					<c:if test="${showRating}">
+						<tr>
+							<td>
+								<%-- Do not allow voting for own answer, and for non-leaders if leader is enabled --%>
+								<lams:Rating itemRatingDto="${itemRatingDto}"
+											 isItemAuthoredByUser="${not canRate}"
+											 showAllComments="true"
+											 refreshOnComment="rating-table-${question.uid}" />
+							</td>
+						</tr>
+					</c:if>
+				
+			</c:if>
+		</c:forEach>
+	</table>
+</c:if>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/historyresponses.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/historyresponses.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/historyresponses.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,109 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${assessment.allowHistoryResponses && (fn:length(question.questionResults) > 1)}">
+	<h5 class="text-muted"><fmt:message key="label.learning.question.summary.history.responces" /></h5>
+
+	<table class="table table-striped text-muted">
+		<tr>
+			<th style="width: 70px">
+				#
+			</th>		
+			<th style="width: 25%">
+				<fmt:message key="label.learning.summary.completed.on" />
+			</th>
+			<th>
+				<fmt:message key="label.learning.question.summary.response" />
+			</th>
+			<c:if test="${assessment.allowGradesAfterAttempt}">			
+				<th style="width: 70px" >
+					<fmt:message key="label.authoring.basic.list.header.mark" />
+				</th>	
+			</c:if>		
+		</tr>
+		<c:forEach var="item" items="${question.questionResults}" varStatus="status">
+			<c:set var="questionResult" value="${item[0]}" />
+			<c:set var="currentAssessmentResult" value="${item[1]}" />
+			<tr>
+				<td>
+					${status.index + 1} 
+				</td>
+				<td>
+					<div>
+						<lams:Date value="${currentAssessmentResult.finishDate}" timeago="true"/> 
+					</div>
+				</td>					
+				<td>
+					<c:choose>
+						<c:when test="${question.type == 1}">
+							<c:forEach var="option" items="${question.optionDtos}">
+								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+									<c:if test="${optionAnswer.answerBoolean && (optionAnswer.optionUid == option.uid)}">
+										${option.name}
+									</c:if>
+								</c:forEach>					
+							</c:forEach>						
+						</c:when>
+						<c:when test="${question.type == 2}">
+							<table style="padding: 0px; margin: 0px; border: none; " cellspacing="0" cellpadding="0">
+								<c:forEach var="option" items="${question.optionDtos}">
+									<tr>
+										<td style="width:40%; background: none; padding: 0px; margin: 0px; border: none;">
+											${option.matchingPair}
+										</td>
+										<td style="background: none; padding: 0px; margin: 0px; border: none; vertical-align: middle;">
+											- 
+											<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+												<c:if test="${option.uid == optionAnswer.optionUid}">
+													<c:forEach var="questionOption2" items="${question.optionDtos}">
+														<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
+															${questionOption2.name}
+														</c:if>
+													</c:forEach>
+												</c:if>
+											</c:forEach>										
+										</td>
+									</tr>
+								</c:forEach>
+							</table>
+						</c:when>
+						<c:when test="${question.type == 3}">
+							${questionResult.answer}
+						</c:when>
+						<c:when test="${question.type == 4}">
+							${questionResult.answer}
+						</c:when>
+						<c:when test="${question.type == 5}">
+							<c:if test="${questionResult.answer != null}">			
+								${questionResult.answerBoolean}
+							</c:if>
+						</c:when>
+						<c:when test="${question.type == 6}">
+							${questionResult.answer}
+						</c:when>
+						<c:when test="${question.type == 7}">
+							<c:forEach var="i" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
+								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+									<c:if test="${optionAnswer.answerInt == i}">		
+										<c:forEach var="option" items="${question.optionDtos}">
+											<c:if test="${optionAnswer.optionUid == option.uid}">
+												${option.name}
+											</c:if>
+										</c:forEach>
+									</c:if>								
+								</c:forEach>
+							</c:forEach>
+						</c:when>
+					</c:choose>
+				</td>
+				<c:if test="${assessment.allowGradesAfterAttempt}">
+					<td style="padding-left: 0px;" >
+						<div style="text-align: center;">
+							<fmt:formatNumber value="${questionResult.mark}" maxFractionDigits="3"/>
+						</div>
+					</td>
+				</c:if>		
+			</tr>
+		</c:forEach>
+
+	</table>
+</c:if>							
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/markandpenaltyarea.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/markandpenaltyarea.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/markandpenaltyarea.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,21 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${assessment.allowQuestionFeedback && (question.feedback != null)}">
+	<div class="feedback">
+		<c:out value="${question.feedback}" escapeXml="false" />
+	</div>
+</c:if>
+	
+<c:if test="${assessment.allowGradesAfterAttempt}">
+	<div class="text-primary voffset5">
+		<fmt:message key="label.learning.marks" >
+			<fmt:param><fmt:formatNumber value="${question.mark}" maxFractionDigits="3"/></fmt:param>
+			<fmt:param>${question.maxMark}</fmt:param>
+		</fmt:message>&nbsp;		
+		<c:if test="${(question.penalty ne 0) && (question.mark != question.maxMark) && (fn:length(question.questionResults) > 1) }">
+			<fmt:message key="label.learning.penalty" >
+				<fmt:param><fmt:formatNumber value="${question.penalty}" maxFractionDigits="2"/></fmt:param>
+			</fmt:message>
+		</c:if>
+	</div>	
+</c:if>
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/markhedging.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/markhedging.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/markhedging.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,90 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div class="question-type">
+	<fmt:message key="label.assign.hedging.mark">
+		<fmt:param>${question.maxMark}</fmt:param>
+	</fmt:message>
+</div>
+
+<div class="table-responsive">
+	<table class="table table-hover table-condensed">
+		<c:forEach var="option" items="${question.optionDtos}">
+			<tr>
+				<td class="complete-item-gif">
+					
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && option.correct}">
+						<i class="fa fa-check text-success"></i>
+					</c:if>
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && !option.correct}">
+						<i class="fa fa-times text-danger"></i>
+					</c:if>
+							
+				</td>
+				
+				<td>
+					<c:out value="${option.name}" escapeXml="false" />
+				</td>
+				
+				<td style="width: 100px;">
+					<c:if test="${not empty toolSessionID}">
+						<select name="question${questionIndex}_${option.displayOrder}" class="mark-hedging-select" data-question-index="${questionIndex}"
+								disabled="disabled">
+							
+							<c:forEach var="i" begin="0" end="${question.maxMark}">
+								<option
+									<c:if test="${option.answerInt == i}">selected="selected"</c:if>						
+								>${i}</option>
+							</c:forEach>
+							
+						</select>
+					</c:if>
+				</td>
+				
+				<c:if test="${assessment.allowQuestionFeedback}">
+					<td width="30%">
+						<c:if test="${option.answerInt > 0}">
+							<c:out value="${option.feedback}" escapeXml="false" />
+						</c:if>
+					</td>
+				</c:if>
+				
+			</tr>
+		</c:forEach>
+	</table>
+</div>
+
+<c:if test="${assessment.allowQuestionFeedback}">
+	<div class="feedback">
+		<c:choose>
+			<c:when test="${question.mark == question.maxMark}">
+				<c:out value="${question.feedbackOnCorrect}" escapeXml="false" />
+			</c:when>
+			<c:when test="${question.mark > 0}">
+				<c:out value="${question.feedbackOnPartiallyCorrect}" escapeXml="false" />
+			</c:when>
+			<c:when test="${question.mark <= 0}">
+				<c:out value="${question.feedbackOnIncorrect}" escapeXml="false" />
+			</c:when>		
+		</c:choose>
+	</div>
+</c:if>
+
+<c:if test="${assessment.allowQuestionFeedback && (question.feedback != null)}">
+	<div class="feedback">
+		<c:out value="${question.feedback}" escapeXml="false" />
+	</div>
+</c:if>
+
+<c:if test="${not empty toolSessionID and assessment.allowRightAnswersAfterQuestion}">
+	<div class="question-feedback" style="padding-bottom: 10px;">
+		<fmt:message key="label.learning.marks" >
+			<fmt:param><fmt:formatNumber value="${question.mark}" maxFractionDigits="3"/></fmt:param>
+			<fmt:param>${question.maxMark}</fmt:param>
+		</fmt:message>
+		<c:if test="${(question.mark != question.maxMark) && (fn:length(question.questionResults) > 1)}">
+			<fmt:message key="label.learning.penalty" >
+				<fmt:param><fmt:formatNumber value="${question.penalty}" maxFractionDigits="2"/></fmt:param>
+			</fmt:message>
+		</c:if>
+	</div>
+</c:if>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/matchingpairs.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/matchingpairs.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/matchingpairs.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,50 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.authoring.basic.type.matching.pairs" />
+	</div>
+</c:if>
+
+<div class="question-type">
+	<fmt:message key="label.learning.matching.pairs.possible" />
+	<ul class="${empty toolSessionID ? 'loffset20' : ''}">
+		<c:forEach var="possibleOption" items="${question.matchingPairOptions}">
+			<li>${possibleOption.name}</li>
+		</c:forEach>
+	</ul>
+</div>
+
+<div class="table-responsive">
+	<table class="table table-hover table-condensed">
+		<c:forEach var="option" items="${question.optionDtos}">
+			<tr>
+				<c:if test="${not empty toolSessionID}">
+					<td class="complete-item-gif">
+						<c:if test="${assessment.allowRightAnswersAfterQuestion && (option.answerInt == option.uid)}">
+							<i class="fa fa-check text-success"></i>	
+						</c:if>
+						<c:if test="${assessment.allowWrongAnswersAfterQuestion && (option.answerInt != -1) && (option.answerInt != option.uid)}">
+							<i class="fa fa-times text-danger"></i>	
+						</c:if>			
+					</td>
+				</c:if>
+						
+				<td>
+					<c:out value="${option.matchingPair}" escapeXml="false" />
+				</td>
+				
+				<c:if test="${not empty toolSessionID}">
+					<td style="width: 100px;">
+						<fmt:message key="label.learning.matching.pairs.chosen" /><br>
+						<c:forEach var="possibleOption" items="${question.matchingPairOptions}">
+							<c:if test="${option.answerInt == possibleOption.uid}">
+								${possibleOption.name}
+							</c:if>
+						</c:forEach>
+					</td>
+				</c:if>
+			</tr>
+		</c:forEach>
+	</table>
+</div>
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/multiplechoice.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/multiplechoice.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/multiplechoice.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,131 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<c:choose>
+			<c:when test="${question.multipleAnswersAllowed}">
+				<fmt:message key="label.learning.choose.at.least.one.answer" />
+			</c:when>
+			<c:otherwise>
+				<fmt:message key="label.learning.choose.one.answer" />
+			</c:otherwise>
+		</c:choose>
+	</div>
+</c:if>
+
+<div class="table-responsive">
+	<table class="table table-hover table-condensed">
+		<c:forEach var="option" items="${question.optionDtos}" varStatus="answerStatus">
+			<c:set var="isCorrect" 
+				   value="${(assessment.allowDiscloseAnswers 
+				   			 ? question.correctAnswersDisclosed : assessment.allowRightAnswersAfterQuestion)
+				    		 && (option.maxMark > 0)}" />
+			<c:set var="isWrong"
+				   value="${(assessment.allowDiscloseAnswers 
+				   			 ? question.correctAnswersDisclosed : assessment.allowWrongAnswersAfterQuestion)
+				    		&& (option.maxMark <= 0)}" />
+			<tr ${isCorrect ? 'class="bg-success"' : '' }>
+				<td class="complete-item-gif">
+				    <c:if test="${option.answerBoolean && isCorrect}">
+					    <i class="fa fa-check text-success"></i>
+		            </c:if>
+				    <c:if test="${option.answerBoolean && isWrong}">
+					    <i class="fa fa-times text-danger"></i>	
+				    </c:if>			
+                </td>
+				<td class="${question.prefixAnswersWithLetters?'has-radio-button-prefix':'has-radio-button'}">
+					<c:if test="${not empty toolSessionID}">
+						<c:choose>
+							<c:when test="${question.multipleAnswersAllowed}">
+								<input type="checkbox" name="question${status.index}_${option.displayOrder}" value="${true}"
+			 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
+									disabled="disabled"
+								/>
+							</c:when>
+							<c:otherwise>
+								<input type="radio" name="question${status.index}" value="${option.displayOrder}"
+			 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
+			 						disabled="disabled"
+								/>
+							</c:otherwise>
+						</c:choose>
+					</c:if>
+					
+					<c:if test="${question.prefixAnswersWithLetters}">
+			 			&nbsp;${option.formatPrefixLetter(answerStatus.index)}
+ 	                </c:if>	
+				</td>
+				
+				<td ${question.prefixAnswersWithLetters?'class="has-radio-button-prefix-answer"':''}">
+					<c:out value="${option.name}" escapeXml="false" />
+				</td>
+				
+				<c:if test="${assessment.allowQuestionFeedback}">
+					<td width=30%;">
+						<c:if test="${option.answerBoolean}">
+							<c:out value="${option.feedback}" escapeXml="false" />
+						</c:if>
+					</td>		
+				</c:if>
+				
+			</tr>
+			
+			<c:if test="${assessment.allowDiscloseAnswers && question.groupsAnswersDisclosed && fn:length(sessions) > 1}">
+				<c:set var="teams" value="" />
+				<c:forEach var="session" items="${sessions}" varStatus="sessionStatus">
+					<%-- Now groups other than this one --%>
+					<c:if test="${sessionMap.toolSessionID != session.sessionId}">
+						<%-- Get the needed piece of information from a complicated questionSummaries structure --%>
+						<c:set var="sessionResults" 
+							   value="${questionSummaries[question.uid].questionResultsPerSession[sessionStatus.index]}" />
+						<c:set var="sessionResults"
+						 	   value="${sessionResults[fn:length(sessionResults)-1]}" />
+						<c:forEach var="sessionOption" items="${sessionResults.optionAnswers}">
+							<c:if test="${sessionOption.answerBoolean && option.uid == sessionOption.optionUid}">
+								<c:set var="teams">
+									${teams}
+									<lams:Portrait userId="${session.groupLeader.userId}"/>&nbsp;
+									<c:out value="${session.sessionName}" escapeXml="true"/>&nbsp;
+									<c:if test="${not empty sessionResults.justification}">
+										<lams:Popover titleKey="label.answer.justification">
+							          		<c:out value='${sessionResults.justification}' />
+							          	</lams:Popover>
+									</c:if>
+								</c:set>
+							</c:if>
+						</c:forEach>
+					</c:if>
+				</c:forEach>
+				<c:if test="${not empty teams}">
+					<tr class="selected-by-groups" >
+						<td ${isCorrect ? "class='bg-success'" : "" }></td>
+						<td ${isCorrect ? "class='bg-success'" : "" }></td>
+						<td colspan="2" ${isCorrect ? "class='bg-success'" : "" }>
+							<span >
+								<fmt:message key="label.learning.summary.selected.by" />
+							</span>
+							${teams}
+						</td>
+					</tr>
+				</c:if>
+			</c:if>
+			
+		</c:forEach>
+	</table>
+</div>
+
+<c:if test="${assessment.allowQuestionFeedback}">
+	<div class="feedback">
+		<c:choose>
+			<c:when test="${question.optionMaxMark >= 1}">
+				<c:out value="${question.feedbackOnCorrect}" escapeXml="false" />
+			</c:when>
+			<c:when test="${question.optionMaxMark > 0}">
+				<c:out value="${question.feedbackOnPartiallyCorrect}" escapeXml="false" />
+			</c:when>
+			<c:otherwise>
+				<c:out value="${question.feedbackOnIncorrect}" escapeXml="false" />
+			</c:otherwise>		
+		</c:choose>
+	</div>
+</c:if>
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/numerical.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/numerical.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/numerical.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,34 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.short.answer.answer" />
+	</div>
+	
+	<div class="table-responsive">
+		<table class="table table-hover table-condensed">
+			<tr>
+				<td class="complete-item-gif">
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
+						<i class="fa fa-check text-success"></i>	
+					</c:if>			
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
+						<i class="fa fa-times text-danger"></i>	
+					</c:if>
+				</td>
+				
+				<td>
+					<input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answer}' />" class="form-control"
+						disabled="disabled"
+					/>	
+				</td>
+			</tr>
+		</table>
+	</div>		
+</c:if>
+
+<c:if test="${assessment.allowQuestionFeedback && (question.questionFeedback != null)}">
+	<div class="feedback">
+		<c:out value="${question.questionFeedback}" escapeXml="false" />
+	</div>
+</c:if>	
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/ordering.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/ordering.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/ordering.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,41 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.ordering.sort.answers" />
+	</div>
+</c:if>
+
+<div class="table-responsive">
+	<table class="table table-hover table-condensed">
+		<c:forEach var="option" items="${question.optionDtos}" varStatus="ordStatus">
+			<tr>
+				<td class="complete-item-gif">
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && (option.displayOrder == ordStatus.index)}">
+						<i class="fa fa-check text-success"></i>	
+					</c:if>
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && (option.displayOrder != ordStatus.index)}">
+						<i class="fa fa-times text-danger"></i>	
+					</c:if>			
+				</td>											
+			
+				<td class="ordering-option">
+					<c:out value="${option.name}" escapeXml="false" />
+				</td>		
+			</tr>
+		</c:forEach>
+	</table>
+</div>
+	
+<c:if test="${assessment.allowQuestionFeedback}">
+	<div class="feedback">
+		<c:choose>
+			<c:when	test="${question.mark >= question.maxMark}">
+				<c:out value="${question.feedbackOnCorrect}" escapeXml="false" />
+			</c:when>
+			<c:otherwise>
+				<c:out value="${question.feedbackOnIncorrect}" escapeXml="false" />
+			</c:otherwise>
+		</c:choose>		
+	</div>
+</c:if>		
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/truefalse.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/truefalse.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/truefalse.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,89 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.short.answer.answer" />
+	</div>
+</c:if>
+
+<div class="table-responsive">
+	<table class="table table-hover table-condensed">
+		<tr>
+			<td class="complete-item-gif">
+				
+				<c:if test="${(question.answer != null) 
+						&& (assessment.allowRightAnswersAfterQuestion && (question.answerBoolean == question.correctAnswer) 
+						|| assessment.allowWrongAnswersAfterQuestion && (question.answerBoolean != question.correctAnswer)) }">
+					
+					<c:choose>
+						<c:when test="${question.correctAnswer}">
+							<i class="fa fa-check text-success"></i>
+						</c:when>
+						<c:otherwise>
+							<i class="fa fa-times text-danger"></i>	
+						</c:otherwise>		
+					</c:choose>					
+					
+				</c:if>
+						
+			</td>
+					
+			<td class="has-radio-button">
+				<c:if test="${not empty toolSessionID}">
+					<input type="radio" name="question${status.index}" value="${true}"
+		 				<c:if test="${question.answerBoolean}">checked="checked"</c:if>
+						disabled="disabled"	
+					/>
+				</c:if>
+			</td>
+			<td>
+				<fmt:message key="label.learning.true.false.true" />
+			</td>
+		</tr>
+		<tr>
+			<td class="complete-item-gif">
+				
+				<c:if test="${(question.answer != null) 
+						&& (assessment.allowRightAnswersAfterQuestion && (question.answerBoolean == question.correctAnswer) 
+						|| assessment.allowWrongAnswersAfterQuestion && (question.answerBoolean != question.correctAnswer)) }">
+					
+					<c:choose>
+						<c:when test="${!question.correctAnswer}">
+							<i class="fa fa-check text-success"></i>	
+						</c:when>
+						<c:otherwise>
+							<i class="fa fa-times text-danger"></i>	
+						</c:otherwise>		
+					</c:choose>					
+				</c:if>				
+						
+			</td>
+						
+			<td class="has-radio-button">
+				<c:if test="${not empty toolSessionID}">
+					<input type="radio" name="question${status.index}" value="${false}"
+		 				<c:if test="${(!question.answerBoolean) and (question.answer != null)}">checked="checked"</c:if>
+						disabled="disabled"
+					/>
+				</c:if>
+			</td>
+			<td>
+				<fmt:message key="label.learning.true.false.false" />
+			</td>
+		</tr>
+	</table>
+</div>
+
+<c:choose>
+	<c:when test="${question.answerBoolean}">
+		<div class="feedback">
+			<c:out value="${question.feedbackOnCorrect}" escapeXml="false" />
+		</div>
+	</c:when>
+	<c:when test="${!question.answerBoolean}">
+		<div class="feedback">
+			<c:out value="${question.feedbackOnIncorrect}" escapeXml="false" />
+		</div>
+	</c:when>		
+</c:choose>
+
Index: lams_tool_assessment/web/pages/learning/resultsbootstrap3/vsa.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/resultsbootstrap3/vsa.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/resultsbootstrap3/vsa.jsp	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -0,0 +1,36 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.short.answer.answer" />
+	</div>
+	
+	<div class="table-responsive">
+		<table class="table table-hover table-condensed">
+			<tr>
+				<td class="complete-item-gif">
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
+						<i class="fa fa-check text-success"></i>
+					</c:if>			
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
+						<i class="fa fa-times text-danger"></i>
+					</c:if>	
+				</td>
+				
+				<td>
+					<input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answer}' />"  class="form-control" 
+						disabled="disabled"
+					/>	
+				</td>	
+			</tr>
+		</table>
+	</div>	
+
+</c:if>
+
+<c:if test="${assessment.allowQuestionFeedback && (question.questionFeedback != null)}">
+	<div class="feedback">
+		<c:out value="${question.questionFeedback}" escapeXml="false" />
+	</div>
+</c:if>	
+
Index: lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -r067e828d94163bebff1b41b13e9503f1e6039dc4
--- lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(.../discloseAnswers5.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(.../discloseAnswers5.jsp)	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
@@ -5,7 +5,7 @@
 		var toolContentId = resultsPane.data('toolContentId');
 		// load an embedded results list
 		// show details button needs to be set in the page which included this page
-		resultsPane.load("<c:url value='/learning/showResultsForTeacher.do'/>?embedded=true&sessionMapID=${sessionMapID}&showQuestionDetailsButton="
+		resultsPane.load("<c:url value='/learning/showResultsForTeacher.do'/>?embedded=true&bootstrap5=true&sessionMapID=${sessionMapID}&showQuestionDetailsButton="
 						  + showQuestionDetailsButton + "&toolContentID=" + toolContentId, function(){
 			var assessmentQuestionsPane = $(this).closest('.assessment-questions-pane'),
 				// are any correct/groups buttons clickable?