Index: lams_central/web/includes/javascript/dialog5.js
===================================================================
diff -u -r3e5f23228af144f86f91a0dd45d342702d22c22d -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612
--- lams_central/web/includes/javascript/dialog5.js	(.../dialog5.js)	(revision 3e5f23228af144f86f91a0dd45d342702d22c22d)
+++ lams_central/web/includes/javascript/dialog5.js	(.../dialog5.js)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
@@ -387,7 +387,6 @@
 }
 
 function showToast(text) {
-	debugger
 	let toast = $('#toast-template').clone().attr('id', null).appendTo('#toast-container');
 	toast.find('.toast-body', toast).text(text);
 	toast = new bootstrap.Toast(toast[0]);
Index: lams_learning/web/css/components-learner.css
===================================================================
diff -u -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612
--- lams_learning/web/css/components-learner.css	(.../components-learner.css)	(revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85)
+++ lams_learning/web/css/components-learner.css	(.../components-learner.css)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
@@ -224,25 +224,23 @@
     margin: -16px
 }
 
-.lcard, .lcard-no-borders {
+.lcard {
     border-top-left-radius: 1.25rem;
     border-top-right-radius: 0rem;
-    border-bottom-right-radius: 1.25rem;    
+    border-bottom-right-radius: 1.25rem;
 }
 
 .lcard-no-borders {
-    border: 0px
+    border: 0;
 }
 
 .lcard .lcard-header-lg {
     border-top-left-radius: 1.25rem;
     border-top-right-radius: 0rem;
     font-size: 1.3rem;
-    padding: 1rem
+    padding: 1rem;
 }
 
 .lcard .lcard-header-button-border {
-    border-bottom: 0.2rem solid var(--bs-primary)
-}
-
-
+    border-bottom: 0.2rem solid var(--bs-primary);
+}
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java
===================================================================
diff -u -r71214349374413ceff22bcdf92734911bf79c3b7 -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java	(.../LearningController.java)	(revision 71214349374413ceff22bcdf92734911bf79c3b7)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java	(.../LearningController.java)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
@@ -178,6 +178,7 @@
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 	sessionMap.put(ATTR_CONTENT, qaContent);
 	sessionMap.put(AttributeNames.USER, user);
+	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaService, qaContent);
 	generalLearnerFlowDTO.setUserUid(user.getQueUsrId().toString());
@@ -1318,4 +1319,4 @@
 	return qaUser;
     }
 
-}
+}
\ No newline at end of file
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r2f6e8f9ecfee5b8078479721374d0cbeee3d699d -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 2f6e8f9ecfee5b8078479721374d0cbeee3d699d)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
@@ -12,10 +12,10 @@
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 <fmt:message key="activity.title" var="title"/>
 
-<lams:PageLearner title="${generalLearnerFlowDTO.activityTitle}" toolSessionID="${generalLearnerFlowDTO.toolSessionID}" >
+<lams:PageLearner title="${generalLearnerFlowDTO.activityTitle}" toolSessionID="${sessionMap.toolSessionID}" >
 
 	<style media="screen,projection" type="text/css">
