Index: lams_learning/web/css/components-learner.scss
===================================================================
diff -u -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10 -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
+++ lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -232,7 +232,7 @@
     border-bottom-right-radius: 1.25rem;
     border: 0;
     box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);//copied from bootstrap .shadow class
-    margin-bottom: 1.5rem;//copied from bootstrap .mb-4 class
+    margin-bottom: 2rem;
 }
 
 .lcard .card-header {
Index: lams_tool_assessment/web/includes/css/assessment.scss
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/includes/css/assessment.scss	(.../assessment.scss)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/includes/css/assessment.scss	(.../assessment.scss)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -1,5 +1,6 @@
 @import "_lams_variables.scss";
 
+
 .innerforms {
 	border: 0px;
 	font-size: small;
@@ -126,13 +127,30 @@
     border-radius: 10px
 }
 
+button.btn{
+	box-shadow: 0px 3px 6px var(--bs-gray-400);
+}
+
+.div-hover {
+    border-bottom: 1px solid #ddd;
+}
 .div-hover .row {
     padding: 12px 0 !important;
 }
+
+.div-table>div:first-child {
+	border-top: 1px solid #ddd;
+    background-color: rgba(var(--bs-light-rgb), 1);
+    font-style: italic;
+    color: initial !important;
+}
 .div-table .row {
-	border-bottom: 2px solid var(--bs-gray-200) !important;
+	border-bottom: 2px solid var(--bs-gray-200);
 	padding: 0.5rem;
 }
+.div-table.table-sm .row {
+	padding: 0.25rem;
+}
 
 /*----------slider----------------*/
 
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -630,13 +630,13 @@
 		</c:if>
 		
 		<c:if test="${assessment.allowDiscloseAnswers}">
-			<lams:Alert5 type="info" close="true">
+			<lams:Alert5 id="learning-disclose-info" type="info" close="true">
 				<fmt:message key="label.learning.disclose.tip" />
 			</lams:Alert5>
 		</c:if>
 		
 		<c:if test="${hasEditRight}">
-			<lams:Alert5 type="info" close="true">
+			<lams:Alert5 id="learning-submit-all-info" type="info" close="true">
 				<fmt:message key="label.learning.submit.all.tip" />
 			</lams:Alert5>
 		</c:if>
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -31,7 +31,7 @@
 					</span>
 
 					<c:if test="${assessment.displayMaxMark}">
-						<span class="float-end badge alert alert-info fw-normal m-1 p-2">
+						<span class="float-end badge alert alert-info fw-normal m-1 p-1">
 							<fmt:message key="label.learning.max.mark">
 								<fmt:param value="${question.maxMark}" />
 							</fmt:message>
@@ -108,7 +108,7 @@
 				<%--Display jsutification for each question --%>
 				<c:if test="${(assessment.allowAnswerJustification || (question.type == 8 && question.hedgingJustificationEnabled)) 
 							&& justificationEligible && (!isLeadershipEnabled or isUserLeader)}">
-					<div class="answer-justification-container mt-4 mb-3">
+					<div class="answer-justification-container mt-4 mb-2">
 						<button type="button" data-bs-toggle="collapse"
 							data-bs-target="#answer-justification-${questionIndex}"
 							class="btn btn-light btn-sm collapsed card-subheader"
Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -110,6 +110,8 @@
 </script>
 	
 <c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
+	<c:set var="questionIndex" value="${status.index}"/>
+	
 	<div class="card lcard">
 		<div class="card-header">
 		
@@ -158,7 +160,7 @@
 			</c:if>
 
 			<c:if test="${assessment.displayMaxMark}">
-				<span class="float-end badge alert alert-info fw-normal m-1 p-2">
+				<span class="float-end badge alert alert-info fw-normal m-1 p-1">
 					<fmt:message key="label.learning.max.mark">
 						<fmt:param value="${question.maxMark}" />
 					</fmt:message>
@@ -175,7 +177,7 @@
 
 			<div class="card-title">
 				<c:if test="${assessment.numbered}">
-					${status.index + sessionMap.questionNumberingOffset}.
+					${questionIndex + sessionMap.questionNumberingOffset}.
 				</c:if>
 
 				<c:if test="${not sessionMap.hideTitles}">
@@ -188,7 +190,7 @@
 			</div>
 		</div>
 
-		<div class="card-body" id="question-area-${status.index}">
+		<div class="card-body" id="question-area-${questionIndex}">
 			<c:choose>
 				<c:when test="${question.type == 1}">
 					<c:set var="justificationEligible" value="true" />
@@ -220,7 +222,6 @@
 				</c:when>
 				<c:when test="${question.type == 8}">
 					<c:set var="justificationEligible" value="true" />
-					<c:set var="questionIndex" value="${status.index}" />
 					<%@ include file="markhedging.jsp"%>
 				</c:when>
 			</c:choose>
@@ -245,24 +246,22 @@
 							<fmt:message key="label.answer.justification" />
 						</div>
 
