Index: lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/controller/DiscussionSentimentController.java
===================================================================
diff -u -r0d458a161ee50dd2db8283520b80b5cc559705bf -rac1bc5dc42645586cf573699676b6f73fcf59d09
--- lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/controller/DiscussionSentimentController.java	(.../DiscussionSentimentController.java)	(revision 0d458a161ee50dd2db8283520b80b5cc559705bf)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/controller/DiscussionSentimentController.java	(.../DiscussionSentimentController.java)	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
@@ -135,7 +135,7 @@
 
 	int learnerCount = lessonService.getCountLessonLearners(lessonId, null);
 	model.addAttribute("learnerCount", learnerCount);
-	return "/discussion/monitor";
+	return "/discussion/monitor5";
     }
 
     @RequestMapping(path = "/stopMonitor", method = RequestMethod.POST)
Index: lams_learning/web/discussion/monitor5.jsp
===================================================================
diff -u
--- lams_learning/web/discussion/monitor5.jsp	(revision 0)
+++ lams_learning/web/discussion/monitor5.jsp	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
@@ -0,0 +1,297 @@
+<%@include file="/common/taglibs.jsp"%>
+<c:set var="idSuffix" value='${param.toolQuestionUid}${empty param.burningQuestionUid ? "" : "-".concat(param.burningQuestionUid)}' />
+
+<style>
+	.discussion-sentiment-chart-card .card-title .fa-comments {
+		/* Override global LAMS CSS */
+		color: black;
+	}
+	
+	.discussion-sentiment-chart-card.disabled td,
+	.discussion-sentiment-chart-card.disabled .card-title,
+	.discussion-sentiment-chart-card.disabled .card-title .fa-comments {
+		color: var(--bs-secondary);
+	}
+
+	.discussion-sentiment-chart-card .card-header {
+		display: flex;
+		justify-content: space-between;
+	}
+	
+	.discussion-sentiment-chart-card .card-header .discussion-sentiment-start-button {
+		/* Start button is hidden by default */
+		display: none;
+	}
+	
+	.discussion-sentiment-table-header-row td {
+		/* Table headers look better this way */
+		font-weight: bold;
+		text-align: left !important;
+	}
+	
+	.discussion-sentiment-table-stay-header-row td {
+		background-color: rgba(255, 195, 55, 1);
+	}
+	
+	.discussion-sentiment-table-move-header-row td {
+		background-color: rgba(5, 204, 214, 1);
+	}
+	
+	.discussion-sentiment-table-option-row td:first-child {
+		/* Option cells are slightly moved to the right */
+		padding-left: 30px;
+	}
+</style>
+
+<script>
+	function stopDiscussionSentiment(toolQuestionUid, burningQuestionUid) {
+		// stop discussion on server and reflect it on widget
+		$.ajax({
+			url : '<lams:LAMSURL />learning/discussionSentiment/stopMonitor.do',
+			data : {
+				toolQuestionUid : toolQuestionUid,
+				burningQuestionUid : burningQuestionUid
+			},
+			type : 'post',
+			success : function(){
+				 onStopDiscussionSentiment(toolQuestionUid, burningQuestionUid);
+			}
+		});
+	}
+
+	function onStopDiscussionSentiment(toolQuestionUid, burningQuestionUid) {
+		// stop auto refresh for this widget and make it look like disabled
+		 var widget = $('#discussion-sentiment-chart-card-content-' + toolQuestionUid + (burningQuestionUid ? '-' + burningQuestionUid : ''))
+		 		.data('stop', true)
+				.closest('.discussion-sentiment-chart-card').addClass('disabled');
+		$('.discussion-sentiment-stop-button', widget).remove();	
+		$('.discussion-sentiment-start-button', widget).show();	
+	}
+
+	function getDiscussionSentimentMonitorData(toolQuestionUid, burningQuestionUid) {
+		$.ajax({
+			url : '<lams:LAMSURL />learning/discussionSentiment/getMonitorData.do',
+			data : {
+				toolQuestionUid : toolQuestionUid,
+				burningQuestionUid : burningQuestionUid
+			},
+			dataType : 'json',
+			success : function(response) {
+				if (!response.isActive) {
+					 // probably another teacher stopped this discussion
+					 onStopDiscussionSentiment(toolQuestionUid, burningQuestionUid);
+				}
+
+				// process raw data in response, which is "option" -> "number of votes"
+				var data = response.votes, 
+					stayVotes  = 0,
+					moveVotes  = 0,
+					idSuffix = toolQuestionUid + (burningQuestionUid ? '-' + burningQuestionUid : '');
+				for (var optionNumber = 1; optionNumber <= 4; optionNumber++) {
+					var votes = data[optionNumber];
+					if (votes) {
+						stayVotes += votes;
+					}
+				}
+				$('#discussion-sentiment-table-stay-header-votes-' + idSuffix).text(stayVotes);
+
+				for (var optionNumber = 11; optionNumber <= 14; optionNumber++) {
+					var votes = data[optionNumber];
+					if (votes) {
+						moveVotes += votes;
+					}
+				}
+				$('#discussion-sentiment-table-move-header-votes-' + idSuffix).text(moveVotes);
+				
+				var totalVotes = stayVotes + moveVotes;
+				$('#discussion-sentiment-votes-' + idSuffix).text(totalVotes);
+				var stayPercent = totalVotes === 0 ? 0 : Math.round(stayVotes / totalVotes * 100);
+				$('#discussion-sentiment-table-stay-header-value-' + idSuffix).text(stayPercent + '%');
+				var movePercent = totalVotes === 0 ? 0 : Math.round(moveVotes / totalVotes * 100);
+				$('#discussion-sentiment-table-move-header-value-' + idSuffix).text(movePercent + '%');
+
+				for (var optionNumber = 1; optionNumber <= 14; optionNumber++) {
+					if (optionNumber > 4 && optionNumber < 11) {
+						// currently options are 1-4 (stay) and 11-14 (move)
+						continue;
+					}
+					
+					var votes = data[optionNumber],
+						optionRow = $('#discussion-sentiment-table-option-row-' + idSuffix + '-' + optionNumber);
+					if (votes && totalVotes > 0) {
+						optionRow.css('display', 'table-row')
+								 .find('.discussion-sentiment-table-option-value')
+								 .text(Math.round(votes / totalVotes * 100) + '%');
+					} else {
+						// if there are no votes for given option, do not display it at all
+						optionRow.css('display', 'none');
+					}
+				}
+
+				var chartCell = $('#discussion-sentiment-chart-cell-' + idSuffix);
+				if (totalVotes === 0) {
+					// no votes, no chart
+					chartCell.empty();
+					return;
+				}
+
+				var chartCanvas = $('canvas', chartCell),
+					chartData = [stayPercent, movePercent];
+				if (chartCanvas.length === 1) {
+					// chart already exists, just update it
+					var chart = chartCanvas.data('chart');
+					chart.data.datasets[0].data = chartData;
+					chart.update();
+					return;
+				}
+
+				// create a new chart
+				chartCanvas = $('<canvas />').appendTo(chartCell);
+				
+				var ctx = chartCanvas[0].getContext('2d'),
+					chart = new Chart(ctx, {
+						type : 'doughnut',
+						borderWidth : 0,
+						data : {
+							elements : {
+								arc : {
+									borderWidth : 0,
+									fontSize : 0,
+								}
+							},
+							datasets : [ {
+								data : chartData,
+								backgroundColor : [ 'rgba(255, 195, 55, 1)',
+													'rgba(5, 204, 214, 1)'
+													
+												  ],
+								borderWidth : 0,
+							} ],
+							labels : [ '<fmt:message key="label.discussion.stay.header" />',
+									   '<fmt:message key="label.discussion.move.header" />']
+						},
+						options : {
+							layout : {
+								padding : {
+									top: 10,
+									bottom: 10
+								}
+							},
+							legend : {
+								display : false
+							},
+							animation : {
+								animateScale : true,
+								animateRotate : true,
+								duration : 1000
+							},
+				            tooltips: {
+				                callbacks: {
+				                    label: function(tooltipItem, data) {
+					                    // own implementation of tooltip on hover: add percent sign
+				                        return data.labels[tooltipItem.index] + ': ' + data.datasets[0].data[tooltipItem.index] + '%';
+				                    }
+				                }
+				            }
+						}
+					});
+
+				// store it here so update process can find it
+				chartCanvas.data('chart', chart);
+			}
+		});
+	}
+	
+	$(document).ready(function(){
+		var toolQuestionUid = ${param.toolQuestionUid},
+			burningQuestionUid = '${param.burningQuestionUid}',
+			idSuffix = toolQuestionUid + (burningQuestionUid ? '-' + burningQuestionUid : ''),
+			// how often to refresh the chart
+			dataRefreshInterval = 5 * 1000;
+		getDiscussionSentimentMonitorData(toolQuestionUid, burningQuestionUid);
+		
+	
+		var dataRefresh = window.setInterval(function(){
+			var cardContent = $('#discussion-sentiment-chart-card-content-' + idSuffix),
+				// If in TBL monitor the tab with the chart got refreshed, then old interval is still ticking.
+				// We need to clear it so only the new interval does it job.
+				existingDataRefresh = cardContent.data('dataRefresh');
+			if (cardContent.length == 0 || cardContent.data('stop') || existingDataRefresh != dataRefresh) {
+				window.clearInterval(dataRefresh);
+				return;
+			}
+			getDiscussionSentimentMonitorData(toolQuestionUid, burningQuestionUid);
+		}, dataRefreshInterval);
+	
+		$('#discussion-sentiment-chart-card-content-' + idSuffix).data('dataRefresh', dataRefresh);
+	});
+</script>
+
+
+<div class="card discussion-sentiment-chart-card">
+	<div class="card-header"
+		 id="discussion-sentiment-chart-card-header-${idSuffix}">
+       	<div class="mt-2">
+	    	<i class="fa fa-comments"></i>
+	    	<fmt:message key="label.discussion.header" />
+	       	(<span id="discussion-sentiment-votes-${idSuffix}"></span>
+	       	 <fmt:message key="label.discussion.votes.of.students">
+	       		<fmt:param value="${learnerCount}" />
+	       	 </fmt:message>
+	       	)
+     	</div>
+     	<div class="btn btn-secondary discussion-sentiment-start-button" onClick="javascript:startDiscussionSentiment(${param.toolQuestionUid}, '${param.burningQuestionUid}', true)">
+			<fmt:message key="label.discussion.restart"/>
+		</div>
+  		<div class="btn btn-secondary discussion-sentiment-stop-button" onClick="javascript:stopDiscussionSentiment(${param.toolQuestionUid}, '${param.burningQuestionUid}')">
+			<fmt:message key="label.discussion.stop"/>
+		</div>
+    </div>
+
+    <div id="discussion-sentiment-chart-card-content-${idSuffix}" class="card-body container-fluid"
+       	 aria-labelledby="discussion-sentiment-chart-card-header-${idSuffix}">
+		<div class="row">
+			<div class="col-xs-12 col-sm-6" id="discussion-sentiment-chart-cell-${idSuffix}">
+			</div>
+			<div class="col-xs-12 col-sm-6">
+				<table class="table">
+			       	 <tr class="discussion-sentiment-table-header-row discussion-sentiment-table-stay-header-row">
+			       	 	<td>
+			       	 		<fmt:message key="label.discussion.stay.header" />
+			       	 		(<span id="discussion-sentiment-table-stay-header-votes-${idSuffix}"></span>&nbsp;<fmt:message key="label.discussion.votes" />)
+			       	 	</td>
+			       	 	<td id="discussion-sentiment-table-stay-header-value-${idSuffix}">
+			       	 	</td>
+			       	 </tr>
+			       	 <c:forEach begin="1" end="4" var="optionNumber">
+				       	 <tr id="discussion-sentiment-table-option-row-${idSuffix}-${optionNumber}" class="discussion-sentiment-table-option-row">
+				       	 	<td>
+				       	 		<fmt:message key="label.discussion.stay.option.${optionNumber}" />
+				       	 	</td>
+				       	 	<td class="discussion-sentiment-table-option-value">
+				       	 	</td>
+				       	 </tr>
+			       	 </c:forEach>
+			       	 
+			       	 <tr class="discussion-sentiment-table-header-row discussion-sentiment-table-move-header-row">
+			       	 	<td>
+			       	 		<fmt:message key="label.discussion.move.header" />
+			       	 		(<span id="discussion-sentiment-table-move-header-votes-${idSuffix}"></span>&nbsp;<fmt:message key="label.discussion.votes" />)
+			       	 	</td>
+			       	 	<td id="discussion-sentiment-table-move-header-value-${idSuffix}">
+			       	 	</td>
+			       	 </tr>
+			       	 <c:forEach begin="11" end="14" var="optionNumber">
+				       	 <tr id="discussion-sentiment-table-option-row-${idSuffix}-${optionNumber}" class="discussion-sentiment-table-option-row">
+				       	 	<td>
+				       	 		<fmt:message key="label.discussion.move.option.${optionNumber}" />
+				       	 	</td>
+				       	 	<td class="discussion-sentiment-table-option-value">
+				       	 	</td>
+				       	 </tr>
+			       	 </c:forEach>
+		       	 </table>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_monitoring/web/css/components-monitoring.css
===================================================================
diff -u -r56003dc7b87af7983c137daf04e402404932aeaa -rac1bc5dc42645586cf573699676b6f73fcf59d09
--- lams_monitoring/web/css/components-monitoring.css	(.../components-monitoring.css)	(revision 56003dc7b87af7983c137daf04e402404932aeaa)
+++ lams_monitoring/web/css/components-monitoring.css	(.../components-monitoring.css)	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
@@ -1258,4 +1258,8 @@
 
 .gate-opened-icon {
 	cursor: pointer;
+}
+
+.bg-success {
+	color: var(--bs-white) !important;
 }