-		
+
 		div.growlUI h1, div.growlUI h2 {
 			color: white;
 			margin: 5px 5px 5px 0px;
@@ -27,30 +27,30 @@
 	<div id="instructions" class="instructions" aria-label="<fmt:message key='label.authoring.instructions'/>">
 		<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
 	</div>
-	<hr class="mx-5 text-primary">		
+	<hr class="mx-5 text-primary">
 
 
 	<div class="container-lg">
 		<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
 		<form:form action="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential' ? 'getNextQuestion.do' : 'submitAnswersContent.do'}"
-		method="POST" target="_self" id="qaLearningForm" modelAttribute="qaLearningForm">
+				   method="POST" target="_self" id="qaLearningForm" modelAttribute="qaLearningForm">
 
 			<!-- Advanced settings and notices -->
 
 			<c:if test="${generalLearnerFlowDTO.noReeditAllowed}">
-				<lams:Alert type="danger" id="noRedosAllowed" close="false">
+				<lams:Alert5 type="danger" id="noRedosAllowed" close="false">
 					<fmt:message key="label.noredo.enabled" />
-				</lams:Alert>
+				</lams:Alert5>
 			</c:if>
 
 			<c:if test="${not empty sessionMap.submissionDeadline}">
-				<lams:Alert type="danger" id="submission-deadline" close="false">
+				<lams:Alert5 type="danger" id="submission-deadline" close="false">
 					<fmt:message key="authoring.info.teacher.set.restriction">
 						<fmt:param>
 							<lams:Date value="${sessionMap.submissionDeadline}" />
 						</fmt:param>
 					</fmt:message>
-				</lams:Alert>
+				</lams:Alert5>
 			</c:if>
 
 			<c:if test="${isLeadershipEnabled}">
@@ -93,9 +93,9 @@
 
 					<c:otherwise>
 						<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-							<p style="font-size: smaller;">
-							<fmt:message key="label.feedback.combined" />&nbsp;<c:out
-								value="${generalLearnerFlowDTO.remainingQuestionCount}" />&nbsp;<fmt:message key="label.questions.simple" />
+							<p>
+								<fmt:message key="label.feedback.combined" />&nbsp;<c:out
+									value="${generalLearnerFlowDTO.remainingQuestionCount}" />&nbsp;<fmt:message key="label.questions.simple" />
 							</p>
 						</c:if>
 
@@ -109,191 +109,191 @@
 		</form:form>
 	</div>
 
-<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
-<script type="text/JavaScript">
-	var minWordsLimitLabel = '<fmt:message key="label.minimum.number.words" ><fmt:param>{0}</fmt:param></fmt:message>';
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
+	<script type="text/JavaScript">
+		var minWordsLimitLabel = '<fmt:message key="label.minimum.number.words" ><fmt:param>{0}</fmt:param></fmt:message>';
 
-	function submitMethod(actionMethod) {
-		
-		//validate answers
-		var submit = true;
-		if (actionMethod != 'getPreviousQuestion') {
-			
-			//check for min words limit 
-			jQuery(".min-words-limit-enabled").each(function() {
-				
-				var questionId = (${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}) ? "" : $(this).data("sequence-id");
-				var isCkeditor = $(this).data("is-ckeditor");
-				
-				var value;
-				var instance;
-				if (isCkeditor) {
-					instance = CKEDITOR.instances["answer" + questionId];
-					value = CKEDITOR.instances["answer" + questionId].getData();
-					
-				} else {
-					instance = $("#answer"+ questionId);
-					value =  $("#answer"+ questionId).val();
-				}
-				
-				var numberEnteredWords = getNumberOfWords(value, isCkeditor); 
-				
-				var minWordsLimit = $(this).data("min-words-limit");
-				if (numberEnteredWords < minWordsLimit) {
-					var minWordsLimitLabelStr = minWordsLimitLabel.replace("{0}", ": " + minWordsLimit);
-					alert("<fmt:message key="label.question" /> "+ questionId +". " +  minWordsLimitLabelStr);
-					instance.focus();
-					return submit = false;
-				}
-			});
+		function submitMethod(actionMethod) {
 
-			//check for blank answers
-			if (submit) {
-				jQuery(".text-area").each(function() {
-					if (jQuery.trim($(this).val()) == "") {
-						if (confirm("<fmt:message key="warning.empty.answers" />")) {
-							doSubmit(actionMethod);
-							return false;
-						} else {
-							this.focus();
-							return submit = false;
-						}
+			//validate answers
+			var submit = true;
+			if (actionMethod != 'getPreviousQuestion') {
+
+				//check for min words limit
+				jQuery(".min-words-limit-enabled").each(function() {
+
+					var questionId = (${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}) ? "" : $(this).data("sequence-id");
+					var isCkeditor = $(this).data("is-ckeditor");
+
+					var value;
+					var instance;
+					if (isCkeditor) {
+						instance = CKEDITOR.instances["answer" + questionId];
+						value = CKEDITOR.instances["answer" + questionId].getData();
+
+					} else {
+						instance = $("#answer"+ questionId);
+						value =  $("#answer"+ questionId).val();
 					}
+
+					var numberEnteredWords = getNumberOfWords(value, isCkeditor);
+
+					var minWordsLimit = $(this).data("min-words-limit");
+					if (numberEnteredWords < minWordsLimit) {
+						var minWordsLimitLabelStr = minWordsLimitLabel.replace("{0}", ": " + minWordsLimit);
+						showToast("<fmt:message key="label.question" /> "+ questionId +". " +  minWordsLimitLabelStr);
+						instance.focus();
+						return submit = false;
+					}
 				});
+
+				//check for blank answers
+				if (submit) {
+					jQuery(".text-area").each(function() {
+						if (jQuery.trim($(this).val()) == "") {
+							if (confirm("<fmt:message key="warning.empty.answers" />")) {
+								doSubmit(actionMethod);
+								return false;
+							} else {
+								this.focus();
+								return submit = false;
+							}
+						}
+					});
+				}
 			}
+
+			if (submit) {
+				doSubmit(actionMethod);
+			}
 		}
-		
-		if (submit) {
-			doSubmit(actionMethod);
+
+		function doSubmit(actionMethod) {
+			$('.btn').prop('disabled', true);
+			document.forms.qaLearningForm.action=actionMethod+".do";
+			document.forms.qaLearningForm.submit();
 		}
-	}
-	
-	function doSubmit(actionMethod) {
-		$('.btn').prop('disabled', true);
-		document.forms.qaLearningForm.action=actionMethod+".do"; 
-		document.forms.qaLearningForm.submit();
-	}
 
-	<c:if test="${!hasEditRight && mode != 'teacher'}">
+		<c:if test="${!hasEditRight && mode != 'teacher'}">
 		setInterval("checkLeaderProgress();",45000);// Auto-Refresh every 1 minute for non-leaders
-	</c:if>
-	
-	function checkLeaderProgress() {
-		$.ajax({
-			async: false,
-			url: '<c:url value="checkLeaderProgress.do"/>',
-			data: 'toolSessionID=' + $("#tool-session-id").val(),
-			dataType: 'json',
-			type: 'post',
-			success: function (json) {
-				if (json.isLeaderResponseFinalized) {
-					location.reload();
+		</c:if>
+
+		function checkLeaderProgress() {
+			$.ajax({
+				async: false,
+				url: '<c:url value="checkLeaderProgress.do"/>',
+				data: 'toolSessionID=' + $("#tool-session-id").val(),
+				dataType: 'json',
+				type: 'post',
+				success: function (json) {
+					if (json.isLeaderResponseFinalized) {
+						location.reload();
+					}
 				}
-			}
-		   });
-	}
-	
-	//autoSaveAnswers if hasEditRight
-	if (${hasEditRight}) {
-			
-		var interval = "30000"; // = 30 seconds
-		window.setInterval(learnerAutosave, interval);
-		
-		function learnerAutosave(isCommand){
-			// isCommand means that the autosave was triggered by force complete or another command websocket message
-			// in this case do not check multiple tabs open, just autosave
-			if (!isCommand) {
-			  let shouldAutosave = preventLearnerAutosaveFromMultipleTabs(interval);
-			  if (!shouldAutosave) {
-				return;
-			  }
-			}
-			
-			//fire onchange event for textareas/ckeditors
-			if (${generalLearnerFlowDTO.allowRichEditor}) {
-				for ( instance in CKEDITOR.instances ) {
-					CKEDITOR.instances[instance].updateElement();
-				}
-			} else {
-				$("textarea[name$=__textarea]").change();
-			}
-			
-			//ajax form submit
-			$('#qaLearningForm').ajaxSubmit({
-				url: '<c:url value="autoSaveAnswers.do?date=" />' + new Date().getTime(),
-				success: function() {
-					   $.growlUI('<i class="fa fa-lg fa-floppy-o"></i> <fmt:message key="label.learning.draft.autosaved" />');
-				}
 			});
 		}
-	}
 
-	//min words counter
-	$(document).ready(function() {
-		
-		//character count fuction in case ckeditor is OFF
-		function counter(event) {
-			var questionId = event.data.questionId;
-			var minWordsLimit = event.data.minWordsLimit;
-			var value = $("#answer"+ questionId).val();
-			
-			var numberEnteredWords = getNumberOfWords(value, false);
-			var numberRequiredWords = (minWordsLimit > numberEnteredWords) ? minWordsLimit - numberEnteredWords : 0;
-			$('#words-required-' + questionId).html(numberRequiredWords);
-		};
+		//autoSaveAnswers if hasEditRight
+		if (${hasEditRight}) {
 
-		//character count fuction in case ckeditor is ON
-		function ckeditorCounter(event) {
-			var questionId = event.listenerData.questionId;
-			var minWordsLimit = event.listenerData.minWordsLimit;
-			var value = event.editor.getData();
-			
-			var numberEnteredWords = getNumberOfWords(value, true);
-			var numberRequiredWords = (minWordsLimit > numberEnteredWords) ? minWordsLimit - numberEnteredWords : 0;
-			$('#words-required-' + questionId).html(numberRequiredWords);
-		};
+			var interval = "30000"; // = 30 seconds
+			window.setInterval(learnerAutosave, interval);
 
-		//check for min words limit 
-		jQuery(".min-words-limit-enabled").each(function() {
+			function learnerAutosave(isCommand){
+				// isCommand means that the autosave was triggered by force complete or another command websocket message
+				// in this case do not check multiple tabs open, just autosave
+				if (!isCommand) {
+					let shouldAutosave = preventLearnerAutosaveFromMultipleTabs(interval);
+					if (!shouldAutosave) {
+						return;
+					}
+				}
 
-			var isCkeditor = $(this).data("is-ckeditor");
-			var questionId = (${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}) ? "" : $(this).data("sequence-id");
-			var minWordsLimit = $(this).data("min-words-limit");
-			
-			//assign function
-			if (isCkeditor) {
-				var ckeditor = CKEDITOR.instances["answer" + questionId];
-				
-				ckeditor.on('change', ckeditorCounter, null, {questionId: questionId, minWordsLimit: minWordsLimit} );
-				//count characters initially
-				ckeditor.on('instanceReady', ckeditorCounter, null, {questionId: questionId, minWordsLimit: minWordsLimit});
-				  
-			} else {
-				$("#answer" + questionId)
-					.on('change keydown keypress keyup paste', {questionId: questionId, minWordsLimit: minWordsLimit}, counter)
-					.trigger( "change", {questionId: questionId, minWordsLimit: minWordsLimit} );
+				//fire onchange event for textareas/ckeditors
+				if (${generalLearnerFlowDTO.allowRichEditor}) {
+					for ( instance in CKEDITOR.instances ) {
+						CKEDITOR.instances[instance].updateElement();
+					}
+				} else {
+					$("textarea[name$=__textarea]").change();
+				}
+
+				//ajax form submit
+				$('#qaLearningForm').ajaxSubmit({
+					url: '<c:url value="autoSaveAnswers.do?date=" />' + new Date().getTime(),
+					success: function() {
+						$.growlUI('<i class="fa fa-lg fa-floppy-o"></i> <fmt:message key="label.learning.draft.autosaved" />');
+					}
+				});
 			}
-			
-		});
+		}
 
-		<%-- Connect to command websocket only if it is learner UI --%>
-		<c:if test="${isLeadershipEnabled and mode == 'learner'}">
+		//min words counter
+		$(document).ready(function() {
+
+			//character count fuction in case ckeditor is OFF
+			function counter(event) {
+				var questionId = event.data.questionId;
+				var minWordsLimit = event.data.minWordsLimit;
+				var value = $("#answer"+ questionId).val();
+
+				var numberEnteredWords = getNumberOfWords(value, false);
+				var numberRequiredWords = (minWordsLimit > numberEnteredWords) ? minWordsLimit - numberEnteredWords : 0;
+				$('#words-required-' + questionId).html(numberRequiredWords);
+			};
+
+			//character count fuction in case ckeditor is ON
+			function ckeditorCounter(event) {
+				var questionId = event.listenerData.questionId;
+				var minWordsLimit = event.listenerData.minWordsLimit;
+				var value = event.editor.getData();
+
+				var numberEnteredWords = getNumberOfWords(value, true);
+				var numberRequiredWords = (minWordsLimit > numberEnteredWords) ? minWordsLimit - numberEnteredWords : 0;
+				$('#words-required-' + questionId).html(numberRequiredWords);
+			};
+
+			//check for min words limit
+			jQuery(".min-words-limit-enabled").each(function() {
+
+				var isCkeditor = $(this).data("is-ckeditor");
+				var questionId = (${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}) ? "" : $(this).data("sequence-id");
+				var minWordsLimit = $(this).data("min-words-limit");
+
+				//assign function
+				if (isCkeditor) {
+					var ckeditor = CKEDITOR.instances["answer" + questionId];
+
+					ckeditor.on('change', ckeditorCounter, null, {questionId: questionId, minWordsLimit: minWordsLimit} );
+					//count characters initially
+					ckeditor.on('instanceReady', ckeditorCounter, null, {questionId: questionId, minWordsLimit: minWordsLimit});
+
+				} else {
+					$("#answer" + questionId)
+							.on('change keydown keypress keyup paste', {questionId: questionId, minWordsLimit: minWordsLimit}, counter)
+							.trigger( "change", {questionId: questionId, minWordsLimit: minWordsLimit} );
+				}
+
+			});
+
+			<%-- Connect to command websocket only if it is learner UI --%>
+			<c:if test="${isLeadershipEnabled and mode == 'learner'}">
 			// command websocket stuff for refreshing
 			// trigger is an unique ID of page and action that command websocket code in Page.tag recognises
 			commandWebsocketHookTrigger = 'qa-leader-change-refresh-${generalLearnerFlowDTO.toolSessionID}';
 			// if the trigger is recognised, the following action occurs
 			commandWebsocketHook = function() {
 				location.reload();
 			};
-		</c:if>
-	});
-	
-</script>
+			</c:if>
+		});
 
+	</script>
+
 </lams:PageLearner>
\ No newline at end of file
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r2f6e8f9ecfee5b8078479721374d0cbeee3d699d -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 2f6e8f9ecfee5b8078479721374d0cbeee3d699d)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
@@ -18,11 +18,11 @@
 							<c:out value="${questionEntry.value.description}" escapeXml="false" />
 						</div>
 					</c:if>
-				
+
 					<div class="answer-req text-end">
 						<c:if test="${questionEntry.value.required}">
 							<span class="badge text-bg-danger"><fmt:message key="label.required" /></span>
-						</c:if> 
+						</c:if>
 
 						<c:if test="${questionEntry.value.minWordsLimit != 0}">
 						<span class="badge text-bg-primary">
@@ -33,39 +33,39 @@
 					</div>
 
 					<div class="my-2" id="answerResponse">
-					<c:choose>
-						<c:when test="${hasEditRight}">
-							<label id="yourAnswer" class="d-none"><fmt:message key="label.learning.yourAnswer" /></label>
-							<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}" 
-											contentFolderID="${sessionMap.learnerContentFolder}"
-											toolbarSet="DefaultLearner">
-										</lams:CKEditor>
-									</c:when>
+						<c:choose>
+							<c:when test="${hasEditRight}">
+								<label id="yourAnswer" class="d-none"><fmt:message key="label.learning.yourAnswer" /></label>
+								<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}"
+														   contentFolderID="${sessionMap.learnerContentFolder}"
+														   toolbarSet="DefaultLearner">
+											</lams:CKEditor>
+										</c:when>
 
-									<c:otherwise>
-										<lams:textarea name="answer${questionEntry.key}"
-											id="answer${questionEntry.key}" rows="5" placeholder="${placeholder}" aria-labelledby="yourAnswer"
-											class="form-control"><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
-									</c:otherwise>
-								</c:choose>
-							</div>
-						</c:when>
+										<c:otherwise>
+											<lams:textarea name="answer${questionEntry.key}"
+														   id="answer${questionEntry.key}" rows="5" placeholder="${placeholder}" aria-labelledby="yourAnswer"
+														   class="form-control"><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
+										</c:otherwise>
+									</c:choose>
+								</div>
+							</c:when>
 
-						<c:otherwise>
-							<lams:textarea name="answer${questionEntry.key}" rows="5"
-								class="form-control" disabled="disabled">
-								<c:out value='${answerEntry.value}' escapeXml='false' />
-							</lams:textarea>
-						</c:otherwise>
-					</c:choose>
+							<c:otherwise>
+								<lams:textarea name="answer${questionEntry.key}" rows="5"
+											   class="form-control" disabled="disabled">
+									<c:out value='${answerEntry.value}' escapeXml='false' />
+								</lams:textarea>
+							</c:otherwise>
+						</c:choose>
 					</div>
 				</div>
 			</div>
@@ -78,8 +78,8 @@
 <c:if test="${hasEditRight}">
 	<div class="activity-bottom-buttons">
 		<button name="btnCombined" type="button" class="btn btn-primary mt-2"
-			onclick="javascript:submitMethod('submitAnswersContent');">
+				onclick="javascript:submitMethod('submitAnswersContent');">
 			<fmt:message key="button.submitAllContent" />
 		</button>
 	</div>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r2f6e8f9ecfee5b8078479721374d0cbeee3d699d -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 2f6e8f9ecfee5b8078479721374d0cbeee3d699d)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
@@ -2,138 +2,138 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.sessionMapID]}" />
 
-<lams:PageLearner title="${generalLearnerFlowDTO.activityTitle}" toolSessionID="${generalLearnerFlowDTO.toolSessionID}" >
+<lams:PageLearner title="${generalLearnerFlowDTO.activityTitle}" toolSessionID="${qaLearningForm.toolSessionID}" >
 
 
 	<div class="container-lg">
-		<h1>sessionid <c:out value="${generalLearnerFlowDTO.toolSessionID}"></c:out></h1>
-<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-	<form:form action="/lams/tool/laqa11/learning/learning.do" method="POST" modelAttribute="qaLearningForm" target="_self">
+		<h1>sessionid <c:out value="${qaLearningForm.toolSessionID}"></c:out></h1>
+		<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
+		<form:form action="/lams/tool/laqa11/learning/learning.do" method="POST" modelAttribute="qaLearningForm" target="_self">
 
-		<!--  Announcements and advanced settings -->
+			<!--  Announcements and advanced settings -->
 
-		<c:if test="${generalLearnerFlowDTO.noReeditAllowed}">
-			<lams:Alert5 type="danger" id="noRedosAllowed" close="false">
-				<fmt:message key="label.noredo.enabled" />
-			</lams:Alert5>
-		</c:if>
+			<c:if test="${generalLearnerFlowDTO.noReeditAllowed}">
+				<lams:Alert5 type="danger" id="noRedosAllowed" close="false">
+					<fmt:message key="label.noredo.enabled" />
+				</lams:Alert5>
+			</c:if>
 
-		<c:if test="${generalLearnerFlowDTO.lockWhenFinished && not generalLearnerFlowDTO.noReeditAllowed}">
-			<lams:Alert5 type="danger" id="lockWhenFinished" close="false">
-				<fmt:message key="label.responses.locked" />
-			</lams:Alert5>
-		</c:if>
+			<c:if test="${generalLearnerFlowDTO.lockWhenFinished && not generalLearnerFlowDTO.noReeditAllowed}">
+				<lams:Alert5 type="danger" id="lockWhenFinished" close="false">
+					<fmt:message key="label.responses.locked" />
+				</lams:Alert5>
+			</c:if>
 
-		<c:if test="${not empty sessionMap.submissionDeadline}">
-			<lams:Alert5 type="danger" id="submissionDeadline" close="false">
-				<fmt:message key="authoring.info.teacher.set.restriction">
-					<fmt:param>
-						<lams:Date value="${sessionMap.submissionDeadline}" />
-					</fmt:param>
-				</fmt:message>
-			</lams:Alert5>
-		</c:if>
-		<!-- End announcements -->
+			<c:if test="${not empty sessionMap.submissionDeadline}">
+				<lams:Alert5 type="danger" id="submissionDeadline" close="false">
+					<fmt:message key="authoring.info.teacher.set.restriction">
+						<fmt:param>
+							<lams:Date value="${sessionMap.submissionDeadline}" />
+						</fmt:param>
+					</fmt:message>
+				</lams:Alert5>
+			</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="card lcard lcard-no-borders shadow mb-3 my-4" id="questions${questionEntry.key}"> 
-				<div class="card-header ">
-					<strong>
-						<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}">${questionEntry.key}.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" /> 
-					</strong> 
-				</div>
-				
-				<div class="card-body">
-					<div class="mb-3" >
-						<c:out value="${questionEntry.value.description}" escapeXml="false" />
+				<div class="card lcard lcard-no-borders shadow mb-3 my-4" id="questions${questionEntry.key}">
+					<div class="card-header ">
+						<strong>
+							<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}">${questionEntry.key}.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" />
+						</strong>
 					</div>
 
-					<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
-						<c:if test="${answerEntry.key == questionEntry.key}">
+					<div class="card-body">
+						<div class="mb-3" >
+							<c:out value="${questionEntry.value.description}" escapeXml="false" />
+						</div>
+
+						<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
+							<c:if test="${answerEntry.key == questionEntry.key}">
 							<span class="fw-bold my-1">
 								<fmt:message key="label.learning.yourAnswer" />
 							</span>
 
-							<div class="border border-primary p-3 m-2 border-opacity-50 rounded-2" id="answer${questionEntry.key}">
-								<c:out value="${answerEntry.value}" escapeXml="false" />
-							</div>
-						</c:if>
-					</c:forEach>
+								<div class="border border-primary p-3 m-2 border-opacity-50 rounded-2" 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 -->
+						<c:if test="${(questionEntry.value.feedback != '') && (questionEntry.value.feedback != null) }">
 
-						<div class="panel panel-default mt-4" id="feedback${questionEntry.key}">
-							<div class="panel-heading panel-heading-sm panel-title">
-								<fmt:message key="label.feedback" />
+							<div class="panel panel-default mt-4" id="feedback${questionEntry.key}">
+								<div class="panel-heading panel-heading-sm panel-title">
+									<fmt:message key="label.feedback" />
+								</div>
+								<div class="panel-body panel-body-sm">
+									<c:out value="${questionEntry.value.feedback}" escapeXml="false" />
+								</div>
 							</div>
-							<div class="panel-body panel-body-sm">
-								<c:out value="${questionEntry.value.feedback}" escapeXml="false" />
-							</div>
-						</div>
 
-					</c:if>
+						</c:if>
 
+					</div>
 				</div>
-			</div>
 
 
-		</c:forEach>
+			</c:forEach>
 
-		<hr class="msg-hr" />
+			<hr class="msg-hr" />
 
-		<div class="activity-bottom-buttons">
+			<div class="activity-bottom-buttons">
 
-			<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
-				<button name="viewAllResults" type="button" onclick="submitMethod('storeAllResults');"
-					class="btn btn-primary mx-2">
-					<fmt:message key="label.allResponses" />
-				</button>
-			</c:if>
+				<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
+					<button name="viewAllResults" type="button" onclick="submitMethod('storeAllResults');"
+							class="btn btn-primary mx-2">
+						<fmt:message key="label.allResponses" />
+					</button>
+				</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" 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>
+				<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
+					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
+						<div class="space-bottom-top align-right">
+							<button type="button" id="finishButton" 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>
 
+							</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>
-					</div>
+					</c:if>
 				</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" />
+				<c:if test="${!generalLearnerFlowDTO.noReeditAllowed}">
+					<button type="button" name="redoQuestions" class="btn btn-primary mx-2 float-start"
+							onclick="submitMethod('redoQuestions');">
+						<fmt:message key="label.redo" />
 					</button>
 				</c:if>
-			</c:if>
+			</div>
 
-			<c:if test="${!generalLearnerFlowDTO.noReeditAllowed}">
-				<button type="button" name="redoQuestions" class="btn btn-primary mx-2 float-start"
-					onclick="submitMethod('redoQuestions');">
-					<fmt:message key="label.redo" />
-				</button>
-			</c:if>
-		</div>
 
-
-	</form:form>
+		</form:form>
 	</div>
 	<!-- end form -->
 
@@ -148,4 +148,4 @@
 			document.forms.qaLearningForm.submit();
 		}
 	</script>
-</lams:PageLearner>
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r2f6e8f9ecfee5b8078479721374d0cbeee3d699d -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 2f6e8f9ecfee5b8078479721374d0cbeee3d699d)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
@@ -13,6 +13,7 @@
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 
 <lams:PageLearner title="${generalLearnerFlowDTO.activityTitle}" toolSessionID="${sessionMap.toolSessionID}" >
+
 	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
@@ -22,31 +23,31 @@
 	<style>
 		#rating-comment-info {
 			margin: 10px 0;
-    		padding: 5px;
+			padding: 5px;
 		}
-		
+
 		.other-users-responses {
 			margin: 0 -15px -35px -15px;
 		}
-		
+
 		.add-comment {
 			margin-left: 10px;
 			float: left !important;
 			margin-top: auto;
 		}
-		
+
 		.comment-textarea {
 			float: left;
-    		width: 85%;
+			width: 85%;
 		}
-		
+
 		.other-users-responses .table>thead>tr>th {
 			line-height: 0.2;
 		}
-		
+
 		.rate-answers-area {
-			 min-height: 120px;
-			 margin-bottom: 20px;
+			min-height: 120px;
+			margin-bottom: 20px;
 		}
 	</style>
 
@@ -61,456 +62,453 @@
 		<form:hidden path="totalQuestionCount" />
 		<form:hidden path="refreshAnswers" />
 
-	
-			<!-- Announcements -->
-	
-			<c:if test="${not empty sessionMap.submissionDeadline}">
-				<lams:Alert5 id="submission-deadline" type="danger" close="false">
-					<fmt:message key="authoring.info.teacher.set.restriction">
-						<fmt:param>
-							<lams:Date value="${sessionMap.submissionDeadline}" />
-						</fmt:param>
-					</fmt:message>
-				</lams:Alert5>
-			</c:if>
-	
-			<!-- Rating limits info -->
-			<c:if test="${generalLearnerFlowDTO.allowRateAnswers && (qaContent.minimumRates ne 0 || qaContent.maximumRates ne 0)}">
-	
-				<lams:Alert5 id="rating-info" type="info" close="true">
-					<c:choose>
-						<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates ne 0}">
-							<fmt:message key="label.rate.limits.reminder">
-								<fmt:param value="${qaContent.minimumRates}" />
-								<fmt:param value="${qaContent.maximumRates}" />
-							</fmt:message>
-						</c:when>
-	
-						<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates eq 0}">
-							<fmt:message key="label.rate.limits.reminder.min">
-								<fmt:param value="${qaContent.minimumRates}" />
-							</fmt:message>
-						</c:when>
-	
-						<c:when test="${qaContent.minimumRates eq 0 and qaContent.maximumRates ne 0}">
-							<fmt:message key="label.rate.limits.reminder.max">
-								<fmt:param value="${qaContent.maximumRates}" />
-							</fmt:message>
-						</c:when>
-					</c:choose>
-					<br>
-	
-					<fmt:message key="label.rate.limits.topic.reminder">
-						<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>" />
-					</fmt:message>
-				</lams:Alert5>
-			</c:if>
-	
-			<c:if test="${isLeadershipEnabled}">
-				<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
-			</c:if>
-	
-			<!-- Questions and answers -->
-			<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
 