-						<div class="div-table table-responsive table-sm w-75 mx-auto">
-							<!-- 
-							<div class="row fw-bold text-muted">
+						<div class="div-table table-responsive table-sm mb-2">
+							<div class="row">
 								<div class="w-25">
 									<fmt:message key="monitoring.label.group" />
 								</div>
 								<div class="col">
 									<fmt:message key="label.answer.justification" />
 								</div>
 							</div>
-							 -->
 							
 							<c:forEach var="session" items="${sessions}" varStatus="status">
 								<c:set var="sessionResults" value="" />
 
 								<%-- Get the needed piece of information from a complicated questionSummaries structure --%>
 								<c:set var="questionSummary" value="${questionSummaries[question.uid]}" />
-								<c:set var="sessionResults" value="${questionSummary.questionResultsPerSession[status.index]}" />
+								<c:set var="sessionResults" value="${questionSummary.questionResultsPerSession[questionIndex]}" />
 								<c:set var="sessionResults" value="${sessionResults[fn:length(sessionResults)-1]}" />
 
 								<c:if test="${not empty sessionResults.uid and not empty sessionResults.justification}">
@@ -296,7 +295,7 @@
 						<div class="card-subheader mt-2">
 							<fmt:message key="label.answer.justification" />
 						</div>
-						<p class="ms-4">
+						<p>
 							<c:out value="${question.justificationHtml}" escapeXml="false" />
 						</p>
 					</c:when>
Index: lams_tool_assessment/web/pages/learning/results/essay.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -20,8 +20,8 @@
 		<fmt:message key="label.learning.summary.other.team.answers"/>
 	</div>
 	
-	<div class="table-responsive table-sm div-table mt-2 w-75 mx-auto" id="rating-table-${question.uid}">
-		<div class="row fw-bold text-muted">
+	<div class="table-responsive table-sm div-table mt-2" id="rating-table-${question.uid}">
+		<div class="row">
 			<div class="w-25">
 				<fmt:message key="monitoring.label.group" />
 			</div>
