Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r7f1d981e3b4b708e15c8cd5bc1cfcf740cec666f -rdc7f8b12a94187b4ab03f1e5f9338b96a74f3dc7
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 7f1d981e3b4b708e15c8cd5bc1cfcf740cec666f)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision dc7f8b12a94187b4ab03f1e5f9338b96a74f3dc7)
@@ -3,18 +3,19 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
+	<c:set var="questionIndex" value="${questionEntry.key}"/>
 	<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswers}">
 
-		<c:if test="${questionEntry.key == answerEntry.key}">
+		<c:if test="${questionIndex == answerEntry.key}">
 
-			<div class="card lcard mt-4" id="question<c:out value='${questionEntry.key}' />">
+			<div class="card lcard mt-4" id="question${questionIndex}">
 				<div class="card-header">
-					<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() !=1}"><c:out value="${questionEntry.key}" />. </c:if>  <c:out value="${questionEntry.value.name}" escapeXml="false" />
+					<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() !=1}">${questionIndex}. </c:if>  <c:out value="${questionEntry.value.name}" escapeXml="false" />
 				</div>
 
 				<div class="card-body">
 					<c:if test="${not empty questionEntry.value.description}">
-						<div class="" id="questionDescription">
+						<div>
 							<c:out value="${questionEntry.value.description}" escapeXml="false" />
 						</div>
 					</c:if>
@@ -26,42 +27,44 @@
 
 						<c:if test="${questionEntry.value.minWordsLimit != 0}">
 						<span class="badge text-bg-primary">
-							<fmt:message key="label.words.required" />&nbsp;<span id="words-required-${questionEntry.key}"></span>
+							<fmt:message key="label.words.required" />&nbsp;<span id="words-required-${questionIndex}"></span>
 						</span>
 						</c:if>
 					</div>
 
-					<div class="my-2" id="answerResponse">
+					<div class="my-2">
+						<label class="visually-hidden" id="your-answer-label${questionIndex}" for="answer${questionIndex}">
+							<fmt:message key="label.learning.yourAnswer" />
+						</label>
+						
 						<c:choose>
 							<c:when test="${hasEditRight}">
-								<label class="visually-hidden" for="answer${questionEntry.key}">
-									<fmt:message key="label.learning.yourAnswer" />
-								</label>
-								<c:set var="placeholder"><fmt:message key="label.learning.yourAnswer" />...</c:set>
-								<div data-sequence-id="${questionEntry.key}"
+								<div data-sequence-id="${questionIndex}"
 									 data-is-ckeditor="${generalLearnerFlowDTO.allowRichEditor}"
 									 data-min-words-limit="${questionEntry.value.minWordsLimit}"
 									 <c:if test="${questionEntry.value.minWordsLimit != 0}">class="min-words-limit-enabled"</c:if>>
 									<c:choose>
 										<c:when test="${generalLearnerFlowDTO.allowRichEditor}">
-											<lams:CKEditor id="answer${questionEntry.key}"
+											<lams:CKEditor id="answer${questionIndex}"
 														   value="${answerEntry.value}"
 														   contentFolderID="${sessionMap.learnerContentFolder}"
-														   toolbarSet="DefaultLearner">
+														   toolbarSet="DefaultLearner"
+														   ariaLabelledby="your-answer-label${questionIndex}">
 											</lams:CKEditor>
 										</c:when>
 
 										<c:otherwise>
-											<lams:textarea name="answer${questionEntry.key}"
-														   id="answer${questionEntry.key}" rows="5" placeholder="${placeholder}"
+											<c:set var="placeholder"><fmt:message key="label.learning.yourAnswer" />...</c:set>
+											<lams:textarea name="answer${questionIndex}"
+														   id="answer${questionIndex}" rows="5" placeholder="${placeholder}"
 														   class="form-control"><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
 										</c:otherwise>
 									</c:choose>
 								</div>
 							</c:when>
 
 							<c:otherwise>