-				<div class="panel panel-default">
-					<div class="panel-heading panel-title">
-						<c:if test="${generalLearnerFlowDTO.questions.size() != 1}">${status.count}.&nbsp;</c:if> 
-						<c:out value="${question.qbQuestion.name}" escapeXml="false" />
-					</div>
+		<!-- Announcements -->
 
-					<div class="panel-body">
-						<c:if test="${not empty question.qbQuestion.description}">
-							<div class="panel">
-								<c:out value="${question.qbQuestion.description}" escapeXml="false" />
-							</div>
-						</c:if>
+		<c:if test="${not empty sessionMap.submissionDeadline}">
+			<lams:Alert5 id="submission-deadline" type="danger" close="false">
+				<fmt:message key="authoring.info.teacher.set.restriction">
+					<fmt:param>
+						<lams:Date value="${sessionMap.submissionDeadline}" />
+					</fmt:param>
+				</fmt:message>
+			</lams:Alert5>
+		</c:if>
 
+		<!-- Rating limits info -->
+		<c:if test="${generalLearnerFlowDTO.allowRateAnswers && (qaContent.minimumRates ne 0 || qaContent.maximumRates ne 0)}">
+
+			<lams:Alert5 id="rating-info" type="info" close="true">
+				<c:choose>
+					<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates ne 0}">
+						<fmt:message key="label.rate.limits.reminder">
+							<fmt:param value="${qaContent.minimumRates}" />
+							<fmt:param value="${qaContent.maximumRates}" />
+						</fmt:message>
+					</c:when>
+
+					<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates eq 0}">
+						<fmt:message key="label.rate.limits.reminder.min">
+							<fmt:param value="${qaContent.minimumRates}" />
+						</fmt:message>
+					</c:when>
+
+					<c:when test="${qaContent.minimumRates eq 0 and qaContent.maximumRates ne 0}">
+						<fmt:message key="label.rate.limits.reminder.max">
+							<fmt:param value="${qaContent.maximumRates}" />
+						</fmt:message>
+					</c:when>
+				</c:choose>
+				<br>
+
+				<fmt:message key="label.rate.limits.topic.reminder">
+					<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>" />
+				</fmt:message>
+			</lams:Alert5>
+		</c:if>
+
+		<c:if test="${isLeadershipEnabled}">
+			<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
+		</c:if>
+
+		<!-- Questions and answers -->
+		<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
+
+			<div class="panel panel-default">
+				<div class="panel-heading panel-title">
+					<c:if test="${generalLearnerFlowDTO.questions.size() != 1}">${status.count}.&nbsp;</c:if>
+					<c:out value="${question.qbQuestion.name}" escapeXml="false" />
+				</div>
+
+				<div class="panel-body">
+					<c:if test="${not empty question.qbQuestion.description}">
+						<div class="panel">
+							<c:out value="${question.qbQuestion.description}" escapeXml="false" />
+						</div>
+					</c:if>
+
 						<%--User own responses---------------------------------------%>
