Index: lams_monitoring/web/tblmonitor/teams.jsp
===================================================================
diff -u -ra13b927ed895f8e3eeaf559371262665e04ff07a -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision a13b927ed895f8e3eeaf559371262665e04ff07a)
+++ lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -268,21 +268,21 @@
 	<!-- Tables -->
 
 	<div class="row">
-		<div class="col-4 offset-4">
-			<h3 id="tbl-teams-tab-title" class="text-center">
+		<div class="col-10 offset-1">
+			<div class="float-end">
+				<c:if test="${not empty groupsSetupUrl}">
+					<a href="<lams:LAMSURL/>${groupsSetupUrl}" class="btn btn-secondary" target="_blank">
+						<fmt:message key="label.teams.setup"/>
+					</a>
+				</c:if>
+			</div>
+			<h3 id="tbl-teams-tab-title" class="text-right">
 				<fmt:message key="label.students.teams"/>
 			</h3>
 		</div>
-		<div class="col-2 text-end">
-			<c:if test="${not empty groupsSetupUrl}">
-				<a href="<lams:LAMSURL/>${groupsSetupUrl}" class="btn btn-secondary" target="_blank">
-					<fmt:message key="label.teams.setup"/>
-				</a>
-			</c:if>
-		</div>
 	</div>
 	<div class="row">
-		<div class="col-8 offset-2">
+		<div class="col-10 offset-1">
 			<c:if test="${not empty chartNamesDataset}">
 				<canvas id="summary-chart" class="mt-3"></canvas>
 			</c:if>
@@ -739,4 +739,4 @@
 
 <!-- container for Change Leader modals -->
 <div id="change-leader-modals">
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd3f7b720d7995e28b2e7516272b0e14ed89c45bc -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d3f7b720d7995e28b2e7516272b0e14ed89c45bc)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -136,7 +136,6 @@
 monitoring.tab.edit.activity = Edit Activity
 monitoring.label.group = Group
 monitoring.label.user.name = Name
-monitoring.label.all.learners = All learners
 label.monitoring.edit.activity.edit = Edit
 label.monitoring.summary.summary = Summary
 label.monitoring.summary.double.click = Double click on learner's name to get full individual report.
@@ -310,12 +309,12 @@
 label.confidence = Confidence
 label.no.question.references = No questions have been added to the question list. Do you still want to proceed with no questions?
 label.hide.name.column = Hide name column
-label.ira.questions.marks = iRAT Questions & Marks
+label.ira.questions.marks = iRAT Summary
 label.attendance = Attendance
-label.show.students.choices = Students' choices
+label.show.students.choices = Summary
 label.hide.students.choices = Questions
 label.print = Print
-label.excel.export = Excel export
+label.excel.export = Export
 label.teams = Teams
 label.no.questions.in.question.bank = No questions have been added to the question list. Do you still want to proceed with no questions?
 label.authoring.advance.disclose.answers = Disclose learner's and other groups' answers in monitor
@@ -430,6 +429,6 @@
 label.learning.matching.pairs.chosen = Chosen:
 label.learning.disclose.tip = When you finish the activity the teacher may disclose your answers to other students.
 label.prevent.learner.autosave.mutliple.tabs = You seem to have two LAMS tabs open for this exam. Please close one of them. Otherwise, answers will not be recorder properly and affect your score.
-label.monitoring.student.choices.none = No students have answered questions yet
 monitoring.label.all.learners = All learners
 label.authoring.preview.skip.validation = As a learner you should answer all required questions. In preview mode you are allowed to press this button again to continue.
+label.monitoring.student.choices.none = No students have answered questions yet
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -309,12 +309,12 @@
 label.confidence = Confidence
 label.no.question.references = No questions have been added to the question list. Do you still want to proceed with no questions?
 label.hide.name.column = Hide name column
-label.ira.questions.marks = iRAT Questions & Marks
+label.ira.questions.marks = iRAT Summary
 label.attendance = Attendance
