Index: lams_monitoring/web/tblmonitor/aes.jsp
===================================================================
diff -u -r8fec6246571ad1c7a6f6aae450f07b1f52bd19c4 -r1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1
--- lams_monitoring/web/tblmonitor/aes.jsp	(.../aes.jsp)	(revision 8fec6246571ad1c7a6f6aae450f07b1f52bd19c4)
+++ lams_monitoring/web/tblmonitor/aes.jsp	(.../aes.jsp)	(revision 1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1)
@@ -80,7 +80,7 @@
 	<div class="tab-content">
 		<c:forEach var="aeToolContentId" items="${aeToolContentIds}" varStatus="status">
 			<div id="assessment-pane-${aeToolContentId}"
-				 class="tab-pane"
+				 class="tab-pane assessment-questions-pane"
 				 data-tool-type="${aeToolTypes[status.index]}"
 				 data-tool-content-id="${aeToolContentId}">
 			</div>
Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp
===================================================================
diff -u -r01d58d98113a3b86e7ef29a2aed1a40053a74c4b -r1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1
--- lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 01d58d98113a3b86e7ef29a2aed1a40053a74c4b)
+++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1)
@@ -33,10 +33,6 @@
 		float: right;
 	}
 	
-	.discussion-sentiment-start-button {
-		margin-top: 5px;
-	}
-	
 	@media (min-width: 0px) and (max-width: 767px){
 		.discussion-sentiment-start-button {
 			padding: 1px 5px;
@@ -108,6 +104,10 @@
 	
 		//initialize bootstrap-sliders if "Enable confidence level" option is ON
 		$('.bootstrap-slider').bootstrapSlider();
+
+		<c:if test="${param.showQuestionDetailsButton}">
+			tb_init('a.thickbox');
+		</c:if>
 	
 		<%-- Connect to command websocket only if it is learner UI --%>
 		<c:if test="${not empty toolSessionID}">
@@ -170,13 +170,25 @@
 						</div>
 					</c:if>
 					
-					<c:if test="${assessment.allowDiscussionSentiment}">
-						<div id="discussion-sentiment-start-button-${question.uid}"
-						     class="btn btn-xs btn-default discussion-sentiment-start-button"
-						     onClick="javascript:startDiscussionSentiment(${question.uid}, null, true)">
-							<i class="fa fa-comments"></i><fmt:message key="label.monitoring.discussion.start"/>
+					<c:if test="${param.showQuestionDetailsButton or assessment.allowDiscussionSentiment}">
+						<div class="btn-group-xs voffset5">
+							<c:if test="${param.showQuestionDetailsButton}">
+								<a class="thickbox btn btn-default"
+								   href='<c:url value="/monitoring/questionSummary.do?sessionMapID=${sessionMapID}"/>&questionUid=${question.uid}&KeepThis=true&TB_iframe=true&modal=true'>
+									<fmt:message key="label.monitoring.summary.results.question" />
+								</a>
+							</c:if>
+							
+							<c:if test="${assessment.allowDiscussionSentiment}">
+								<div id="discussion-sentiment-start-button-${question.uid}"
+								     class="btn btn-default discussion-sentiment-start-button"
+								     onClick="javascript:startDiscussionSentiment(${question.uid}, null, true)">
+									<i class="fa fa-comments"></i>&nbsp;<fmt:message key="label.monitoring.discussion.start"/>
+								</div>
+							</c:if>
 						</div>
 					</c:if>
+					
 				</div>
 			</c:if>
 			
Index: lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp	(revision 1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1)
@@ -0,0 +1,121 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<script>
+	function loadResultsPane(resultsPane, isRefresh) {
+		var toolContentId = resultsPane.data('toolContentId');
+		// load an embedded results list
+		// show details button needs to be set in the page which included this page
+		resultsPane.load("<c:url value='/learning/showResultsForTeacher.do'/>?embedded=true&showQuestionDetailsButton=" + showQuestionDetailsButton 
+						  + "&toolContentID=" + toolContentId, function(){
+			var assessmentQuestionsPane = $(this).closest('.assessment-questions-pane'),
+				// are any correct/groups buttons clickable?
+				discloseAllCorrectEnabled = false,
+				discloseAllGroupsEnabled = false; 
+			
+			// disclose correct/group answers on click
+			$('.disclose-button-group .btn', assessmentQuestionsPane).not('[disabled]').each(function(){
+				let button = $(this),
+					isCorrectButton = button.hasClass('disclose-correct-button');
+				if (isCorrectButton) {
+					discloseAllCorrectEnabled = true;
+				} else {
+					discloseAllGroupsEnabled = true;
+				}
+				
+				
+				button.click(function(event) {	
+					if (!confirm(isCorrectButton ? "<fmt:message key='message.disclose.correct.answers' />"
+												: "<fmt:message key='message.disclose.groups.answers' />")) {
+						return;
+					}
+		
+					// check if correct answers are disclosed before groups' answers
+					if (isCorrectButton &&
+						!button.closest('.disclose-button-group').find('.disclose-groups-button').is('[disabled]') &&
+						!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
+						return;
+					}
+					
+					discloseAnswers(button, resultsPane, true);
+				});
+			});
+		
+			// if disclose all correct/groups answers buttons are clickable, add a click handler
+			// and disable if not
+			var allCorrectButton = $('.disclose-all-correct-button', assessmentQuestionsPane);
+			if (discloseAllCorrectEnabled) {
+				// do not add a handler twice
+				if (!isRefresh) {
+					allCorrectButton.click(function(){
+						if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
+							return;
+						}
+		
+						// check if correct answers are disclosed before groups' answers
+						if (!$('.disclose-all-groups-button', assessmentQuestionsPane).is('[disabled]') &&
+							!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
+							return;
+						}
+						
+						let nonDisclosedQuestions = $('.disclose-correct-button', assessmentQuestionsPane).not('[disabled]'),
+			    			lastQuestionUid = nonDisclosedQuestions.last().closest('.disclose-button-group').attr('questionUid');
+						nonDisclosedQuestions.each(function() {
+							let isLast = lastQuestionUid == $(this).closest('.disclose-button-group').attr('questionUid'); 
+							discloseAnswers($(this), resultsPane, isLast);
+						});
+						disabledAndCheckButton(allCorrectButton);
+					});
+				}
+			} else {
+				disabledAndCheckButton(allCorrectButton);
+			}
+		
+			var allGroupsButton = $('.disclose-all-groups-button', assessmentQuestionsPane);
+			if (discloseAllGroupsEnabled) {
+				// do not add a handler twice
+				if (!isRefresh) {
+					allGroupsButton.click(function(){
+						if (!confirm("<fmt:message key='message.disclose.all.groups.answers' />")) {
+							return;
+						}
+		
+						let nonDisclosedQuestions = $('.disclose-groups-button', assessmentQuestionsPane).not('[disabled]'),
+		    				lastQuestionUid = nonDisclosedQuestions.last().closest('.disclose-button-group').attr('questionUid');
+						nonDisclosedQuestions.each(function() {
+							let isLast = lastQuestionUid == $(this).closest('.disclose-button-group').attr('questionUid'); 
+							discloseAnswers($(this), resultsPane, isLast);
+						});
+						disabledAndCheckButton(allGroupsButton);
+					});
+				}
+			} else {
+				disabledAndCheckButton(allGroupsButton);
+			}
+		});
+	}
+
+	function discloseAnswers(button, resultsPane, isLast) {
+		let isCorrectButton = button.hasClass('disclose-correct-button'),
+			toolContentId = resultsPane.data('toolContentId');
+		
+		$.ajax({
+			'url'  : '<lams:WebAppURL />monitoring/' 
+					  + (isCorrectButton ? 'discloseCorrectAnswers' : 'discloseGroupsAnswers')
+					  + '.do',
+			'type': 'POST',
+			'data' : {
+				'questionUid'   : button.closest('.disclose-button-group').attr('questionUid'),
+				'toolContentID' : toolContentId,
+				'<csrf:tokenname/>' : '<csrf:tokenvalue/>',
+				'skipLearnersNotification' : !isLast
+			}
+		}).done(function(){
+			// reload results after disclosing answers
+			loadResultsPane(resultsPane, true);
+		});
+	}
+
+	function disabledAndCheckButton(button){
+		button.attr('disabled', true).html('<i class="fa fa-check text-success">&nbsp;</i>' + button.text());
+	}
+</script>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9416dfbb422c46b7ee5f22c1cab3db64ef29570a -r1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9416dfbb422c46b7ee5f22c1cab3db64ef29570a)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1)
@@ -4,13 +4,18 @@
 <c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
 <c:set var="assessment" value="${sessionMap.assessment}"/>
 