-						<c:set var="userResponse" value="${question.userResponse}"/>
-						<c:if test="${userResponse != null}">
-							<div class="row no-gutter">
-								<!-- split if ratings are on -->
-								<c:set var="splitRow" value="col-xs-12" />
-								<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
-									<c:set var="splitRow" value="col-xs-12 col-sm-9 col-md-10 col-lg-10" />
-								</c:if>
-								<div class="${splitRow}">
-									<div class="sbox">
-										<div class="sbox-heading bg-warning">
-											<div class="pull-left roffset5"><lams:Portrait userId="${userResponse.qaQueUser.queUsrId}"/></div>
-												<span><c:out value="${userResponse.qaQueUser.fullname}" /></span>
-												<br><span style="font-size: smaller"><lams:Date value="${userResponse.attemptTime}" timeago="true"/></span>
-										</div>
-										<div class="sbox-body">
-											<c:out value="${userResponse.answer}" escapeXml="false" />
-										</div>
+					<c:set var="userResponse" value="${question.userResponse}"/>
+					<c:if test="${userResponse != null}">
+						<div class="row no-gutter">
+							<!-- split if ratings are on -->
+							<c:set var="splitRow" value="col-xs-12" />
+							<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
+								<c:set var="splitRow" value="col-xs-12 col-sm-9 col-md-10 col-lg-10" />
+							</c:if>
+							<div class="${splitRow}">
+								<div class="sbox">
+									<div class="sbox-heading bg-warning">
+										<div class="pull-left roffset5"><lams:Portrait userId="${userResponse.qaQueUser.queUsrId}"/></div>
+										<span><c:out value="${userResponse.qaQueUser.fullname}" /></span>
+										<br><span style="font-size: smaller"><lams:Date value="${userResponse.attemptTime}" timeago="true"/></span>
 									</div>
-								</div>
-								<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
-									<div class="col-xs-12 col-sm-3 col-md-2 col-lg-2 rate-answers-area">
-										<h4 class="text-center">
-											<fmt:message key="label.learning.rating" />
-										</h4>
-										<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
-											maxRates="${qaContent.maximumRates}" />
+									<div class="sbox-body">
+										<c:out value="${userResponse.answer}" escapeXml="false" />
 									</div>
-								</c:if>
+								</div>
 							</div>
-						</c:if>
-						
-						<!-- Others users' responses -->
-						<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
-							<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
-								<lams:Alert id="rating-comment-info" type="info" close="false" >
-									<fmt:message key="label.comment.minimum.number.words">
-										<fmt:param>: ${sessionMap.commentsMinWordsLimit}</fmt:param>
-									</fmt:message>
-								</lams:Alert>
+							<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
+								<div class="col-xs-12 col-sm-3 col-md-2 col-lg-2 rate-answers-area">
+									<h4 class="text-center">
+										<fmt:message key="label.learning.rating" />
+									</h4>
+									<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
+												 maxRates="${qaContent.maximumRates}" />
+								</div>
 							</c:if>
-			
-							<c:choose>
-								<c:when test="${isCommentsEnabled}">
-									<c:set var="numColumns" value="3" />
-								</c:when>
-								<c:when test="${!isCommentsEnabled and generalLearnerFlowDTO.allowRateAnswers}">
-									<c:set var="numColumns" value="2" />
-								</c:when>
-								<c:otherwise>
-									<c:set var="numColumns" value="1" />
-								</c:otherwise>
-							</c:choose>
-			
-							<div class="other-users-responses">
-								<lams:TSTable numColumns="${numColumns}" dataId='data-question-uid="${question.uid}"' >
-									<thead>
-										<tr>
-											<th title="<fmt:message key='label.sort.by.answer'/>"><fmt:message key="label.learning.answer" /></th>
-											<c:choose>
-											<c:when test="${generalLearnerFlowDTO.allowRateAnswers}">
-												<th title="<fmt:message key='label.sort.by.rating'/>"><fmt:message key="label.learning.rating" /></th>
-											</c:when>
-											<c:otherwise>
-												<th style="display:none;"></th>
-											</c:otherwise>
-											</c:choose>
-											<c:if test="${isCommentsEnabled}">
-												<th><fmt:message key="label.comment" /></th>
-											</c:if>
-										</tr>
-									</thead>
-									<tbody>
-				
-									</tbody>
-								</lams:TSTable>
-							</div>
+						</div>
+					</c:if>
+
+					<!-- Others users' responses -->
+					<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
+						<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
+							<lams:Alert5 id="rating-comment-info" type="info" close="false" >
+								<fmt:message key="label.comment.minimum.number.words">
+									<fmt:param>: ${sessionMap.commentsMinWordsLimit}</fmt:param>
+								</fmt:message>
+							</lams:Alert5>
 						</c:if>
-						
-					</div>
+
+						<c:choose>
+							<c:when test="${isCommentsEnabled}">
+								<c:set var="numColumns" value="3" />
+							</c:when>
+							<c:when test="${!isCommentsEnabled and generalLearnerFlowDTO.allowRateAnswers}">
+								<c:set var="numColumns" value="2" />
+							</c:when>
+							<c:otherwise>
+								<c:set var="numColumns" value="1" />
+							</c:otherwise>
+						</c:choose>
+
+						<div class="other-users-responses">
+							<lams:TSTable numColumns="${numColumns}" dataId='data-question-uid="${question.uid}"' >
+								<thead>
+								<tr>
+									<th title="<fmt:message key='label.sort.by.answer'/>"><fmt:message key="label.learning.answer" /></th>
+									<c:choose>
+										<c:when test="${generalLearnerFlowDTO.allowRateAnswers}">
+											<th title="<fmt:message key='label.sort.by.rating'/>"><fmt:message key="label.learning.rating" /></th>
+										</c:when>
+										<c:otherwise>
+											<th style="display:none;"></th>
+										</c:otherwise>
+									</c:choose>
+									<c:if test="${isCommentsEnabled}">
+										<th><fmt:message key="label.comment" /></th>
+									</c:if>
+								</tr>
+								</thead>
+								<tbody>
+
+								</tbody>
+							</lams:TSTable>
+						</div>
+					</c:if>
+
 				</div>
+			</div>
 
-			</c:forEach>
-			<!-- End questions and answers -->
-				
-			<!-- reflections -->
-			<c:if test="${generalLearnerFlowDTO.reflection == 'true' && generalLearnerFlowDTO.isLearnerFinished}">
+		</c:forEach>
+		<!-- End questions and answers -->
 
-				<div class="panel panel-default voffset10">
-					<div class="panel-heading panel-title">
-						<fmt:message key="label.reflection" />
+		<!-- reflections -->
+		<c:if test="${generalLearnerFlowDTO.reflection == 'true' && generalLearnerFlowDTO.isLearnerFinished}">
+
+			<div class="panel panel-default voffset10">
+				<div class="panel-heading panel-title">
+					<fmt:message key="label.reflection" />
+				</div>
+				<div class="panel-body">
+					<div class="reflectionInstructions">
+						<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 					</div>
-					<div class="panel-body">
-						<div class="reflectionInstructions">
-							<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
-						</div>
-						<div class="panel">
-							<lams:out value="${qaLearningForm.entryText}" escapeHtml="true" />
-						</div>
+					<div class="panel">
+						<lams:out value="${qaLearningForm.entryText}" escapeHtml="true" />
+					</div>
 