-label.show.students.choices = Students' choices
+label.show.students.choices = Summary
 label.hide.students.choices = Questions
 label.print = Print
-label.excel.export = Excel export
+label.excel.export = Export
 label.teams = Teams
 label.no.questions.in.question.bank = No questions have been added to the question list. Do you still want to proceed with no questions?
 label.authoring.advance.disclose.answers = Disclose learner's and other groups' answers in monitor
@@ -431,3 +431,4 @@
 label.prevent.learner.autosave.mutliple.tabs = You seem to have two LAMS tabs open for this exam. Please close one of them. Otherwise, answers will not be recorder properly and affect your score.
 monitoring.label.all.learners = All learners
 label.authoring.preview.skip.validation = As a learner you should answer all required questions. In preview mode you are allowed to press this button again to continue.
+label.monitoring.student.choices.none = No students have answered questions yet
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r4ae8ec393ca91db4253d2445e9ca8ca9d5a9c671 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 4ae8ec393ca91db4253d2445e9ca8ca9d5a9c671)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -309,10 +309,10 @@
 label.confidence = Confianza
 label.no.question.references = No ha incluido pregunta alguna en la lista. ¿Está seguro que desea proceder?
 label.hide.name.column = Esconder columna de nombre
-label.ira.questions.marks = iRAT: Preguntas y puntaje
+label.ira.questions.marks = Resumen de iRAT
 label.attendance = Asistencia
-label.show.students.choices = Mostrar resultados
-label.hide.students.choices = Esconder resultados
+label.show.students.choices = Resumen
+label.hide.students.choices = Preguntas
 label.print = Imprimir
 label.excel.export = Exportar Excel
 label.teams = Equipos
@@ -430,3 +430,4 @@
 label.learning.disclose.tip = Cuando termine la actividad, el profesor puede revelar sus respuestas a otros estudiantes.
 label.prevent.learner.autosave.mutliple.tabs = Parece que tiene dos pestañas de LAMS abiertas. Por favor, cierre una de ellas. De lo contrario, es posible que sus respuestas no se registren correctamente y podrá afectar su calificación.
 monitoring.label.all.learners = Todos los alumnos
+label.monitoring.student.choices.none = Ningún estudiante ha respondido preguntas todavía
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -30,7 +30,14 @@
 <div class="container-fluid" ${isIraAssessment ? 'id="assessment-pane-' += toolContentID += '"' : '' }>
 	<c:if test="${isIraAssessment}">
 		<div class="row">
-			<div class="col-10 offset-1 text-center">
+			<div class="col-10 offset-1">
+				<div class="float-end">
+					<button class="btn btn-secondary" type="button"
+						 onclick="javascript:showStudentChoices()">
+						<i class="fa fa-gauge"></i>
+						<fmt:message key="label.show.students.choices"/>
+					</button>   
+				</div>                 
 				<h3>
 					<fmt:message key="label.ira.questions.marks"/>
 				</h3>
@@ -46,13 +53,6 @@
 				<fmt:message key="label.attendance"/>: <span>${attemptedLearnersNumber}</span>/<span class="total-learners-number"></span> 
 			</h4> 
 		</div>
-		<div class="col-5 text-end">
-			<button class="btn btn-secondary" type="button"
-				 onclick="javascript:showStudentChoices()">
-				<i class="fa fa-list-check"></i>
-				<fmt:message key="label.show.students.choices"/>
-			</button>   
-		</div>                 
 	</div>
 		
 	<c:if test="${allowDiscloseAnswers and showQuestionMonitoringActionButtons}">
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -r62d681de9646afc0cf474f6e50f75b85209e0eb6 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 62d681de9646afc0cf474f6e50f75b85209e0eb6)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -73,37 +73,34 @@
 </script>
 <div class="container-fluid">
 	<div class="row">