+<%@ include file="parts/discloseAnswers.jsp"%>
+
 <script type="text/javascript">
 	var activityCompletionChart = null,
 		answeredQuestionsChart = null;
 	// how often completion charts will be updated
-	const COMPLETION_CHART_UPDATE_INTERVAL = 10 * 1000;
+	const COMPLETION_CHART_UPDATE_INTERVAL = 10 * 1000,
+	// for allquestions.jsp to know whether to display an additional button
+	 	  showQuestionDetailsButton = true;
 
 	$(document).ready(function(){
+		loadResultsPane($('#results'), false);
 		
 		initializePortraitPopover("<lams:LAMSURL />");
 		
@@ -167,164 +172,6 @@
 			resizeJqgrid(jQuery(".ui-jqgrid-btable:visible", this));
 		})
 
-		var questionUidSelect = $('#questionUid'),
-			summaryButton = $('#questionSummaryHref'),
-			correctButton = $('#questionDiscloseCorrect'),
-			correctAllButton = $('#discloseAllCorrect'),
-			groupsAllButton = $('#discloseAllGroups'),
-			groupsButton = $('#questionDiscloseGroups'),
-			correctButtonLabel = "<fmt:message key='label.disclose.correct.answers' />",
-			groupsButtonLabel = "<fmt:message key='label.disclose.groups.answers' />",
-			checkIcon = '<i class="fa fa-check text-success">&nbsp;</i>';
-
-			// when question dropdow changes, manipulate buttons
-			questionUidSelect.change(function(event) {
-				var questionUid = $(this).val(),
-					selectedOption = $('option:selected', this),
-					// disclosing correct answers works only for multiple choice
-					isMultipleChoice = selectedOption.attr('isMultipleChoice') == 'true',
-					correctDisclosed = isMultipleChoice && selectedOption.attr('correctDisclosed'),
-					groupsDisclosed = selectedOption.attr('groupsDisclosed');
-			if (questionUid == -1) {
-				// user went back to "Choose..." option
-				summaryButton.addClass('disabled');
-				correctButton.show().addClass('disabled').text(correctButtonLabel);
-				groupsButton.show().addClass('disabled').text(groupsButtonLabel);
-			} else {
-				// set link for thickbox
-				summaryButton.removeClass('disabled').attr("href", 
-					'<c:url value="/monitoring/questionSummary.do?sessionMapID=${sessionMapID}"/>&questionUid='
-					+ questionUid + "&KeepThis=true&TB_iframe=true&modal=true");
-				// manipulate disclose buttons
-				if (isMultipleChoice) {
-					correctButton.show();
-					if (correctDisclosed == "true") {
-						correctButton.addClass('disabled').html(checkIcon + correctButtonLabel);
-					} else {
-						correctButton.removeClass('disabled').html(correctButtonLabel);
-					}
-				} else {
-					correctButton.hide();
-				}
-				
-				if (groupsDisclosed == "true") {
-					groupsButton.addClass('disabled').html(checkIcon + groupsButtonLabel);
-				} else {
-					groupsButton.removeClass('disabled').html(groupsButtonLabel);
-				}
-			}
-	    });
-
-		// ajax calls to disclose correct/groups answers
-	    correctButton.click(function(){
-	    	if (!confirm("<fmt:message key='message.disclose.correct.answers' />")) {
-	    		return;
-	    	};
-
-			// check if correct answers are disclosed before groups' answers
-			if (!groupsButton.is('.disabled') &&
-				!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
-				return;
-			}
-	    	
-			$.ajax({
-                type: 'POST',
-				'url'  : '<lams:WebAppURL />monitoring/discloseCorrectAnswers.do?<csrf:token/>',
-				'data' : {
-					'questionUid'   : questionUidSelect.val(),
-					'toolContentID' : '${sessionMap.assessment.contentId}'
-				}
-			}).done(function(){
-				$('option:selected', questionUidSelect).attr('correctDisclosed', 'true');
-				correctButton.addClass('disabled').html(checkIcon + correctButtonLabel);
-			});
-		});
-
-	    groupsButton.click(function(){
-	    	if (!confirm("<fmt:message key='message.disclose.groups.answers' />")) {
-	    		return;
-	    	};
-	    	
-			$.ajax({
-                type: 'POST',
-				'url'  : '<lams:WebAppURL />monitoring/discloseGroupsAnswers.do?<csrf:token/>',
-				'data' : {
-					'questionUid'   : questionUidSelect.val(),
-					'toolContentID' : '${sessionMap.assessment.contentId}'
-				}
-			}).done(function(){
-				$('option:selected', questionUidSelect).attr('groupsDisclosed', 'true');
-				groupsButton.addClass('disabled').html(checkIcon + groupsButtonLabel);
-			});
-		});
-
-	    correctAllButton.click(function(){
-	    	if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
-	    		return;
-	    	};
-	    	
-			if (!groupsAllButton.is('.disabled') &&
-				!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
-				return;
-			}
-			
-	    	let nonDisclosedQuestions = $('option[correctDisclosed="false"]', questionUidSelect),
-	    		lastQuestionUid = nonDisclosedQuestions.last().val();	
-	    	nonDisclosedQuestions.each(function(index){
-			    var option = $(this),
-			    	questionUid = option.val(),
-			    	// we notify learners only once, by the last question
-			    	isLast = questionUid == lastQuestionUid;
-		    	
-				$.ajax({
-                    type: 'POST',
-					'url'  : '<lams:WebAppURL />monitoring/discloseCorrectAnswers.do?<csrf:token/>',
-					'data' : {
-						'questionUid'   : questionUid,
-						'toolContentID' : '${sessionMap.assessment.contentId}',
-						'skipLearnersNotification' : !isLast
-					}
-				}).done(function(){
-					option.attr('correctDisclosed', 'true');
-					if (questionUidSelect.val() == questionUid) {
-						correctButton.addClass('disabled').html(checkIcon + correctButtonLabel);
-					}
-				});
-			});
-		    correctAllButton.addClass('disabled').html(checkIcon + correctAllButton.text());
-		});
-
-	    groupsAllButton.click(function(){
-	    	if (!confirm("<fmt:message key='message.disclose.all.groups.answers' />")) {
-	    		return;
-	    	};
-	    	
-	    	let nonDisclosedQuestions = $('option[groupsDisclosed="false"]', questionUidSelect),
-	    		lastQuestionUid = nonDisclosedQuestions.last().val();
-	    	nonDisclosedQuestions.each(function(){
-			    var option = $(this),
-			    	questionUid = option.val(),
-			    	// we notify learners only once, by the last question
-			    	isLast = questionUid == lastQuestionUid;
-		    	
-				$.ajax({
-                    type: 'POST',
-					'url'  : '<lams:WebAppURL />monitoring/discloseGroupsAnswers.do?<csrf:token/>',
-					'data' : {
-						'questionUid'   : questionUid,
-						'toolContentID' : '${sessionMap.assessment.contentId}',
-						'skipLearnersNotification' : !isLast
-					}
-				}).done(function(){
-					option.attr('groupsDisclosed', 'true');
-					if (questionUidSelect.val() == questionUid) {
-						groupsButton.addClass('disabled').html(checkIcon + groupsButtonLabel);
-					}
-				});
-			});
-		    groupsAllButton.addClass('disabled').html(checkIcon + groupsAllButton.text());
-		});
-
 		// trigger the resize when the window first opens so that the grid uses all the space available.
 		setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
 		