\ No newline at end of file
Index: lams_monitoring/web/includes/javascript/monitorLesson5.js
===================================================================
diff -u -r2a5fb646572b9790ef4b88e795e15811d94ed19d -rac1bc5dc42645586cf573699676b6f73fcf59d09
--- lams_monitoring/web/includes/javascript/monitorLesson5.js	(.../monitorLesson5.js)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
+++ lams_monitoring/web/includes/javascript/monitorLesson5.js	(.../monitorLesson5.js)	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
@@ -3106,11 +3106,16 @@
 }
 
 function showConfirm(body, callback) {
-	let dialog = $('#confirmationDialog');
-	$('.modal-body', dialog).html(body);
+	let dialog = $('#confirmationDialog').data('confirmed', null).off('hidden.bs.modal').on('hidden.bs.modal', function(){
+		if (dialog.data('confirmed')) {
+			callback(true);
+		}
+	});
+
+	$('.modal-body', dialog).html(body)
 	
 	$("#confirmationDialogConfirmButton").off('click').on("click", function(){
-    	callback(true);
+		dialog.data('confirmed', true);
     	dialog.modal('hide');
 	});
   
Index: lams_tool_assessment/web/pages/learning/results/allquestions5.jsp
===================================================================
diff -u -r08f538ec5750238a01bc6b9a029c05531a201c2e -rac1bc5dc42645586cf573699676b6f73fcf59d09
--- lams_tool_assessment/web/pages/learning/results/allquestions5.jsp	(.../allquestions5.jsp)	(revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
+++ lams_tool_assessment/web/pages/learning/results/allquestions5.jsp	(.../allquestions5.jsp)	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
@@ -84,7 +84,7 @@
 		function startDiscussionSentiment(toolQuestionUid, burningQuestionUid, markAsActive) {
 			// burningQuestionUid is not used in Assessment, but must be added for function signature consistency
 			
-			$('#discussion-sentiment-chart-panel-container-' + toolQuestionUid).load(
+			$('#discussion-sentiment-chart-card-container-' + toolQuestionUid).load(
 				'${lams}learning/discussionSentiment/startMonitor.do',
 				{
 					toolQuestionUid : toolQuestionUid,
@@ -149,20 +149,20 @@
 					<c:if test="${param.embedded and empty toolSessionID}">
 						<div class="monitor-question-buttons">
 							<c:if test="${assessment.allowDiscloseAnswers and showQuestionMonitoringActionButtons}">
-								<div class="btn-group-xs disclose-button-group" questionUid="${question.uid}">
+								<div class="btn-group-sm disclose-button-group ms-2" questionUid="${question.uid}">
 									<%-- Allow disclosing correct answers only for multiple choice questions --%>
 									<c:if test="${question.type == 1}">
-										<div class="btn btn-default disclose-correct-button"
+										<div class="btn btn-secondary disclose-correct-button"
 											<c:if test="${question.correctAnswersDisclosed}">
-												disabled="disabled"><i class="fa fa-check text-success">&nbsp;</i
+												disabled="disabled"><i class="fa fa-check">&nbsp;</i
 											</c:if>
 											>
 											<fmt:message key="label.disclose.correct.answers"/>
 										</div>
 									</c:if>
-									<div class="btn btn-default disclose-groups-button"
+									<div class="btn btn-secondary disclose-groups-button"
 										<c:if test="${question.groupsAnswersDisclosed}">
-											disabled="disabled"><i class="fa fa-check text-success">&nbsp;</i
+											disabled="disabled"><i class="fa fa-check">&nbsp;</i
 										</c:if>
 										>
 										<fmt:message key="label.disclose.groups.answers"/>
@@ -171,17 +171,17 @@
 							</c:if>
 							
 							<c:if test="${param.showQuestionDetailsButton or assessment.allowDiscussionSentiment}">
-								<div class="btn-group-xs voffset5">
+								<div class="btn-group-sm mt-3">
 									<c:if test="${param.showQuestionDetailsButton}">
-										<a class="thickbox btn btn-default"
+										<a class="thickbox btn btn-secondary"
 										   href='<c:url value="/monitoring/questionSummary.do?sessionMapID=${sessionMapID}"/>&questionUid=${question.uid}&KeepThis=true&TB_iframe=true&modal=true'>
 											<i class="fa fa-info-circle"></i>&nbsp;<fmt:message key="label.monitoring.summary.results.question" />
 										</a>
 									</c:if>
 									
 									<c:if test="${assessment.allowDiscussionSentiment and showQuestionMonitoringActionButtons}">
 										<div id="discussion-sentiment-start-button-${question.uid}"
-										     class="btn btn-default discussion-sentiment-start-button"
+										     class="btn btn-secondary 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>
@@ -323,7 +323,7 @@
 					</c:if>
 					
 					<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscussionSentiment}">
-						<div id="discussion-sentiment-chart-panel-container-${question.uid}"></div>
+						<div id="discussion-sentiment-chart-card-container-${question.uid}"></div>
 					</c:if>
 				</div>
 							
Index: lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp
===================================================================
diff -u -r08f538ec5750238a01bc6b9a029c05531a201c2e -rac1bc5dc42645586cf573699676b6f73fcf59d09
--- lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(.../discloseAnswers5.jsp)	(revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
+++ lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(.../discloseAnswers5.jsp)	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
@@ -24,19 +24,18 @@
 				
 				
 				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);
+					showConfirm(isCorrectButton ? "<fmt:message key='message.disclose.correct.answers' />"
+								: "<fmt:message key='message.disclose.groups.answers' />", function(){
+						// check if correct answers are disclosed before groups' answers
+						if (isCorrectButton &&
+							!button.closest('.disclose-button-group').find('.disclose-groups-button').is('[disabled]')) {
+								showConfirm("<fmt:message key='message.disclose.correct.before.groups.answers' />", function(){
+									discloseAnswers(button, resultsPane, true);
+								});
+						} else {
+							discloseAnswers(button, resultsPane, true);
+						}
+					});
 				});
 			});
 		
@@ -47,23 +46,25 @@
 				// 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);
+						showConfirm("<fmt:message key='message.disclose.all.correct.answers' />", function(){
+							// check if correct answers are disclosed before groups' answers
+							let discloseFunction = function(){
+								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);
+							};
+							
+							if (!$('.disclose-all-groups-button', assessmentQuestionsPane).is('[disabled]')) {
+								showConfirm("<fmt:message key='message.disclose.correct.before.groups.answers' />", discloseFunction);
+								return;
+							}
+							
+							discloseFunction();
 						});