-		<div class="col-10 offset-1 text-center">
+		<div class="col-10 offset-1 text-right">
+			<!-- Notifications -->  
+			<div class="float-end">
+				<a href="#nogo" type="button" class="btn btn-secondary buttons_column"
+						onclick="javascript:loadTab('irat', $('#load-irat-tab-btn'))">
+					<i class="fa fa-clipboard-question"></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-excel"></i>
+					<fmt:message key="label.excel.export"/>
+				</a>
+				<a class="btn btn-secondary buttons_column d-none" target="_blank" id="allocate-vsas-button"
+				   href='<lams:LAMSURL />qb/vsa/displayVsaAllocate.do?toolContentID=${toolContentID}'>
+					<fmt:message key="label.vsa.allocate.button" />
+				</a>
+			</div>
+			<!-- End notifications -->
 			<h3>
 				<fmt:message key="label.ira.questions.marks"/>
 			</h3>
 		</div>
 	</div>
 	
-	<!-- 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-clipboard-question"></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-excel"></i>
-				<fmt:message key="label.excel.export"/>
-			</a>
-			<a class="btn btn-secondary buttons_column d-none" target="_blank" id="allocate-vsas-button"
-			   href='<lams:LAMSURL />qb/vsa/displayVsaAllocate.do?toolContentID=${toolContentID}'>
-				<fmt:message key="label.vsa.allocate.button" />
-			</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">
@@ -132,4 +129,4 @@
 		<div class="col-10 offset-1" id="time-limit-panel-placeholder">
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r308d315464934bbf342b5bd93a31c8c3665d7d16 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 308d315464934bbf342b5bd93a31c8c3665d7d16)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -205,9 +205,9 @@
 label.change.marking.allocation.warning = Attention: changing scoring scale will affect the way marks get calculated.
 label.modify.default.marking = Modify default scoring scale
 label.burning.questions.autosaved = Burning questions autosaved
-label.tra.questions.marks = tRAT Questions & Marks
+label.tra.questions.marks = tRAT Summary
 label.attendance = Attendance
-label.show.students.choices = Students' choices
+label.show.students.choices = Summary
 label.hide.students.choices = Questions
 label.tra.results.by.team = tRAT results by team
 label.average = average
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r308d315464934bbf342b5bd93a31c8c3665d7d16 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 308d315464934bbf342b5bd93a31c8c3665d7d16)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -205,9 +205,9 @@
 label.change.marking.allocation.warning = Attention: changing scoring scale will affect the way marks get calculated.
 label.modify.default.marking = Modify default scoring scale
 label.burning.questions.autosaved = Burning questions autosaved
-label.tra.questions.marks = tRAT Questions & Marks
+label.tra.questions.marks = tRAT Summary
 label.attendance = Attendance
-label.show.students.choices = Students' choices
+label.show.students.choices = Summary
 label.hide.students.choices = Questions
 label.tra.results.by.team = tRAT results by team
 label.average = average
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -re65e473d6582caae620fe3cc3115fbc59fc48dc8 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision e65e473d6582caae620fe3cc3115fbc59fc48dc8)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -205,10 +205,10 @@
 label.change.marking.allocation.warning = Atención: cambiar la asignación de puntaje afectará la forma en que se calculan las resultados.
 label.modify.default.marking = Modificar la escala de puntaje preestablecido
 label.burning.questions.autosaved = Apelaciones auto-guardadas
-label.tra.questions.marks = tRAT Preguntas y puntaje
+label.tra.questions.marks = tRAT Resumen
 label.attendance = Asistencia
-label.show.students.choices = Mostrar resultados
-label.hide.students.choices = Esconder resultados
+label.show.students.choices = Resumen
+label.hide.students.choices = Preguntas
 label.tra.results.by.team = tRAT resultados por grupo
 label.average = promedio
 label.print = Imprimir
Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp
===================================================================
diff -u -r1024255b15cb1a0dcb4722623c6023ce6c5c8378 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp	(.../burningQuestions5.jsp)	(revision 1024255b15cb1a0dcb4722623c6023ce6c5c8378)
+++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp	(.../burningQuestions5.jsp)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -98,20 +98,19 @@
 <div class="container-fluid">
 	<!-- Tables -->
 