@@ -499,69 +346,34 @@
 		</div> <!--  end panel group -->
 	</c:if>
 
-	<!-- Dropdown menu for choosing a question type -->	
-	<h5><fmt:message key="label.monitoring.summary.report.by.question" /></h5>
-	
-	<c:set var="allCorrectDisclosed" value="true" />
-	<c:set var="allGroupsDisclosed" value="true" />
-	<div class="form-inline form-group voffset5">
-		<select id="questionUid" class="form-control input-sm">
-			<option selected="selected" value="-1"><fmt:message key="label.monitoring.summary.choose" /></option>
-    		<c:forEach var="question" items="${sessionMap.questionList}" varStatus="questionCount">
-				<option value="${question.uid}"
-						isMultipleChoice="${question.type == 1}"
-						correctDisclosed="${question.correctAnswersDisclosed}"
-						groupsDisclosed="${question.groupsAnswersDisclosed}">
-					${questionCount.count})&nbsp;<c:out value="${question.qbQuestion.name}" escapeXml="true"/>
-				</option>
-				<c:set var="allCorrectDisclosed"
-					   value="${allCorrectDisclosed && (question.type != 1 || question.correctAnswersDisclosed)}" />
-				<c:set var="allGroupsDisclosed" value="${allGroupsDisclosed && question.groupsAnswersDisclosed}" />
-		   	</c:forEach>
-		</select>
-			
-		<a id="questionSummaryHref" class="thickbox btn btn-default disabled">
-			<fmt:message key="label.monitoring.summary.results.question" />
-		</a>
-		<c:if test="${assessment.allowDiscloseAnswers}">
-			<a id="questionDiscloseCorrect" class="btn btn-default disabled">
-				<fmt:message key="label.disclose.correct.answers" />
-			</a>
-			<c:if test="${sessionMap.isGroupedActivity}">
-				<a id="questionDiscloseGroups" class="btn btn-default disabled">
-					<fmt:message key="label.disclose.groups.answers" />
-				</a>
-			</c:if>
-		</c:if>
-	</div>
-
-	<c:if test="${assessment.allowDiscloseAnswers}">
-		<div class="voffset5">
-			<a id="discloseAllCorrect" class="btn btn-default ${allCorrectDisclosed ? 'disabled' : ''}">
-				<c:if test="${allCorrectDisclosed}">
-					<i class="fa fa-check text-success">&nbsp;</i>
-				</c:if>
-				<fmt:message key="label.disclose.all.correct.answers" />
-			</a>
-			<c:if test="${sessionMap.isGroupedActivity}">
-				<a id="discloseAllGroups" class="btn btn-default ${allGroupsDisclosed ? 'disabled' : ''}">
-					<c:if test="${allGroupsDisclosed}">
-						<i class="fa fa-check text-success">&nbsp;</i>
+	<div class="assessment-questions-pane">
+		<c:if test="${assessment.allowDiscloseAnswers or vsaPresent}">
+			<%-- Release correct/groups answers for all questions in this assessment --%>
+			<div class="row">
+				<div class="col-xs-12 col-md-12 col-lg-12">
+					<div class="btn-group-sm pull-right disclose-all-button-group">
+						<div class="btn btn-default disclose-all-correct-button">
+							<fmt:message key="label.disclose.all.correct.answers"/>
+						</div>
+						<div class="btn btn-default disclose-all-groups-button">
+							<fmt:message key="label.disclose.all.groups.answers"/>
+						</div>
+					</div>
+					
+					<c:if test="${vsaPresent}">
+						<a class="thickbox btn btn-sm pull-right btn-default roffset5"
+						   href='<c:url value="/monitoring/displayVsaAllocate.do?toolContentID=${assessment.contentId}&KeepThis=true&TB_iframe=true&modal=true"/>'>
+							<fmt:message key="label.vsa.allocate.button" />
+						</a>
 					</c:if>