-						<c:if test="${hasEditRight && mode != 'teacher'}">
-							<button name="forwardtoReflection" type="button" class="btn btn-default pull-left"
+					<c:if test="${hasEditRight && mode != 'teacher'}">
+						<button name="forwardtoReflection" type="button" class="btn btn-default pull-left"
 								onclick="submitMethod('forwardtoReflection');">
-								<fmt:message key="label.edit" />
-							</button>
-						</c:if>
-					</div>
+							<fmt:message key="label.edit" />
+						</button>
+					</c:if>
 				</div>
+			</div>
 
-			</c:if>
-	
-			<!-- buttons -->
-			<c:if test="${mode != 'teacher'}">
-				<div class="right-buttons voffset5" align="right" id="learner-submit">
-					<c:if test="${!generalLearnerFlowDTO.isLearnerFinished}">
-						<button type="button" class="btn btn-default voffset5 roffset5 pull-left"
-								onclick="refreshPage('${qaLearningForm.refreshAnswers}');">
-							<fmt:message key="label.refresh" />
+		</c:if>
+
+		<!-- buttons -->
+		<c:if test="${mode != 'teacher'}">
+			<div class="right-buttons voffset5" align="right" id="learner-submit">
+				<c:if test="${!generalLearnerFlowDTO.isLearnerFinished}">
+					<button type="button" class="btn btn-default voffset5 roffset5 pull-left"
+							onclick="refreshPage('${qaLearningForm.refreshAnswers}');">
+						<fmt:message key="label.refresh" />
+					</button>
+				</c:if>
+
+				<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight && !generalLearnerFlowDTO.noReeditAllowed}">
+					<button name="redoQuestions" type="button" class="btn btn-default voffset5  pull-left"
+							onclick="submitMethod('redoQuestions');">
+						<fmt:message key="label.redo" />
+					</button>
+				</c:if>
+
+				<c:choose>
+					<c:when test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight && !generalLearnerFlowDTO.isLearnerFinished}">
+						<button type="button" name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
+								class="btn btn-default">
+							<fmt:message key="label.continue" />
 						</button>
-					</c:if>
-	
-					<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight && !generalLearnerFlowDTO.noReeditAllowed}">
-						<button name="redoQuestions" type="button" class="btn btn-default voffset5  pull-left"
-								onclick="submitMethod('redoQuestions');">
-							<fmt:message key="label.redo" />
+					</c:when>
+
+					<c:when test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight || generalLearnerFlowDTO.isLearnerFinished}">
+						<button type="button" id="finishButton" class="btn btn-primary float-end 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>
 						</button>
-					</c:if>
-					
-					<c:choose>
-						<c:when test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight && !generalLearnerFlowDTO.isLearnerFinished}">
-							<button type="button" name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
-									class="btn btn-default">
-								<fmt:message key="label.continue" />
-							</button>
-						</c:when>
-	
-						<c:when test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight || generalLearnerFlowDTO.isLearnerFinished}">
-							<button type="button" id="finishButton" class="btn btn-primary float-end 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>
-							</button>
-						</c:when>
-					</c:choose>
-				</div>
-			</c:if>
+					</c:when>
+				</c:choose>
+			</div>
+		</c:if>
 
 	</form:form>
 
-<script type="text/javascript">
-	//var for jquery.jRating.js
-	var pathToImageFolder = "${lams}images/css/";
-	
-	//vars for rating.js
-	var MAX_RATES = ${qaContent.maximumRates},
-	MIN_RATES = ${qaContent.minimumRates},
-	COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
-	LAMS_URL = '${lams}',
-	COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
-	COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
-	WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-	WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>",
-	ALLOW_RERATE = false,
-	SESSION_ID = ${toolSessionID};
-</script>
-<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/jquery.tablesorter-pager.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/jquery.timeago.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/common.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/rating.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/jquery.tablesorter-widgets.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/portrait.js" type="text/javascript" ></script>
-<lams:JSImport src="learning/includes/javascript/gate-check.js" />
+	<script type="text/javascript">
+		//var for jquery.jRating.js
+		var pathToImageFolder = "${lams}images/css/";
 
