Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
===================================================================
diff -u -rc9048d2a6d579af33cc6b3a36e716715be8e9b2b -r2a5fb646572b9790ef4b88e795e15811d94ed19d
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision c9048d2a6d579af33cc6b3a36e716715be8e9b2b)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
@@ -386,7 +386,7 @@
 	model.addAttribute("aeToolTypes", toolTypes);
 	model.addAttribute("aeActivityTitles", activityTitles);
 
-	return "tblmonitor/aes";
+	return "tblmonitor/aes5";
     }
 
     /**
Index: lams_monitoring/web/includes/javascript/monitorLesson5.js
===================================================================
diff -u -r027d0e6a567a57457a4020ff966fbd1f156deb59 -r2a5fb646572b9790ef4b88e795e15811d94ed19d
--- lams_monitoring/web/includes/javascript/monitorLesson5.js	(.../monitorLesson5.js)	(revision 027d0e6a567a57457a4020ff966fbd1f156deb59)
+++ lams_monitoring/web/includes/javascript/monitorLesson5.js	(.../monitorLesson5.js)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
@@ -64,6 +64,11 @@
 	
 
 $(document).ready(function(){
+	$.ajaxSetup ({
+	    // Disable caching of AJAX responses
+	    cache: false
+	});
+
 	initCommonElements();
 	initSequenceTab();
 	initGradebookTab();
@@ -72,15 +77,15 @@
 });
 
 function loadTab(tabName, button) {
-	$('.navigate-btn, .lesson-properties').removeClass('active');
+	$('.navigate-btn-container a.btn, .lesson-properties').removeClass('active');
 	$('.component-sidebar').removeClass('expanded');
 	if (button) {
 		$(button).addClass('active');
 	}
 	
 	clearEventSources();
 	
-	let tabContent = $('.monitoring-page-content .tab-content');
+	let tabContent = $('.monitoring-page-content .tab-content').empty();
 		
 		
 	switch(tabName) {
@@ -150,14 +155,22 @@
 		break;
 		
 		case 'irat': {
-			tabContent.load(LAMS_URL + 'tool/laasse10/tblmonitoring/iraAssessment.do?toolContentID=' + iraToolContentId);
+			tabContent.load(LAMS_URL + 'tool/laasse10/tblmonitoring/iraAssessment.do?toolContentID=' + iraToolContentId + '&_=' + (new Date()).getTime());
 		}
 		break;
 		
 		case 'iratStudentChoices': {
 			tabContent.load(LAMS_URL + 'tool/laasse10/tblmonitoring/iraAssessmentStudentChoices.do?toolContentID=' + iraToolContentId);
 		}
 		break;
+		
+		case 'aes': {
+			tabContent.load(LAMS_URL + 'monitoring/tblmonitor/aes.do?'
+			                + '&aeToolContentIds='+ aeToolContentIds 
+							+ '&aeToolTypes=' + aeToolTypes 
+							+ '&aeActivityTitles=' + encodeURIComponent(aeActivityTitles));
+		}
+		break;
 	}
 }
 
@@ -201,6 +214,10 @@
 		loadTab('iratStudentChoices', this);
 	});
 	
+	$('#load-aes-tab-btn').click(function(){
+		loadTab('aes', this);
+	});
+	
 	$('#load-other-nvg-btn').click(function(){
 		let switchButton = $(this),
 			tblButtons = $('#tbl-navigate-btn-group'),
@@ -2785,7 +2802,9 @@
 		loadTab('irat');
 	} else if (tabName == 'iratStudentChoices'){
 		loadTab('iratStudentChoices');
-	}
+	} else if (tabName == 'aes'){
+		loadTab('aes');
+	} 
 }
 
 
Index: lams_monitoring/web/monitor5.jsp
===================================================================
diff -u -r027d0e6a567a57457a4020ff966fbd1f156deb59 -r2a5fb646572b9790ef4b88e795e15811d94ed19d
--- lams_monitoring/web/monitor5.jsp	(.../monitor5.jsp)	(revision 027d0e6a567a57457a4020ff966fbd1f156deb59)
+++ lams_monitoring/web/monitor5.jsp	(.../monitor5.jsp)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
@@ -57,7 +57,12 @@
 			lessonEndDate = '${lesson.scheduleEndDate}',
 			liveEditEnabled = ${enableLiveEdit && lesson.liveEditEnabled},
 			TOTAL_LESSON_LEARNERS_NUMBER = ${lesson.numberPossibleLearners},
-			iraToolContentId='${iraToolContentId}',
+			
+			iraToolContentId = '${iraToolContentId}',
+			aeToolContentIds = "${aeToolContentIds}",
+			aeToolTypes = "${aeToolTypes}",
+			aeActivityTitles = "${aeActivityTitles}",
+			
 			LAMS_URL = '<lams:LAMSURL/>',
 			csrfToken = '<csrf:tokenname/> : <csrf:tokenvalue/>',
 			csrfTokenName = '<csrf:tokenname/>',
Index: lams_monitoring/web/tblmonitor/aes5.jsp
===================================================================
diff -u
--- lams_monitoring/web/tblmonitor/aes5.jsp	(revision 0)
+++ lams_monitoring/web/tblmonitor/aes5.jsp	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
@@ -0,0 +1,87 @@
+<%@ include file="/taglibs.jsp"%>
+<% pageContext.setAttribute("newLineChar", "\r\n"); %>
+
+<style>
+	#aes-tab .nav-tabs .nav-item {
+		min-width: 200px;
+	}
+</style>
+<script>
+	var tblSelectedAeToolContentId = tblSelectedAeToolContentId || '${empty param.toolContentID ? aeToolContentIds[0] : param.toolContentID}';
+
+	$(document).ready(function(){
+		loadAePane(tblSelectedAeToolContentId);
+		
+		// change attempted and all learners numbers
+		$('#aes-tab .nav-tabs li').bind('click', function (event) {
+			var link = $(event.target);
+			// store which tab was cliked last
+			tblSelectedAeToolContentId = link.data("tool-content-id");
+			
+			loadAePane(tblSelectedAeToolContentId);
+		});
+	});
+	
+	function loadAePane(targetToolContentId, contentType){
+		$('#aes-tab .tab-pane').each(function(){
+			var aePane = $(this).hide(),
+				toolContentId = aePane.data('toolContentId'),
+				toolType = aePane.data('toolType'),
+				nav = $('#aes-tab .nav-tabs a[data-tool-content-id="' + toolContentId + '"]');
+	
+			if (toolContentId == targetToolContentId) {
+				var url = null;
+				if (toolType == 'd') {
+					url =  "<lams:LAMSURL/>tool/ladoku11/monitoring/ae.do?toolContentID="  + toolContentId;
+				} else if (contentType == 'studentChoices' || (!contentType && aePane.data('contentType') == 'studentChoices')){
+					// contentType is an extra setting saying which content from the given tool type to display
+					url =  "<lams:LAMSURL/>tool/laasse10/tblmonitoring/aesStudentChoices.do?toolContentID="  + toolContentId;
+					aePane.data('contentType', 'studentChoices');
+				} else {
+					url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring/assessment.do?toolContentID="  + toolContentId;
+					aePane.data('contentType', 'default');
+				}
+				// load AE tab content for the given tool content ID
+				aePane.show().load(url);
+					
+				aePane.addClass('active');
+				nav.addClass('active');
+			} else {
+				aePane.empty().removeClass('active');
+				nav.removeClass('active');
+			}
+		});
+
+	}
+	
+</script>
+<div id="aes-tab" class="container-fluid">
+	<div class="row">
+		<div class="col-8 offset-2 text-center">
+			<h3>
+				<fmt:message key="label.aes.questions.marks"/>
+			</h3>
+		</div>
+	</div>
+	
+	<ul class="nav nav-tabs">
+		<c:forEach var="aeToolContentId" items="${aeToolContentIds}" varStatus="status">
+			<li class="nav-item text-center">
+				<a data-toggle="tab" href="#" 
+				   data-tool-content-id="${aeToolContentId}" class="nav-link">
+					<c:out value="${aeActivityTitles[status.index]}" escapeXml="false"/>
+				</a>
+			</li>
+		</c:forEach>
+	</ul>
+			
+	<div>
+		<c:forEach var="aeToolContentId" items="${aeToolContentIds}" varStatus="status">
+			<div id="assessment-pane-${aeToolContentId}"
+				 class="tab-pane assessment-questions-pane pt-4"
+				 data-tool-type="${aeToolTypes[status.index]}"
+				 data-tool-content-id="${aeToolContentId}">
+			</div>
+		</c:forEach>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
===================================================================
diff -u -r56003dc7b87af7983c137daf04e402404932aeaa -r2a5fb646572b9790ef4b88e795e15811d94ed19d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 56003dc7b87af7983c137daf04e402404932aeaa)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
@@ -273,7 +273,7 @@
 	request.setAttribute("assessment", assessment);
 	request.setAttribute("isTbl", true);
 
-	return "pages/tblmonitoring/assessmentStudentChoices";
+	return "pages/tblmonitoring/assessmentStudentChoices5";
     }
 
     /**
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp
===================================================================
diff -u -r027d0e6a567a57457a4020ff966fbd1f156deb59 -r2a5fb646572b9790ef4b88e795e15811d94ed19d
--- lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp	(.../assessment5.jsp)	(revision 027d0e6a567a57457a4020ff966fbd1f156deb59)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp	(.../assessment5.jsp)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
@@ -2,7 +2,7 @@
 <% pageContext.setAttribute("newLineChar", "\r\n"); %>
 <c:set var="showQuestionMonitoringActionButtons" value="${attemptedLearnersNumber > 0}" />
 
-<%@ include file="/pages/monitoring/parts/discloseAnswers.jsp"%>
+<%@ include file="/pages/monitoring/parts/discloseAnswers5.jsp"%>
 
 <script>
 	//for allquestions.jsp to know whether to display an additional button
@@ -19,7 +19,7 @@
 	function showStudentChoices() {
 		// these methods come from tblmonitor.jsp and aes.jsp in lams_monitoring
 		if (${not empty isIraAssessment and isIraAssessment}) {
-			loadTab('iratStudentChoices');
+			loadTab('iratStudentChoices', $('#load-irat-student-choices-tab-btn'));
 			return;
 		}
 		loadAePane(${toolContentID}, 'studentChoices');
@@ -47,6 +47,13 @@
 					<fmt:message key="label.attendance"/>: <span>${attemptedLearnersNumber}</span>/<span class="total-learners-number"></span> 
 				</h4> 
 			</div>
+			<div class="col-4 text-end">
+				<div class="btn btn-secondary"
+					 onclick="javascript:showStudentChoices()">
+					<i class="fa fa-file"></i>
+					<fmt:message key="label.show.students.choices"/>
+				</div>   
+			</div>                 
 		</div>
 			
 		<c:if test="${allowDiscloseAnswers and showQuestionMonitoringActionButtons}">
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
@@ -0,0 +1,176 @@
+<%@ include file="/common/taglibs.jsp"%>
+<% pageContext.setAttribute("newLineChar", "\r\n"); %>
+
+<c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit5.jsp</c:set>
+<c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
+	<c:param name="toolContentId" value="${assessment.contentId}"/>
+	<c:param name="absoluteTimeLimit" value="${assessment.absoluteTimeLimitSeconds}"/>
+	<c:param name="relativeTimeLimit" value="${assessment.relativeTimeLimit}"/>
+	<c:param name="isTbl" value="true" />
+	<c:param name="controllerContext" value="tool/laasse10/monitoring" />
+</c:url>
+
+<style>
+	.question-title {
+    	overflow: auto;
+    	min-width: 150px;
+	} 
+</style>
+
+<lams:JSImport src="includes/javascript/chart5.js" relative="true" />
+	
+<script>
+	var WEB_APP_URL = '<lams:WebAppURL />',
+	
+	LABELS = $.extend(LABELS, {
+		<fmt:message key="label.monitoring.summary.completion" var="ACTIVITY_COMPLETION_CHART_TITLE_VAR"/>
+		ACTIVITY_COMPLETION_CHART_TITLE : '<c:out value="${ACTIVITY_COMPLETION_CHART_TITLE_VAR}" />',
+		<fmt:message key="label.monitoring.summary.completion.possible" var="ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR"/>
+		ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR}" />',
+		<fmt:message key="label.monitoring.summary.completion.started" var="ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR"/>
+		ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR}" />',	
+		<fmt:message key="label.monitoring.summary.completion.completed" var="ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR"/>
+		ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR}" />',	
+		<fmt:message key="label.monitoring.summary.answered.questions" var="ANSWERED_QUESTIONS_CHART_TITLE_VAR"/>
+		ANSWERED_QUESTIONS_CHART_TITLE : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_VAR}" />',
+		<fmt:message key="label.monitoring.summary.answered.questions.groups" var="ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR"/>
+		ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR}" />',
+		<fmt:message key="label.monitoring.summary.answered.questions.x.axis" var="ANSWERED_QUESTIONS_CHART_X_AXIS_VAR"/>
+		ANSWERED_QUESTIONS_CHART_X_AXIS : '<c:out value="${ANSWERED_QUESTIONS_CHART_X_AXIS_VAR}" />',
+		<fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR"/>
+		ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR}" />',
+		<fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR"/>
+		ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR}" />'
+	}),
+
+	activityCompletionChart = null,
+	answeredQuestionsChart = null,
+	COMPLETION_CHART_UPDATE_INTERVAL = 10 * 1000;
+	
+	$(document).ready(function(){
+		drawCompletionCharts(${toolContentID}, ${groupsInAnsweredQuestionsChart}, true);
+
+		$('#time-limit-panel-placeholder').load('${timeLimitPanelUrl}');
+	});
+		
+	function exportExcel(){
+		//dynamically create a form and submit it
+		var exportExcelUrl = "<lams:LAMSURL/>tool/laasse10/monitoring/exportSummary.do?toolContentID=${toolContentID}&downloadTokenValue=dummy&fileName=assessment_export.xlsx&reqID=" + (new Date()).getTime();
+		var form = $('<form method="post" action="' + exportExcelUrl + '"></form>');
+	    var hiddenInput = $('<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"></input>');
+	    form.append(hiddenInput);
+	    $(document.body).append(form);
+	    form.submit();
+	};
+</script>
+
+<div class="container-fluid">
+	
+	<!-- Notifications -->
+	<div class="row">
+		<div class="col-10 offset-1 text-end">
+			<a href="#nogo" type="button" class="btn btn-secondary buttons_column"
+					onclick="javascript:loadAePane(${toolContentID}, 'default'); return false;">
+				<i class="fa fa-undo"></i>
+				<fmt:message key="label.hide.students.choices"/>
+			</a>
+			<a href="#nogo" onclick="javascript:printTable(); return false;" type="button" class="btn btn-secondary buttons_column">
+				<i class="fa fa-print"></i>
+				<fmt:message key="label.print"/>
+			</a>
+			<a href="#nogo" onclick="javascript:exportExcel(); return false;" type="button" class="btn btn-secondary buttons_column">
+				<i class="fa fa-file"></i>
+				<fmt:message key="label.excel.export"/>
+			</a>
+		</div>
+	</div>
+	<!-- End notifications -->
+	
+	<div class="row" id="completion-charts-container">
+		<div class="col-md-5 col-sm-12 offset-md-1 me-2 my-4">
+			<div class="monitoring-panel">
+				<canvas id="activity-completion-chart"></canvas>
+			</div>
+		</div>
+		
+		<div class="col-md-5 col-sm-12 ms-2 my-4">
+			<div class="monitoring-panel position-relative">
+				<h4 id="answered-questions-chart-none" class="position-absolute top-50 w-100 text-center">No students have answered questions yet</h4>
+				<canvas id="answered-questions-chart"></canvas>
+			</div>
+		</div>
+	</div>
+	
+	<!-- Table --> 
+	<div class="row">
+	<div class="col-10 offset-1">
+	<div class="card">
+	<div class="card-body table-responsive pb-0">
+	          
+		<table  id="questions-data" class="table table-responsive table-bordered table-hover table-condensed">
+			<thead>
+				<tr role="row" class="border-top-0">
+					<th></th>
+					<c:forEach var="tblQuestionDto" items="${questionDtos}" varStatus="i">
+						<th class="text-center">
+							<div class="question-title">
+								<c:if test="${assessment.numbered}">
+										${i.count}.
+								</c:if>
+								${tblQuestionDto.title}
+							</div>
+						</th>
+					</c:forEach>
+				</tr>
+			</thead>
+			<tbody>
+			
+				<tr role="row">
+					<th><b>Question type</b></th>
+					<c:forEach var="tblQuestionDto" items="${questionDtos}" varStatus="i">
+						<td class="text-center">
+							${tblQuestionDto.questionTypeLabel}
+						</td>
+					</c:forEach>
+				</tr>
+			
+				<tr>
+					<td><b>Correct answer</b></td>
+					<c:forEach var="tblQuestionDto" items="${questionDtos}" varStatus="i">
+						<td class="text-center">
+							<c:out value="${tblQuestionDto.correctAnswer}" escapeXml="false" />
+	 					</td>
+					</c:forEach>
+				</tr>
+				
+				<tr>
+					<td colspan="${fn:length(questionDtos) + 1}" class="fw-bold"><fmt:message key="label.teams"/></td> 
+				</tr>
+				
+				<c:forEach var="session" items="${sessions}" varStatus="i">
+					<tr>
+						<td class="text-center">
+							${session.sessionName}
+						</td>
+						
+						<c:forEach var="tblQuestionDto" items="${questionDtos}" varStatus="j">
+							<c:set var="questionResultDto" value="${tblQuestionDto.sessionQuestionResults[i.index]}"/>
+							<td class="text-center <c:if test="${questionResultDto.correct}">bg-success text-white</c:if>" >
+								${questionResultDto.answer}
+							</td>
+						</c:forEach>
+						
+					</tr>
+				</c:forEach>                                               
+			</tbody>
+		</table>
+	</div>
+	</div>
+	</div>          
+	</div>
+	
+	<div class="row">
+		<div class="col-10 offset-1" id="time-limit-panel-placeholder">
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices5.jsp
===================================================================
diff -u -r027d0e6a567a57457a4020ff966fbd1f156deb59 -r2a5fb646572b9790ef4b88e795e15811d94ed19d
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices5.jsp	(.../iraAssessmentStudentChoices5.jsp)	(revision 027d0e6a567a57457a4020ff966fbd1f156deb59)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices5.jsp	(.../iraAssessmentStudentChoices5.jsp)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
@@ -70,6 +70,11 @@
 	<!-- Notifications -->  
 	<div class="row">
 		<div class="col-10 offset-1 text-end">
+			<a href="#nogo" type="button" class="btn btn-secondary buttons_column"
+					onclick="javascript:loadTab('irat', $('#load-irat-tab-btn'))">
+				<i class="fa fa-undo"></i>
+				<fmt:message key="label.hide.students.choices"/>
+			</a>
 			<a href="#nogo" onclick="javascript:printTable(); return false;" type="button" class="btn btn-secondary buttons_column">
 				<i class="fa fa-print"></i>
 				<fmt:message key="label.print"/>