Index: lams_tool_assessment/web/pages/learning/results/historyresponses.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/pages/learning/results/historyresponses.jsp	(.../historyresponses.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/results/historyresponses.jsp	(.../historyresponses.jsp)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -1,44 +1,41 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:if test="${assessment.allowHistoryResponses && (fn:length(question.questionResults) > 1)}">
-	<div class="card-subheader">
+	<div class="card-subheader mt-2">
 		<fmt:message key="label.learning.question.summary.history.responces" />
 	</div>
 
-	<div class="ms-4x">
-	<table class="table table-sm text-muted w-75 mx-auto">
-		<thead>
-			<tr>
-				<th style="width: 70px">
+	<div class="table-responsive table-sm div-table">
+			<div class="row">
+				<div style="width: 70px">
 					#
-				</th>		
-				<th style="width: 25%">
+				</div>		
+				<div class="w-25">
 					<fmt:message key="label.learning.summary.completed.on" />
-				</th>
-				<th>
+				</div>
+				<div class="col">
 					<fmt:message key="label.learning.question.summary.response" />
-				</th>
+				</div>
 				<c:if test="${assessment.allowGradesAfterAttempt}">			
-					<th style="width: 70px" >
+					<div style="width: 70px" >
 						<fmt:message key="label.authoring.basic.list.header.mark" />
-					</th>	
+					</div>	
 				</c:if>		
-			</tr>
-		</thead>
+			</div>
 		
 		<c:forEach var="item" items="${question.questionResults}" varStatus="status">
 			<c:set var="questionResult" value="${item[0]}" />
 			<c:set var="currentAssessmentResult" value="${item[1]}" />
-			<tr>
-				<td>
+			<div class="row">
+				<div style="width: 70px">
 					${status.index + 1} 
-				</td>
-				<td>
+				</div>
+				<div class="w-25">
 					<div>
 						<lams:Date value="${currentAssessmentResult.finishDate}" timeago="true"/> 
 					</div>
-				</td>					
-				<td>
+				</div>					
+				<div class="col">
 					<c:choose>
 						<c:when test="${question.type == 1}">
 							<c:forEach var="option" items="${question.optionDtos}">
@@ -50,27 +47,25 @@
 							</c:forEach>						
 						</c:when>
 						<c:when test="${question.type == 2}">
-							<table style="padding: 0px; margin: 0px; border: none; " cellspacing="0" cellpadding="0">
-								<c:forEach var="option" items="${question.optionDtos}">
-									<tr>
-										<td style="width:40%; background: none; padding: 0px; margin: 0px; border: none;">
-											${option.matchingPair}
-										</td>
-										<td style="background: none; padding: 0px; margin: 0px; border: none; vertical-align: middle;">
-											- 
-											<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
-												<c:if test="${option.uid == optionAnswer.optionUid}">
-													<c:forEach var="questionOption2" items="${question.optionDtos}">
-														<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
-															${questionOption2.name}
-														</c:if>
-													</c:forEach>
-												</c:if>
-											</c:forEach>										
-										</td>
-									</tr>
-								</c:forEach>
-							</table>
+							<c:forEach var="option" items="${question.optionDtos}">
+								<div class="row" style="border: none;">
+									<div style="width: 40%;">
+										${option.matchingPair}
+									</div>
+									<div class="col">
+										-
+										<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+											<c:if test="${option.uid == optionAnswer.optionUid}">
+												<c:forEach var="questionOption2" items="${question.optionDtos}">
+													<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
+														${questionOption2.name}
+													</c:if>
+												</c:forEach>
+											</c:if>
+										</c:forEach>
+									</div>
+								</div>
+							</c:forEach>
 						</c:when>
 						<c:when test="${question.type == 3}">
 							${questionResult.answer}
@@ -100,15 +95,15 @@
 							</c:forEach>
 						</c:when>
 					</c:choose>
-				</td>
+				</div>
 				<c:if test="${assessment.allowGradesAfterAttempt}">
-					<td style="padding-left: 0px;" >
+					<div style="width: 70px; padding-left: 0px;" >
 						<div style="text-align: center;">
 							<fmt:formatNumber value="${questionResult.mark}" maxFractionDigits="3"/>
 						</div>
-					</td>
+					</div>
 				</c:if>		
-			</tr>
+			</div>
 		</c:forEach>
 	</table>
 	</div>
Index: lams_tool_assessment/web/pages/learning/results/markhedging.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/pages/learning/results/markhedging.jsp	(.../markhedging.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/results/markhedging.jsp	(.../markhedging.jsp)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="card-subheader">
+<div class="card-subheader" id="instructions-${questionIndex}">
 	<fmt:message key="label.assign.hedging.mark">
 		<fmt:param>${question.maxMark}</fmt:param>
 	</fmt:message>
@@ -20,7 +20,7 @@
 				</div>
 			</c:if>
 				
-			<div class="col">
+			<div class="col" id="option-name-${option.uid}">
 				<c:out value="${option.name}" escapeXml="false" />
 			</div>
 				
@@ -35,6 +35,7 @@
 			<div style="width:60px;">
 				<c:if test="${not empty toolSessionID}">
 					<select name="question${questionIndex}_${option.displayOrder}" class="mark-hedging-select" data-question-index="${questionIndex}"
+							aria-labelledby="instructions-${questionIndex} option-name-${option.uid}"
 							disabled="disabled">
 							
 						<c:forEach var="i" begin="0" end="${question.maxMark}">
Index: lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -48,12 +48,14 @@
 									<input type="checkbox" name="question${status.index}_${option.displayOrder}" value="${true}"
 				 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
 										disabled="disabled"
+										aria-labelledby="option-name-${option.uid}"
 									/>
 								</c:when>
 								<c:otherwise>
 									<input type="radio" name="question${status.index}" value="${option.displayOrder}"
 				 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
 				 						disabled="disabled"
+				 						aria-labelledby="option-name-${option.uid}"
 									/>
 								</c:otherwise>
 							</c:choose>
@@ -64,7 +66,7 @@
 	 	                </c:if>	
 					</div>
 					
-					<div class="col">
+					<div class="col" id="option-name-${option.uid}">
 						<c:out value="${option.name}" escapeXml="false" />
 					</div>
 					
Index: lams_tool_assessment/web/pages/learning/results/truefalse.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -ra84ec757c6b5b37c202866c5ae1b10937142875f
--- lams_tool_assessment/web/pages/learning/results/truefalse.jsp	(.../truefalse.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/results/truefalse.jsp	(.../truefalse.jsp)	(revision a84ec757c6b5b37c202866c5ae1b10937142875f)
@@ -4,7 +4,7 @@
 </c:set>
 
 <c:if test="${not empty toolSessionID}">
-	<div class="card-subheader">
+	<div class="card-subheader" id="instructions-${questionIndex}">
 		${truefalseInstructions}
 	</div>
 </c:if>
@@ -39,11 +39,12 @@
 						<input type="radio" name="question${status.index}" value="${true}"
 			 				<c:if test="${question.answerBoolean}">checked="checked"</c:if>
 							disabled="disabled"	
+							aria-labelledby="instructions-${questionIndex} option-name-true"
 						/>
 					</c:if>
 				</div>
 				
-				<div class="col">
+				<div class="col" id="option-name-true">
 					<fmt:message key="label.learning.true.false.true" />
 				</div>
 			</div>
@@ -70,11 +71,12 @@
 						<input type="radio" name="question${status.index}" value="${false}"
 			 				<c:if test="${(!question.answerBoolean) and (question.answer != null)}">checked="checked"</c:if>
 							disabled="disabled"
+							aria-labelledby="instructions-${questionIndex} option-name-false"
 						/>
 					</c:if>
 				</div>
 				
-				<div class="col">
+				<div class="col" id="option-name-false">
 					<fmt:message key="label.learning.true.false.false" />
 				</div>
 			</div>