-					<fmt:message key="label.disclose.all.groups.answers" />
-				</a>
-			</c:if>
-		</div>
-	</c:if>
-	
-	<c:if test="${vsaPresent}">
-		<div class="voffset5">
-			<a class="thickbox btn btn-default"
-			   href='<c:url value="/monitoring/displayVsaAllocate.do?toolContentID=${sessionMap.assessment.contentId}&KeepThis=true&TB_iframe=true&modal=true"/>'>
-				<fmt:message key="label.vsa.allocate.button" />
-			</a>
-		</div>
-	</c:if>
+				</div>
+			</div>
+		</c:if>	
+		
+
+		
+		<div id="results" class="voffset10" data-tool-content-id="${assessment.contentId}"></div>
+	</div>
 </c:if>
 
 <br/>
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -r9724e018787859abfe89bba4ba42f95696e00a17 -r1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 9724e018787859abfe89bba4ba42f95696e00a17)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 1a01ef3ca8c5a1dd387d088a7873f0d304a1a3d1)
@@ -1,7 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
 <% pageContext.setAttribute("newLineChar", "\r\n"); %>
 
+
+<%@ include file="/pages/monitoring/parts/discloseAnswers.jsp"%>
+
 <script>
+	//for allquestions.jsp to know whether to display an additional button
+	const showQuestionDetailsButton = false;
+	
 	$(document).ready(function(){
 		var assessmentPane = $('#assessment-pane-${toolContentID}');
 		//insert total learners number taken from the parent tblmonitor.jsp
@@ -10,123 +16,6 @@
 		loadResultsPane($('.results', assessmentPane), false);
 	});
 	