-						disabledAndCheckButton(allCorrectButton);
 					});
 				}
 			} else {
@@ -75,17 +76,15 @@
 				// 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);
+						showConfirm("<fmt:message key='message.disclose.all.groups.answers' />", function(){
+							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);
 						});
-						disabledAndCheckButton(allGroupsButton);
 					});
 				}
 			} else {
@@ -97,7 +96,6 @@
 	function discloseAnswers(button, resultsPane, isLast) {
 		let isCorrectButton = button.hasClass('disclose-correct-button'),
 			toolContentId = resultsPane.data('toolContentId');
-		
 		$.ajax({
 			'url'  : '<lams:WebAppURL />monitoring/' 
 					  + (isCorrectButton ? 'discloseCorrectAnswers' : 'discloseGroupsAnswers')
@@ -116,6 +114,6 @@
 	}
 
 	function disabledAndCheckButton(button){
-		button.attr('disabled', true).html('<i class="fa fa-check text-success">&nbsp;</i>' + button.text());
+		button.attr('disabled', true).html('<i class="fa fa-check">&nbsp;</i>' + button.text());
 	}
 </script>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp
===================================================================
diff -u -r2a5fb646572b9790ef4b88e795e15811d94ed19d -rac1bc5dc42645586cf573699676b6f73fcf59d09
--- lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp	(.../assessment5.jsp)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp	(.../assessment5.jsp)	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
@@ -26,52 +26,50 @@
 	}
 </script>
 
-<div class="container-fluid">
-	<%-- For AEs tab the panes are defined in TBL monitor, for IRA we need to define it here --%>
-	<div ${isIraAssessment ? 'id="assessment-pane-' += toolContentID += '"' : '' }>
-		<c:if test="${isIraAssessment}">
-			<div class="row">
-				<div class="col-8 offset-2 text-center">
-					<h3>
-						<fmt:message key="label.ira.questions.marks"/>
-					</h3>
-				</div>
+<%-- For AEs tab the panes are defined in TBL monitor, for IRA we need to define it here --%>
+<div class="container-fluid" ${isIraAssessment ? 'id="assessment-pane-' += toolContentID += '"' : '' }>
+	<c:if test="${isIraAssessment}">
+		<div class="row">
+			<div class="col-8 offset-2 text-center">
+				<h3>
+					<fmt:message key="label.ira.questions.marks"/>
+				</h3>
 			</div>
-		</c:if>
-		
-		<!-- Notifications -->  
-		<div class="row mb-3">
-			<div class="col-4 offset-2 pt-1">
-				<h4>
-					<i class="fa fa-users" style="color:gray" ></i> 
-					<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}">
-			<%-- 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>
-				</div>
-			</div>
-		</c:if>		
+	</c:if>
 	
-		<div class="results" data-tool-content-id="${toolContentID}"></div>
+	<!-- Notifications -->  
+	<div class="row mb-3">
+		<div class="col-4 offset-2 pt-1">
+			<h4>
+				<i class="fa fa-users" style="color:gray" ></i> 
+				<fmt:message key="label.attendance"/>: <span>${attemptedLearnersNumber}</span>/<span class="total-learners-number"></span> 
+			</h4> 
+		</div>
+		<div class="col-4 text-end">
+			<button class="btn btn-secondary" type="button"
+				 onclick="javascript:showStudentChoices()">
+				<i class="fa fa-file"></i>
+				<fmt:message key="label.show.students.choices"/>
+			</button>   
+		</div>                 
 	</div>
-</div>
\ No newline at end of file
+		
+	<c:if test="${allowDiscloseAnswers and showQuestionMonitoringActionButtons}">
+		<%-- Release correct/groups answers for all questions in this assessment --%>
+		<div class="row mb-3 disclose-all-button-group">
+			<div class="col-2 offset-6 pt-1 text-end">
+				<button class="btn btn-secondary disclose-all-correct-button" type="button">
+					<fmt:message key="label.disclose.all.correct.answers"/>
+				</button>
+			</div>
+			<div class="col-2 pt-1 text-end">
+				<button class="btn btn-secondary disclose-all-groups-button" type="button">
+					<fmt:message key="label.disclose.all.groups.answers"/>
+				</button>
+			</div>
+		</div>
+	</c:if>		
+
+	<div class="results" data-tool-content-id="${toolContentID}"></div>
+</div>
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp
===================================================================
diff -u -r2a5fb646572b9790ef4b88e795e15811d94ed19d -rac1bc5dc42645586cf573699676b6f73fcf59d09
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp	(.../assessmentStudentChoices5.jsp)	(revision 2a5fb646572b9790ef4b88e795e15811d94ed19d)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp	(.../assessmentStudentChoices5.jsp)	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
@@ -155,7 +155,7 @@
 						
 						<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>" >
+							<td class="text-center <c:if test="${questionResultDto.correct}">bg-success</c:if>" >
 								${questionResultDto.answer}
 							</td>
 						</c:forEach>