-								<lams:textarea name="answer${questionEntry.key}" rows="5"
+								<lams:textarea name="answer${questionIndex}" rows="5"
 											   class="form-control" disabled="disabled">
 									<c:out value='${answerEntry.value}' escapeXml='false' />
 								</lams:textarea>
@@ -78,7 +81,7 @@
 
 <c:if test="${hasEditRight}">
 	<div class="activity-bottom-buttons">
-		<button name="btnCombined" type="button" class="btn btn-primary mt-2"
+		<button name="btnCombined" type="button" class="btn btn-primary na"
 				onclick="javascript:submitMethod('submitAnswersContent');">
 			<fmt:message key="button.submitAllContent" />
 		</button>
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r7f1d981e3b4b708e15c8cd5bc1cfcf740cec666f -rdc7f8b12a94187b4ab03f1e5f9338b96a74f3dc7
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 7f1d981e3b4b708e15c8cd5bc1cfcf740cec666f)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision dc7f8b12a94187b4ab03f1e5f9338b96a74f3dc7)
@@ -5,19 +5,19 @@
 
 <!--question content goes here-->
 <c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-
-	<c:if test="${questionEntry.key == generalLearnerFlowDTO.currentQuestionIndex}">
+	<c:set var="questionIndex" value="${questionEntry.key}"/>
+	<c:if test="${questionIndex == generalLearnerFlowDTO.currentQuestionIndex}">
 		
-		<div class="card lcard mt-4" id="question<c:out value='${questionEntry.key}' />">
+		<div class="card lcard mt-4" id="question${questionIndex}">
 			<div class="card-header">
 				<div class="card-title">
-					<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}"><c:out value="${questionEntry.key}" />.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" />
+					<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}">${questionIndex}.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" />
 				</div>
 			</div>
 
 			<div class="card-body">
 				<c:if test="${not empty questionEntry.value.description}">
-					<div class="" id="questionDescription">
+					<div>
 						<c:out value="${questionEntry.value.description}" escapeXml="false" />
 					</div>
 				</c:if>
@@ -33,31 +33,33 @@
 					</c:if>
 				</div>
 
-				<div class="my-2" id="answerResponse">
-					<label class="visually-hidden" for="answer">
+				<div class="my-2">
+					<label class="visually-hidden" id="your-answer-label"  for="answer">
 						<fmt:message key="label.learning.yourAnswer" />
 					</label>
 					
-					<div data-sequence-id="${questionEntry.key}" data-is-ckeditor="${generalLearnerFlowDTO.allowRichEditor}"
+					<div data-sequence-id="${questionIndex}" data-is-ckeditor="${generalLearnerFlowDTO.allowRichEditor}"
 						data-min-words-limit="${questionEntry.value.minWordsLimit}"
 						<c:if test="${questionEntry.value.minWordsLimit != 0}">class="min-words-limit-enabled"</c:if>>
-						<c:set var="placeholder"><fmt:message key="label.learning.yourAnswer" />...</c:set>
+						
 						<c:choose>
 							<c:when test="${generalLearnerFlowDTO.allowRichEditor}">
 								<lams:CKEditor id="answer" value="${generalLearnerFlowDTO.currentAnswer}"
-								 contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner">
+								 contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner"
+								 ariaLabelledby="your-answer-label">
 								</lams:CKEditor>
 							</c:when>
 
 							<c:otherwise>
-								<lams:textarea name="answer" id="answer" rows="5" placeholder="${placeholder}" class="form-control">
+								<c:set var="placeholder"><fmt:message key="label.learning.yourAnswer" />...</c:set>
+								<lams:textarea name="answer" rows="5" placeholder="${placeholder}" class="form-control">
 									<c:out value='${generalLearnerFlowDTO.currentAnswer}' escapeXml='false' />
 								</lams:textarea>
 							</c:otherwise>
 						</c:choose>
 					</div>
 
-					<input type="hidden" name="currentQuestionIndex" value="${questionEntry.key}" />
+					<input type="hidden" name="currentQuestionIndex" value="${questionIndex}" />
 				</div>
 			</div>
 		</div>