Index: lams_monitoring/web/tblmonitor/aes.jsp
===================================================================
diff -u -r2ce1ca7a4995e15743c5800fdd789868b0236836 -r8fec6246571ad1c7a6f6aae450f07b1f52bd19c4
--- lams_monitoring/web/tblmonitor/aes.jsp	(.../aes.jsp)	(revision 2ce1ca7a4995e15743c5800fdd789868b0236836)
+++ lams_monitoring/web/tblmonitor/aes.jsp	(.../aes.jsp)	(revision 8fec6246571ad1c7a6f6aae450f07b1f52bd19c4)
@@ -22,18 +22,27 @@
 		});
 	});
 	
-	function loadAePane(targetToolContentId){
+	function loadAePane(targetToolContentId, contentType){
 		$('#aes-tab .tab-pane').each(function(){
 			var aePane = $(this),
 				toolContentId = aePane.data('toolContentId'),
 				toolType = aePane.data('toolType'),
 				nav = $('#aes-tab .nav-tabs a[data-tool-content-id="' + toolContentId + '"]').closest('li');
 	
 			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.load(toolType == "d" ? 
-						 "<lams:LAMSURL/>tool/ladoku11/monitoring/ae.do?toolContentID="  + toolContentId
-						: "<lams:LAMSURL/>tool/laasse10/tblmonitoring/assessment.do?toolContentID="  + toolContentId);
+				aePane.load(url);
 					
 				aePane.addClass('active');
 				nav.addClass('active');
Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp
===================================================================
diff -u -r61c106fc9c6c9fbe4490bde9889a5e86e4b5131d -r8fec6246571ad1c7a6f6aae450f07b1f52bd19c4
--- lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision 61c106fc9c6c9fbe4490bde9889a5e86e4b5131d)
+++ lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision 8fec6246571ad1c7a6f6aae450f07b1f52bd19c4)
@@ -74,7 +74,7 @@
 				// tab was refreshed, get stored parameters
 				method = lastTabMethod;
 
-				if (autoRefresh && (method == 'burningQuestions' || method == 'aes' || method == 'aesStudentChoices' || method == 'sequence' || 
+				if (autoRefresh && (method == 'burningQuestions' || method == 'aes' || method == 'sequence' || 
 									method == 'gates' || method == 'iraAssessment'  || $('.modal').hasClass('in'))){
 					// do not auto refresh pages with mostly static content
 					// or if a modal dialog is open
@@ -122,8 +122,6 @@
 					aeActivityTitles: "${aeActivityTitles}"
 				};
 
-			} else if (method == "aesStudentChoices") {
-				url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring/";
 			} else if (method == "forum") {
 				options = {
 					activityId: "${forumActivityId}"
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -r2ce1ca7a4995e15743c5800fdd789868b0236836 -r8fec6246571ad1c7a6f6aae450f07b1f52bd19c4
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 2ce1ca7a4995e15743c5800fdd789868b0236836)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 8fec6246571ad1c7a6f6aae450f07b1f52bd19c4)
@@ -104,6 +104,15 @@
 	function disabledAndCheckButton(button){
 		button.attr('disabled', true).html('<i class="fa fa-check text-success">&nbsp;</i>' + button.text());
 	}
+
+	function showStudentChoices() {
+		// these methods come from tblmonitor.jsp and aes.jsp in lams_monitoring
+		if (${not empty isIraAssessment and isIraAssessment}) {
+			loadTab('iraAssessmentStudentChoices', ${toolContentID});
+			return;
+		}
+		loadAePane(${toolContentID}, 'studentChoices');
+	}
 </script>
 
 <%-- For AEs tab the panes are defined in TBL monitor, for IRA we need to define it here --%>
@@ -132,7 +141,7 @@
 		</div>
 		<div class="col-xs-6 col-sm-8">
 			<div class="btn btn-sm btn-default pull-right"
-				 onclick="javascript:loadTab('${isIraAssessment ? 'iraAssessmentStudentChoices' : 'aesStudentChoices'}', ${toolContentID})">
+				 onclick="javascript:showStudentChoices()">
 				<i class="fa fa-file"></i>
 				<fmt:message key="label.show.students.choices"/>
 			</div>   
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
===================================================================
diff -u -r4ae9c0cdc939e6b0cdd9c734202302c79a60d207 -r8fec6246571ad1c7a6f6aae450f07b1f52bd19c4
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 4ae9c0cdc939e6b0cdd9c734202302c79a60d207)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 8fec6246571ad1c7a6f6aae450f07b1f52bd19c4)
@@ -57,36 +57,22 @@
 	};
 </script>
 
-<!-- Header -->
-<div class="row no-gutter">
-	<div class="col-xs-12 col-md-12 col-lg-8">
-		<h3>
-			<fmt:message key="label.ae.questions.marks"/>
-		</h3>
-	</div>
-</div>
-<!-- End header -->
 
 <!-- Notifications -->
-<div class="row">
-	<div class="col-md-6 col-lg-4 ">
-	</div>
-	
-	<div class="col-xs-12 col-md-6 col-lg-4 col-lg-offset-2">
-		<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
-				onclick="javascript:loadTab('aes', ${toolContentID}); 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-sm btn-default 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-sm btn-default buttons_column">
-			<i class="fa fa-file"></i>
-			<fmt:message key="label.excel.export"/>
-		</a>
-	</div>
+<div class="pull-right">
+	<a href="#nogo" type="button" class="btn btn-sm btn-default 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-sm btn-default 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-sm btn-default buttons_column">
+		<i class="fa fa-file"></i>
+		<fmt:message key="label.excel.export"/>
+	</a>
 </div>
 <br>
 <!-- End notifications -->