-	function loadResultsPane(resultsPane, isRefresh) {
-		var toolContentId = resultsPane.data('toolContentId');
-		// load an embedded results list
-		resultsPane.load("<c:url value='/learning/showResultsForTeacher.do'/>?embedded=true&toolContentID=" + toolContentId, function(){
-			var assessmentPane = $(this).closest('.tab-pane'),
-				// are any correct/groups buttons clickable?
-				discloseAllCorrectEnabled = false,
-				discloseAllGroupsEnabled = false; 
-			
-			// disclose correct/group answers on click
-			$('.disclose-button-group .btn', assessmentPane).not('[disabled]').each(function(){
-				let button = $(this),
-					isCorrectButton = button.hasClass('disclose-correct-button');
-				if (isCorrectButton) {
-					discloseAllCorrectEnabled = true;
-				} else {
-					discloseAllGroupsEnabled = true;
-				}
-				
-				
-				
-				button.click(function(event) {	
-					if (!confirm(isCorrectButton ? "<fmt:message key='message.disclose.correct.answers' />"
-												: "<fmt:message key='message.disclose.groups.answers' />")) {
-						return;
-					}
-
-					// check if correct answers are disclosed before groups' answers
-					if (isCorrectButton &&
-						!button.closest('.disclose-button-group').find('.disclose-groups-button').is('[disabled]') &&
-						!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
-						return;
-					}
-					
-					discloseAnswers(button, resultsPane, true);
-				});
-			});
-	
-			// if disclose all correct/groups answers buttons are clickable, add a click handler
-			// and disable if not
-			var allCorrectButton = $('.disclose-all-correct-button', assessmentPane);
-			if (discloseAllCorrectEnabled) {
-				// do not add a handler twice
-				if (!isRefresh) {
-					allCorrectButton.click(function(){
-						if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
-							return;
-						}
-
-						// check if correct answers are disclosed before groups' answers
-						if (!$('.disclose-all-groups-button', assessmentPane).is('[disabled]') &&
-							!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
-							return;
-						}
-						
-						let nonDisclosedQuestions = $('.disclose-correct-button', assessmentPane).not('[disabled]'),
-			    			lastQuestionUid = nonDisclosedQuestions.last().closest('.disclose-button-group').attr('questionUid');
-						nonDisclosedQuestions.each(function() {
-							let isLast = lastQuestionUid == $(this).closest('.disclose-button-group').attr('questionUid'); 
-							discloseAnswers($(this), resultsPane, isLast);
-						});
-						disabledAndCheckButton(allCorrectButton);
-					});
-				}
-			} else {
-				disabledAndCheckButton(allCorrectButton);
-			}
-	
-			var allGroupsButton = $('.disclose-all-groups-button', assessmentPane);
-			if (discloseAllGroupsEnabled) {
-				// do not add a handler twice
-				if (!isRefresh) {
-					allGroupsButton.click(function(){
-						if (!confirm("<fmt:message key='message.disclose.all.groups.answers' />")) {
-							return;
-						}
-
-						let nonDisclosedQuestions = $('.disclose-groups-button', assessmentPane).not('[disabled]'),
-		    				lastQuestionUid = nonDisclosedQuestions.last().closest('.disclose-button-group').attr('questionUid');
-						nonDisclosedQuestions.each(function() {
-							let isLast = lastQuestionUid == $(this).closest('.disclose-button-group').attr('questionUid'); 
-							discloseAnswers($(this), resultsPane, isLast);
-						});
-						disabledAndCheckButton(allGroupsButton);
-					});
-				}
-			} else {
-				disabledAndCheckButton(allGroupsButton);
-			}
-		});
-	}
-	
-	function discloseAnswers(button, resultsPane, isLast) {
-		let isCorrectButton = button.hasClass('disclose-correct-button'),
-			toolContentId = resultsPane.data('toolContentId');
-		
-		$.ajax({
-			'url'  : '<lams:WebAppURL />monitoring/' 
-					  + (isCorrectButton ? 'discloseCorrectAnswers' : 'discloseGroupsAnswers')
-					  + '.do',
-			'type': 'POST',
-			'data' : {
-				'questionUid'   : button.closest('.disclose-button-group').attr('questionUid'),
-				'toolContentID' : toolContentId,
-				'<csrf:tokenname/>' : '<csrf:tokenvalue/>',
-				'skipLearnersNotification' : !isLast
-			}
-		}).done(function(){
-			// reload results after disclosing answers
-			loadResultsPane(resultsPane, true);
-		});
-	}
-
-	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}) {