-<script type="text/javascript">
-	checkNextGateActivity('finishButton', '${toolSessionID}', '', function(){
-		submitMethod('endLearning');
-	});
-	
-	var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-		IS_DISABLED =  ${sessionMap.isDisabled};
-	
-	$(document).ready(function(){
-		
-		jQuery("time.timeago").timeago();
-		
-		$(".tablesorter").tablesorter({
-			theme: 'bootstrap',
-			headerTemplate : '{content} {icon}',
-			widthFixed: true,
-			widgets: ['uitheme','zebra'],
-			headers: { 
-				2: {
-					sorter: false 
-				} 
-			} 
+		//vars for rating.js
+		var MAX_RATES = ${qaContent.maximumRates},
+				MIN_RATES = ${qaContent.minimumRates},
+				COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
+				COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
+				COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
+				WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
+				WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>",
+				ALLOW_RERATE = false,
+				SESSION_ID = ${toolSessionID};
+	</script>
+	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/jquery.tablesorter-pager.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/jquery.timeago.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/common.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/rating.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/jquery.tablesorter-widgets.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js" type="text/javascript"></script>
+	<lams:JSImport src="includes/javascript/portrait5.js" />
+
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', function(){
+			submitMethod('endLearning');
 		});
-		
-		$(".tablesorter").each(function() {
-			$(this).tablesorterPager({
-				// set to false otherwise it remembers setting from other jsFiddle demos
-				savePages: false,
-				  // use this format: "http:/mydatabase.com?page={page}&size={size}&{sortList:col}"
-				  // where {page} is replaced by the page number (or use {page+1} to get a one-based index),
-				  // {size} is replaced by the number of records to show,
-				  // {sortList:col} adds the sortList to the url into a "col" array, and {filterList:fcol} adds
-				  // the filterList to the url into an "fcol" array.
-				  // So a sortList = [[2,0],[3,0]] becomes "&col[2]=0&col[3]=0" in the url
-				ajaxUrl : "<c:url value='getResponses.do'/>?page={page}&size={size}&{sortList:column}&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&isOnlyLeadersIncluded=${qaContent.useSelectLeaderToolOuput}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $("#toolSessionID").val() + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(),
-				ajaxProcessing: function (data) {
-					if (data && data.hasOwnProperty('rows')) {
-						var rows = [],
-						json = {},
-						countRatedItems = data.countRatedItems;
-						
-						for (i = 0; i < data.rows.length; i++){
-							var userData = data.rows[i];
-							var itemId = userData["responseUid"];
-							var isItemAuthoredByUser = userData["isItemAuthoredByUser"];
-							
-							rows += '<tr>';
-							rows += '<td style="vertical-align:top;">';
-							
-							if (${generalLearnerFlowDTO.userNameVisible}) {
-								rows += definePortraitMiniHeader(userData["portraitId"], userData["userID"], '${lams}',
-																 ${qaContent.useSelectLeaderToolOuput} ? userData["sessionName"] : userData["userName"], 
-										'<time class="timeago" title="' + userData["attemptTime"] + '" datetime="' + userData["timeAgo"] + '"></time>', 
-										false, "sbox-heading bg-warning")
-							}
-							
-							rows += 	'<div class="user-answer">';
-							if (userData["visible"] == 'true') {
-								rows += 	userData["answer"];
-							} else {
-								rows += 	'<i><fmt:message key="label.hidden"/></i>';
-							}
-							rows += 	'</div>';
-							
-							rows += '</td>';
-							
-							var usesRatings = false;
-							var hasStartedRating = false;
 
-							if (${generalLearnerFlowDTO.allowRateAnswers}) {
-								rows += '<td style="width:150px;vertical-align:top;">';
-								
+		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+				YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+				IS_DISABLED =  ${sessionMap.isDisabled};
+
+		$(document).ready(function(){
+
+			jQuery("time.timeago").timeago();
+
+			$(".tablesorter").tablesorter({
+				theme: 'bootstrap',
+				headerTemplate : '{content} {icon}',
+				widthFixed: true,
+				widgets: ['uitheme','zebra'],
+				headers: {
+					2: {
+						sorter: false
+					}
+				}
+			});
+
+			$(".tablesorter").each(function() {
+				$(this).tablesorterPager({
+					// set to false otherwise it remembers setting from other jsFiddle demos
+					savePages: false,
+					// use this format: "http:/mydatabase.com?page={page}&size={size}&{sortList:col}"
+					// where {page} is replaced by the page number (or use {page+1} to get a one-based index),
+					// {size} is replaced by the number of records to show,
+					// {sortList:col} adds the sortList to the url into a "col" array, and {filterList:fcol} adds
+					// the filterList to the url into an "fcol" array.
+					// So a sortList = [[2,0],[3,0]] becomes "&col[2]=0&col[3]=0" in the url
+					ajaxUrl : "<c:url value='getResponses.do'/>?page={page}&size={size}&{sortList:column}&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&isOnlyLeadersIncluded=${qaContent.useSelectLeaderToolOuput}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $("#toolSessionID").val() + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(),
+					ajaxProcessing: function (data) {
+						if (data && data.hasOwnProperty('rows')) {
+							var rows = [],
+									json = {},
+									countRatedItems = data.countRatedItems;
+
+							for (i = 0; i < data.rows.length; i++){
+								var userData = data.rows[i];
+								var itemId = userData["responseUid"];
+								var isItemAuthoredByUser = userData["isItemAuthoredByUser"];
+
+								rows += '<tr>';
+								rows += '<td style="vertical-align:top;">';
+
+								if (${generalLearnerFlowDTO.userNameVisible}) {
+									rows += definePortraitMiniHeader(userData["portraitId"], userData["userID"], '${lams}',
+											${qaContent.useSelectLeaderToolOuput} ? userData["sessionName"] : userData["userName"],
+											'<time class="timeago" title="' + userData["attemptTime"] + '" datetime="' + userData["timeAgo"] + '"></time>',
+											false, "sbox-heading bg-warning")
+								}
+
+								rows += 	'<div class="user-answer">';
 								if (userData["visible"] == 'true') {
-									rows += '<div class="rating-stars-holder">';
+									rows += 	userData["answer"];
+								} else {
+									rows += 	'<i><fmt:message key="label.hidden"/></i>';
+								}
+								rows += 	'</div>';
 
-									// if the user has left a comment or done a rating in a batch of ratings, we need to keep all related ratings open.
-									usesRatings = true;
-									for (j = 0; !hasStartedRating && j < userData.criteriaDtos.length; j++){
-										hasStartedRating = userData.criteriaDtos[j].userRating != "";
-										if ( hasStartedRating) {
-											idsBeingRated.push(itemId); // idsBeingRated defined in rating.js
+								rows += '</td>';
+
+								var usesRatings = false;
+								var hasStartedRating = false;
+
+								if (${generalLearnerFlowDTO.allowRateAnswers}) {
+									rows += '<td style="width:150px;vertical-align:top;">';
+
+									if (userData["visible"] == 'true') {
+										rows += '<div class="rating-stars-holder">';
+
+										// if the user has left a comment or done a rating in a batch of ratings, we need to keep all related ratings open.
+										usesRatings = true;
+										for (j = 0; !hasStartedRating && j < userData.criteriaDtos.length; j++){
+											hasStartedRating = userData.criteriaDtos[j].userRating != "";
+											if ( hasStartedRating) {
+												idsBeingRated.push(itemId); // idsBeingRated defined in rating.js
+											}
 										}
-									}
-									hasStartedRating = hasStartedRating || ${isCommentsEnabled} && userData["commentPostedByUser"] != "";
+										hasStartedRating = hasStartedRating || ${isCommentsEnabled} && userData["commentPostedByUser"] != "";
 
-									for (j = 0; j < userData.criteriaDtos.length; j++){
-										var criteriaDto = userData.criteriaDtos[j];
-										var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId;
-										var averageRating = criteriaDto.averageRating;
-										var numberOfVotes = criteriaDto.numberOfVotes;
-										var userRating = criteriaDto.userRating;
-										var isCriteriaNotRatedByUser = userRating == "";
-										var averageRatingDisplayed = (isItemAuthoredByUser || !isCriteriaNotRatedByUser) ? averageRating : 0;
-										var ratingStarsClass = (IS_DISABLED || isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES)  && (!hasStartedRating) || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
-							
-										rows += '<strong>';
-										rows += 	 criteriaDto.title;
-										rows += '</strong>';
-										
-										rows += '<div class="'+ ratingStarsClass +' rating-stars-new" data-average="'+ averageRatingDisplayed +'" data-id="'+ objectId +'">';
-										rows += '</div>';
-										
-										if (isItemAuthoredByUser) {
-											rows += '<div class="rating-stars-caption">';
-											rows += 	AVG_RATING_LABEL.replace("@1@", averageRating).replace("@2@", numberOfVotes);
+										for (j = 0; j < userData.criteriaDtos.length; j++){
+											var criteriaDto = userData.criteriaDtos[j];
+											var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId;
+											var averageRating = criteriaDto.averageRating;
+											var numberOfVotes = criteriaDto.numberOfVotes;
+											var userRating = criteriaDto.userRating;
+											var isCriteriaNotRatedByUser = userRating == "";
+											var averageRatingDisplayed = (isItemAuthoredByUser || !isCriteriaNotRatedByUser) ? averageRating : 0;
+											var ratingStarsClass = (IS_DISABLED || isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES)  && (!hasStartedRating) || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
+
+											rows += '<strong>';
+											rows += 	 criteriaDto.title;
+											rows += '</strong>';
+
+											rows += '<div class="'+ ratingStarsClass +' rating-stars-new" data-average="'+ averageRatingDisplayed +'" data-id="'+ objectId +'">';
 											rows += '</div>';
-											
-										} else {
-											rows += '<div class="rating-stars-caption" id="rating-stars-caption-'+ objectId +'"';
-											if (isCriteriaNotRatedByUser) {
-												rows += ' style="visibility: hidden;"';	
+
+											if (isItemAuthoredByUser) {
+												rows += '<div class="rating-stars-caption">';
+												rows += 	AVG_RATING_LABEL.replace("@1@", averageRating).replace("@2@", numberOfVotes);
+												rows += '</div>';
+
+											} else {
+												rows += '<div class="rating-stars-caption" id="rating-stars-caption-'+ objectId +'"';
+												if (isCriteriaNotRatedByUser) {
+													rows += ' style="visibility: hidden;"';
+												}
+												rows += '>';
+												var temp = YOUR_RATING_LABEL.replace("@1@", '<span id="user-rating-'+ objectId +'">'+ userRating + '</span>');
+												temp = temp.replace("@2@", '<span id="average-rating-'+ objectId +'">'+ averageRating + '</span>');
+												temp = temp.replace("@3@", '<span id="number-of-votes-'+ objectId +'">'+ numberOfVotes + '</span>');
+												rows += 	temp;
+												rows += '</div>';
 											}
-											rows += '>';
-											var temp = YOUR_RATING_LABEL.replace("@1@", '<span id="user-rating-'+ objectId +'">'+ userRating + '</span>');
-											temp = temp.replace("@2@", '<span id="average-rating-'+ objectId +'">'+ averageRating + '</span>');
-											temp = temp.replace("@3@", '<span id="number-of-votes-'+ objectId +'">'+ numberOfVotes + '</span>');
-											rows += 	temp;
-											rows += '</div>';
 										}
+
+										rows += '</div>';
 									}
-									
-									rows += '</div>';
+
+									rows += '</td>';
+								} else {
+									// need a column or sorting is confused
+									rows += '<td style="display:none;"></td>';
 								}
-								
-								rows += '</td>';
-							} else {
-								// need a column or sorting is confused
-								rows += '<td style="display:none;"></td>';
-							}
-							
-							if (${isCommentsEnabled}) {
-								rows += '<td style="width:30%; min-width: 250px; vertical-align:top;" id="comments-area-' + itemId + '">';
-								
-								if (userData["visible"] == 'true') {
-									var commentsCriteriaId = userData["commentsCriteriaId"];
-									var commentPostedByUser = userData["commentPostedByUser"];
-									
-									//show all comments needs to be shown
-									if (isItemAuthoredByUser) {
-										for (j = 0; i < userData.comments.length; j++){
-											var comment = userData.comments[j];
+
+								if (${isCommentsEnabled}) {
+									rows += '<td style="width:30%; min-width: 250px; vertical-align:top;" id="comments-area-' + itemId + '">';
+
+									if (userData["visible"] == 'true') {
+										var commentsCriteriaId = userData["commentsCriteriaId"];
+										var commentPostedByUser = userData["commentPostedByUser"];
+
+										//show all comments needs to be shown
+										if (isItemAuthoredByUser) {
+											for (j = 0; i < userData.comments.length; j++){
+												var comment = userData.comments[j];
+												rows += '<div class="rating-comment">';
+												rows += 	comment.comment;
+												rows += '</div>';
+											}
+
+										} else if (commentPostedByUser != "") {
 											rows += '<div class="rating-comment">';
-											rows += 	comment.comment;
+											rows += 	commentPostedByUser;
 											rows += '</div>';
+
+											//show comments textarea and a submit button
+										} else if (! (IS_DISABLED || usesRatings && MAX_RATES>0 && countRatedItems >= MAX_RATES && !hasStartedRating)) {
+											rows += '<div id="add-comment-area-' + itemId + '">';
+											rows +=		'<textarea class="form-control comment-textarea" name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;"><fmt:message key="label.comment.textarea.tip"/></textarea>';
+
+											rows += 	'<div class="button add-comment add-comment-new" data-item-id="'+ itemId +'" data-comment-criteria-id="'+ commentsCriteriaId +'">';
+											rows += 	'</div>';
+											rows += '</div>';
 										}
-										
-									} else if (commentPostedByUser != "") {
-										rows += '<div class="rating-comment">';
-										rows += 	commentPostedByUser;
-										rows += '</div>';
-										
-									//show comments textarea and a submit button
-									} else if (! (IS_DISABLED || usesRatings && MAX_RATES>0 && countRatedItems >= MAX_RATES && !hasStartedRating)) {
-										rows += '<div id="add-comment-area-' + itemId + '">';											
-										rows +=		'<textarea class="form-control comment-textarea" name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;"><fmt:message key="label.comment.textarea.tip"/></textarea>';
-										
-										rows += 	'<div class="button add-comment add-comment-new" data-item-id="'+ itemId +'" data-comment-criteria-id="'+ commentsCriteriaId +'">';
-										rows += 	'</div>';
-										rows += '</div>';											
 									}
+
+									rows += '</td>';
 								}
-								
-								rows += '</td>';
+
+								rows += '</tr>';
 							}
-							
-							rows += '</tr>';
+
+							json.total = data.total_rows; // only allow 100 rows in total
+							//json.filteredRows = 100; // no filtering
+							json.rows = $(rows);
+							return json;
+
 						}
-						
-						json.total = data.total_rows; // only allow 100 rows in total
-						//json.filteredRows = 100; // no filtering
-						json.rows = $(rows);
-						return json;
-						
-					}
-				},
-				container: $(this).find(".ts-pager"),
-				output: '{startRow} to {endRow} ({totalRows})',
-				  cssPageDisplay: '.pagedisplay',
-				cssPageSize: '.pagesize',
-				cssDisabled: 'disabled'
-			})
-			
-			// bind to pager events
-			.bind('pagerInitialized pagerComplete', function(event, options){
-				initializeJRating();
-				jQuery("time.timeago").timeago();
+					},
+					container: $(this).find(".ts-pager"),
+					output: '{startRow} to {endRow} ({totalRows})',
+					cssPageDisplay: '.pagedisplay',
+					cssPageSize: '.pagesize',
+					cssDisabled: 'disabled'
+				})
+
+						// bind to pager events
+						.bind('pagerInitialized pagerComplete', function(event, options){
+							initializeJRating();
+							jQuery("time.timeago").timeago();
+						});
 			});
+
 		});
 
-	 });
-
-	function refreshPage(reload) {
-		if ( "reload" == reload ) { 
-			location.href = "<lams:WebAppURL/>learning/learning.do?mode=learner&toolSessionID="+SESSION_ID;
-		} else {
-			submitMethod('refreshAllResults');
+		function refreshPage(reload) {
+			if ( "reload" == reload ) {
+				location.href = "<lams:WebAppURL/>learning/learning.do?mode=learner&toolSessionID="+SESSION_ID;
+			} else {
+				submitMethod('refreshAllResults');
+			}
 		}
-	}
-	function submitMethod(actionMethod) {
-		document.forms.qaLearningForm.action=actionMethod+".do"; 
-		document.forms.qaLearningForm.submit();
-	}
-</script>
+		function submitMethod(actionMethod) {
+			document.forms.qaLearningForm.action=actionMethod+".do";
+			document.forms.qaLearningForm.submit();
+		}
+	</script>
 </lams:PageLearner>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r4e146cf8dcf21d3939d74416bdfc240a5f7bfe9e -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 4e146cf8dcf21d3939d74416bdfc240a5f7bfe9e)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
@@ -14,7 +14,7 @@
 
 <lams:PageLearner title="${sessionMap.title}" toolSessionID="${sessionMap.toolSessionID}" >
 
-	<link href="<lams:LAMSURL />css/uppy.min.css"    rel="stylesheet" type="text/css" />
+	<link href="<lams:LAMSURL />css/uppy.min.css" rel="stylesheet" type="text/css" />
 	<link href="<lams:LAMSURL />css/uppy.custom5.css" rel="stylesheet" type="text/css" />
 	<style>
 		.btn-hide-on-min-not-met {
@@ -42,9 +42,9 @@
 	</div>
 
 	<div class="container-lg">
-		<hr class="mx-5 text-primary">
+		<hr class="text-primary">
 		<div id="notices">
-		<!-- notices and announcements -->
+			<!-- notices and announcements -->
 			<c:if test="${(sessionMap.mode == 'author' || sessionMap.mode == 'learner') && hasEditRight}">
 				<c:if test="${sessionMap.lockOnFinish} && ${sessionMap.userFinished}">
 					<!--  Lock when finished -->
@@ -67,35 +67,35 @@
 					<c:choose>
 						<c:when test="${sessionMap.minLimitUploadNumber != null && sessionMap.isMaxLimitUploadEnabled}">
 							<c:set var="fileRestrictions">
-								<fmt:message key="label.learner.upload.restrictions"/>: 
+								<fmt:message key="label.learner.upload.restrictions"/>:
 								<fmt:message key="label.should.upload.another">
 									<fmt:param value="${sessionMap.minLimitUploadNumber}" />
 								</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.and"/>&nbsp;<fmt:message key="message.left.upload.limit">
-									<fmt:param value="${sessionMap.maxLimitUploadNumber}" />
-								</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
+								<fmt:param value="${sessionMap.maxLimitUploadNumber}" />
+							</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
 							</c:set>
 						</c:when>
 						<c:when test="${sessionMap.minLimitUploadNumber != null}">
 							<c:set var="fileRestrictions">
-								<fmt:message key="label.learner.upload.restrictions"/>: 
+								<fmt:message key="label.learner.upload.restrictions"/>:
 								<fmt:message key="label.should.upload.another">
 									<fmt:param value="${sessionMap.minLimitUploadNumber}" />
 								</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
 							</c:set>
 						</c:when>
 						<c:when test="${sessionMap.isMaxLimitUploadEnabled}">
 							<c:set var="fileRestrictions">
-								<fmt:message key="label.learner.upload.restrictions"/>: 
+								<fmt:message key="label.learner.upload.restrictions"/>:
 								<fmt:message key="message.left.upload.limit">
 									<fmt:param value="${sessionMap.maxLimitUploadNumber}" />
 								</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
 							</c:set>
-						</c:when>						
+						</c:when>
 					</c:choose>
 					<c:if test="${not empty fileRestrictions}">
 						<lams:Alert5 id="minLimitUploadNumber" close="true" type="warning">
-							<c:out value="${fileRestrictions}" escapeXml="false" /> 
-						</lams:Alert5>	
+							<c:out value="${fileRestrictions}" escapeXml="false" />
+						</lams:Alert5>
 					</c:if>
 
 				</c:if>
@@ -155,146 +155,144 @@
 				</form:form>
 
 				<lams:WaitingSpinner id="attachmentArea_Busy"/>
-
-				<hr/>
 			</c:if>
 			<!-- end div uppy form-->
 		</div>
 
 
 
 		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
-		<div id="submittedFiles">
-		<c:choose>
-			<c:when test="${empty learner.filesUploaded && hasEditRight}">
-				<div class="alert">
-					<fmt:message key="label.learner.noUpload" />
-				</div>
-			</c:when>
+		<div id="submittedFiles" class="mt-4">
+			<c:choose>
+				<c:when test="${empty learner.filesUploaded && hasEditRight}">
+					<div class="alert">
+						<fmt:message key="label.learner.noUpload" />
+					</div>
+				</c:when>
 
-			<c:otherwise>
-				<h3 class="mt-5">
-					<fmt:message key="monitoring.user.submittedFiles" />
-				</h3>
-				<small class="text-muted"><c:out value="${fn:length(learner.filesUploaded)}" />&nbsp;<fmt:message key="label.files" /></small>
+				<c:otherwise>
+					<h3 class="mt-5">
+						<fmt:message key="monitoring.user.submittedFiles" />
+					</h3>
+					<small class="text-muted"><c:out value="${fn:length(learner.filesUploaded)}" />&nbsp;<fmt:message key="label.files" /></small>
 
-				<div role="list" class="mt-2 px-4" aria-labelledby="submittedFiles">
-					<c:forEach var="file" items="${learner.filesUploaded}" varStatus="status">
-						<div role="listitem" class="card lcard lcard-no-borders shadow mb-3 my-4">
-						<!--The name of the File -->
-							<c:if test="${file.currentLearner}">
-								<div class="card-header ">
-									<c:set var="downloadURL">
-										<c:url value="/download?uuid=${file.displayUuid}&versionID=${file.versionID}&preferDownload=true" />
-									</c:set>
-									<i class="fa-regular fa-file" aria-label="false"></i> &nbsp;<a class="fw-bold" style="color: var(--bs-link-hover-color)" href="${downloadURL}" aria-label="<fmt:message key="label.download" />"><c:out value="${file.filePath}" /></a>
-									<div class="float-end">
-										<c:if test="${empty file.marks && hasEditRight}">
-											<a href="javascript:deleteLearnerFile(${file.submissionID}, '${file.filePath}');" class="btn btn-primary btn-disable-on-submit" 
-											title="<fmt:message key="label.monitoring.original.learner.file.delete"/>">
-												<i class="fa fa-trash" aria-label="<fmt:message key="label.monitoring.original.learner.file.delete"/>"></i>
-											</a>
-										</c:if>
+					<div role="list" class="mt-2 mb-4" aria-labelledby="submittedFiles">
+						<c:forEach var="file" items="${learner.filesUploaded}" varStatus="status">
+							<div role="listitem" class="card lcard lcard-no-borders shadow mb-3 mt-4">
+								<!--The name of the File -->
+								<c:if test="${file.currentLearner}">
+									<div class="card-header ">
+										<c:set var="downloadURL">
+											<c:url value="/download?uuid=${file.displayUuid}&versionID=${file.versionID}&preferDownload=true" />
+										</c:set>
+										<i class="fa-regular fa-file" aria-label="false"></i> &nbsp;<a class="fw-bold" style="color: var(--bs-link-hover-color)" href="${downloadURL}" aria-label="<fmt:message key="label.download" />"><c:out value="${file.filePath}" /></a>
+										<div class="float-end">
+											<c:if test="${empty file.marks && hasEditRight}">
+												<a href="javascript:deleteLearnerFile(${file.submissionID}, '${file.filePath}');" class="btn btn-primary btn-disable-on-submit"
+												   title="<fmt:message key="label.monitoring.original.learner.file.delete"/>">
+													<i class="fa fa-trash" aria-label="<fmt:message key="label.monitoring.original.learner.file.delete"/>"></i>
+												</a>
+											</c:if>
 
-										<a href="${downloadURL}"  class="btn btn-primary btn-disable-on-submit" title="<fmt:message key="label.download" />" >
-											<i class="fa fa-download" aria-label="<fmt:message key="label.download" />"></i>
-										</a>
+											<a href="${downloadURL}"  class="btn btn-primary btn-disable-on-submit" title="<fmt:message key="label.download" />" >
+												<i class="fa fa-download" aria-label="<fmt:message key="label.download" />"></i>
+											</a>
+										</div>
+										<br>
+										<small>
+											<fmt:message key="label.learner.time" />&nbsp;<lams:Date value="${file.dateOfSubmission}" timeago="true"/>
+										</small>
 									</div>
-									<br>
-									<small>
-										<fmt:message key="label.learner.time" />&nbsp;<lams:Date value="${file.dateOfSubmission}" timeago="true"/>									
-									</small>
-								</div>
-							</c:if>
-						<div class="card-body">
-						<!--The description of the File -->
-							<div id="fileDescription" aria-label="<fmt:message key='label.learner.fileDescription' />">
-								<lams:out value="${file.fileDescription}" escapeHtml="true" />
-							</div>
+								</c:if>
+								<div class="card-body">
+									<!--The description of the File -->
+									<div id="fileDescription" aria-label="<fmt:message key='label.learner.fileDescription' />">
+										<lams:out value="${file.fileDescription}" escapeHtml="true" />
+									</div>
 
-						<!--Marks-->
-						<c:if test="${sessionMap.isMarksReleased and not empty file.marks}">
-							<div class="my-2" id="fileMarks">
-								<hr>
+									<!--Marks-->
+									<c:if test="${sessionMap.isMarksReleased and not empty file.marks}">
+										<div class="my-2" id="fileMarks">
+											<hr>
 
-									<span class="fw-bold"><fmt:message key="label.learner.marks" />:</span>
-									<c:out value="${file.marks}" escapeXml="true" />
-							</div>		
+											<span class="fw-bold"><fmt:message key="label.learner.marks" />:</span>
+											<c:out value="${file.marks}" escapeXml="true" />
+										</div>
 
-						</c:if>
+									</c:if>
 
-						<!--Comments -->
-						<c:if test="${sessionMap.isMarksReleased and not empty file.comments}">
-							<div class="" id="teacherComments">
+									<!--Comments -->
+									<c:if test="${sessionMap.isMarksReleased and not empty file.comments}">
+										<div class="" id="teacherComments">
 
-									<span class="fw-bold"><fmt:message key="label.learner.comments" />:</span>
-									<br/>
-									<c:out value="${file.comments}" escapeXml="false" />
-							</div>
-						</c:if>
+											<span class="fw-bold"><fmt:message key="label.learner.comments" />:</span>
+											<br/>
+											<c:out value="${file.comments}" escapeXml="false" />
+										</div>
+									</c:if>
 
-						<!--Marked file-->
-						<c:if  test="${sessionMap.isMarksReleased and not empty file.markFileUUID}">
-							<div class="mt-2" id="markedFile">
-							<fmt:message key="label.monitor.mark.markedFile" />: <i class="fa fa-download" aria-hidden="true"></i>&nbsp;
+									<!--Marked file-->
+									<c:if  test="${sessionMap.isMarksReleased and not empty file.markFileUUID}">
+										<div class="mt-2" id="markedFile">
+											<fmt:message key="label.monitor.mark.markedFile" />: <i class="fa fa-download" aria-hidden="true"></i>&nbsp;
 
-									<c:set var="markFileDownloadURL">
-										<c:url value="/download?uuid=${file.markFileUUID}&versionID=${file.markFileVersionID}&preferDownload=true" />
-									</c:set>
-									<a id="markedFile" href="${markFileDownloadURL}" title="<fmt:message key='label.monitor.mark.markedFile' />, <fmt:message key='label.download' />" class="">
-										<c:out value="${file.markFileName}" />
-									</a>
+											<c:set var="markFileDownloadURL">
+												<c:url value="/download?uuid=${file.markFileUUID}&versionID=${file.markFileVersionID}&preferDownload=true" />
+											</c:set>
+											<a id="markedFile" href="${markFileDownloadURL}" title="<fmt:message key='label.monitor.mark.markedFile' />, <fmt:message key='label.download' />" class="">
+												<c:out value="${file.markFileName}" />
+											</a>
+										</div>
+
+									</c:if>
+								</div>
 							</div>
+						</c:forEach>
+					</div>
 
-						</c:if>
-						</div>
-						</div>
-					</c:forEach>
-				</div>				
-
-			</c:otherwise>
-		</c:choose>
+				</c:otherwise>
+			</c:choose>
 		</div>
 
 		<!-- reflection -->
 
 		<div id="reflection">
-		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<div class="card shadow-sm mt-5">
-				<div class="card-header">
-					<fmt:message key="title.reflection" />
-				</div>
-				<div class="card-body">
-					<div class="m-2" aria-label="<fmt:message key='monitor.summary.td.notebookInstructions'/>">
-						<lams:out escapeHtml="true" value="${sessionMap.reflectInstructions}" />
+			<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+				<div class="card shadow-sm mt-5">
+					<div class="card-header">
+						<fmt:message key="title.reflection" />
 					</div>
-					<hr/>
+					<div class="card-body">
+						<div class="m-2" aria-label="<fmt:message key='monitor.summary.td.notebookInstructions'/>">
+							<lams:out escapeHtml="true" value="${sessionMap.reflectInstructions}" />
+						</div>
+						<hr/>
 
-					<div class="m-2">
-						<c:choose>
-							<c:when test="${empty learner.reflect}">
-								<p>
-									<em> <fmt:message key="message.no.reflection.available" />
-									</em>
-								</p>
-							</c:when>
-							<c:otherwise>
-								<p>
-									<lams:out escapeHtml="true" value="${learner.reflect}" />
-								</p>
-							</c:otherwise>
-						</c:choose>
-					</div>
+						<div class="m-2">
+							<c:choose>
+								<c:when test="${empty learner.reflect}">
+									<p>
+										<em> <fmt:message key="message.no.reflection.available" />
+										</em>
+									</p>
+								</c:when>
+								<c:otherwise>
+									<p>
+										<lams:out escapeHtml="true" value="${learner.reflect}" />
+									</p>
+								</c:otherwise>
+							</c:choose>
+						</div>
 
-					<c:if test="${sessionMap.mode != 'teacher'}">
-						<button id="notebookButton" name="notebookButton" style="margin-top: 10px" onclick="javascript:notebook();"
-								class="btn btn-sm btn-primary btn-disable-on-submit" >
-							<fmt:message key="label.edit" />
-						</button>
-					</c:if>
+						<c:if test="${sessionMap.mode != 'teacher'}">
+							<button id="notebookButton" name="notebookButton" style="margin-top: 10px" onclick="javascript:notebook();"
+									class="btn btn-sm btn-primary btn-disable-on-submit" >
+								<fmt:message key="label.edit" />
+							</button>
+						</c:if>
+					</div>
 				</div>
-			</div>
-		</c:if>
+			</c:if>
 		</div>
 
 		<!-- submit buttons -->
@@ -303,7 +301,7 @@
 				<c:choose>
 					<c:when test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
 						<button id="notebookButton" onclick="javascript:notebook();"
-								class="btn btn-primary btn-disable-on-submit 
+								class="btn btn-primary btn-disable-on-submit
 								   ${sessionMap.mode eq 'author' or empty sessionMap.minLimitUploadNumber ? '' : 'btn-hide-on-min-not-met'}">
 							<fmt:message key="label.continue" />
 						</button>
@@ -330,28 +328,28 @@
 
 	<script>
 		checkNextGateActivity('finishButton', '${sessionMap.toolSessionID}', '', finish);
-	
+
 		var UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>',
 				// convert Java syntax to JSON
 				EXE_FILE_TYPES = JSON.parse("[" + "${EXE_FILE_TYPES}".replace(/\.\w+/g, '"$&"') + "]"),
 				<fmt:message key="error.attachment.executable" var="EXE_FILE_ERROR_VAR" />
 				EXE_FILE_ERROR = decoderDiv.html('<c:out value="${EXE_FILE_ERROR_VAR}" />').text();
-	
-	
+
+
 		$(document).ready(function() {
 			$("time.timeago").timeago();
-	
+
 			if ($('#file-upload-area').length == 1) {
 				initFileUpload('${learnerForm.tmpFileUploadId}', '${language}');
 			}
-	
+
 			<c:if test="${sessionMap.mode != 'author' and sessionMap.minLimitUploadNumber != null}">
 			var uploadedFilesNumber = +${learner.filesUploaded.size()};
 			if (uploadedFilesNumber >= ${sessionMap.minLimitUploadNumber}) {
 				$('.btn-hide-on-min-not-met').removeClass('btn-hide-on-min-not-met');
 			}
 			</c:if>
-	
+
 			<%-- Connect to command websocket only if it is learner UI --%>
 			<c:if test="${isLeadershipEnabled and sessionMap.mode == 'learner'}">
 			// command websocket stuff for refreshing
@@ -364,7 +362,7 @@
 			};
 			</c:if>
 		});
-	
+
 		/**
 		 * Initialise Uppy as the file upload widget
 		 */
@@ -392,18 +390,18 @@
 					if (!valid) {
 						uppy.info(EXE_FILE_ERROR, 'error', 10000);
 					}
-	
+
 					return valid;
 				}
 			};
-	
+
 			switch(language) {
 				case 'es' : uppyProperties.locale = Uppy.locales.es_ES; break;
 				case 'fr' : uppyProperties.locale = Uppy.locales.fr_FR; break;
 				case 'el' : uppyProperties.locale = Uppy.locales.el_GR; break;
 			}
-	
-	
+
+
 			var uppy = Uppy.Core(uppyProperties);
 			// upload using Ajax
 			uppy.use(Uppy.XHRUpload, {
@@ -412,7 +410,7 @@
 				// files are uploaded one by one
 				limit : 1
 			});
-	
+
 			uppy.use(Uppy.Dashboard, {
 				target: '#file-upload-area',
 				inline: true,
@@ -428,12 +426,12 @@
 				target: Uppy.Dashboard,
 				modes: ['picture']
 			});
-	
+
 			uppy.on('upload-success', (file, response) => {
 				// if file name was modified by server, reflect it in Uppy
 				file.meta.name = response.body.name;
 			});
-	
+
 			uppy.on('file-removed', (file, reason) => {
 				if (reason === 'removed-by-user') {
 					// delete file from temporary folder on server
@@ -447,7 +445,7 @@
 				}
 			})
 		}
-	
+
 		function finish() {
 			var finishUrl = "<lams:WebAppURL />learning/finish.do?sessionMapID=${sessionMapID}";
 			return validateFinish(finishUrl);
@@ -458,7 +456,7 @@
 		}
 		function validateFinish(tUrl) {
 			var uploadedFilesNumber = +${learner.filesUploaded.size()};
-	
+
 			//enforce min files upload limit
 			<c:if test="${sessionMap.minLimitUploadNumber != null}">
 			if (uploadedFilesNumber < ${sessionMap.minLimitUploadNumber}) {
@@ -475,8 +473,8 @@
 			let finishFunction = function(){
 				disableButtons();
 				location.href = tUrl;
-			};			
-	
+			};
+
 			//let user confirm zero files upload
 			if (uploadedFilesNumber == 0) {
 				if (${sessionMap.lockOnFinish}) {
@@ -485,14 +483,14 @@
 				} else {
 					showConfirm("<fmt:message key='messsage.learner.finish.confirm'/>", finishFunction);
 
-				}	
+				}
 			} else {
 				finishFunction();
 			}
 		}
 
-		
-	
+
+
 		function clearFileError(errDivId) {
 			if ( ! errDivId || errDivId.length == 0 ) {
 				errDivId = 'file-error-msg';
@@ -501,7 +499,7 @@
 			errDiv.empty();
 			errDiv.css( "display", "none" );
 		}
-	
+
 		function showFileError(error, errDivId) {
 			if ( ! errDivId || errDivId.length == 0 ) {
 				errDivId = 'file-error-msg';
@@ -514,36 +512,36 @@
 				showToast(error);
 			}
 		}
-	
+
 		function validateFileUpload() {
 			var valid = true;
-	
+
 			// check description
 			clearFileError("desc-error-msg");
 			if ( $('#description').val().trim().length == 0 ) {
 				var requiredMsg = '<fmt:message key="errors.required"><fmt:param><fmt:message key="label.learner.fileDescription"/></fmt:param></fmt:message>';
 				showFileError(requiredMsg, "desc-error-msg");
 				valid = false;
 			}
-	
+
 			if ( valid ) {
 				disableButtons();
 			}
 			return valid;
 		}
-	
+
 		function disableButtons() {
 			// do not disable the file button or the file will be missing on the upload.
 			$('.btn-disable-on-submit').prop('disabled', true);
 			$('a.btn-disable-on-submit').hide(); // links must be hidden, cannot be disabled
-	
+
 			// show the waiting area during the upload
 			var div = document.getElementById("attachmentArea_Busy");
 			if(div != null){
 				div.style.display = '';
 			}
 		}
-	
+
 		function deleteLearnerFile(detailId, filename) {
 			var msg = '<fmt:message key="message.monitor.confirm.original.learner.file.delete"/>';
 			msg = msg.replace('{0}', filename);
@@ -561,8 +559,7 @@
 					}
 				});
 			});
-			
-		}
-	</script>	
-</lams:PageLearner>
 
+		}
+	</script>
+</lams:PageLearner>
\ No newline at end of file