-	<div class="row mb-2">
-		<div class="col-4 offset-4">
-			<h3 class="text-center">
+	<div class="row">
+		<div class="col-10 offset-1 pb-2">
+			<div class="float-end">
+				<button type="button" id="toggle-burning-questions-button" class="btn btn-secondary" data-expanded="false">
+					<i class="fa fa-plus-circle"></i>
+					<span class="hidden-xs">
+						<fmt:message key='label.expand.all' />
+					</span>
+				</button>
+			</div>
+			<h3>
 				<fmt:message key="label.burning.questions"/>
 			</h3>
-		</div>
-		<div class="col-3 text-end">
-	        <button type="button" id="toggle-burning-questions-button" class="btn btn-secondary" data-expanded="false">
-	           	<i class="fa fa-plus-circle"></i>
-	           	<span class="hidden-xs">
-	           		<fmt:message key='label.expand.all' />
-	           	</span>
-	        </button>
-		</div>
 	</div>
 	
 	<div class="row">
@@ -222,4 +221,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp
===================================================================
diff -u -r997fdd2943e80dbf4e00dfeffb195503646d3447 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(.../studentChoices5.jsp)	(revision 997fdd2943e80dbf4e00dfeffb195503646d3447)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(.../studentChoices5.jsp)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -81,17 +81,9 @@
 </script>
 
 <div class="container-fluid">
-	 <div class="row">
-		<div class="col-8 offset-2 text-center">
-			<h3>
-				<fmt:message key="label.tra.questions.marks"/>
-			</h3>
-		</div>
-	</div>
-	
-	<!-- Notifications -->  
-	<div class="row mb-4">
-		<div class="col-10 offset-1 text-end">
+	 <div class="col-10 offset-1 pb-2">
+		<!-- Notifications -->  
+		<div class="float-end">
 			<a href="#nogo" type="button" class="btn btn-secondary buttons_column"
 					onclick="javascript:loadTab('trat', $('#load-trat-tab-btn'))">
 				<i class="fa fa-clipboard-question"></i>
@@ -112,9 +104,13 @@
 				</a>
 			</c:if>
 		</div>
+		<!-- End notifications -->
+		<h3>
+			<fmt:message key="label.tra.questions.marks"/>
+		</h3>
 	</div>
-	<!-- End notifications -->
 	
+	
 	<div class="row">
 		<div class="col-10 offset-1">
 			<div class="card">
@@ -192,4 +188,4 @@
 		<div class="col-10 offset-1" id="time-limit-panel-placeholder">
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -rf619aa5955dca265aae7744ea3319f3ec468801e
--- lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
@@ -57,7 +57,15 @@
 
 <div class="container-fluid">
 	 <div class="row">
-		<div class="col-10 offset-1 text-center">
+		<div class="col-10 offset-1">
+			<div class="float-end">
+				<button class="btn btn-secondary" type="button"
+					 onclick="javascript:loadTab('tratStudentChoices', $('#load-trat-student-choices-tab-btn'))">
+					<i class="fa fa-list-check"></i> 
+					<fmt:message key="label.show.students.choices"/>
+				</button>   
+			</div>                 
+
 			<h3>
 				<fmt:message key="label.tra.questions.marks"/>
 			</h3>
@@ -71,13 +79,6 @@
 				<fmt:message key="label.attendance"/>: <span>${attemptedLearnersNumber}</span>/<span class="total-learners-number"></span> 
 			</h4> 
 		</div>
-		<div class="col-5 text-end">
-			<button class="btn btn-secondary" type="button"
-				 onclick="javascript:loadTab('tratStudentChoices', $('#load-trat-student-choices-tab-btn'))">
-				<i class="fa fa-list-check"></i>
-				<fmt:message key="label.show.students.choices"/>
-			</button>   
-		</div>                 
 	</div>
 	<!-- End notifications -->              
 	
@@ -152,4 +153,4 @@
 			</div>  
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>