Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8b47c3282bdf668831f60df54fab447ce226d34f
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 8b47c3282bdf668831f60df54fab447ce226d34f)
@@ -236,20 +236,18 @@
 				
 			<c:if test="${(mcGeneralLearnerFlowDTO.retries != 'true') 
 					|| (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true')}">
-				<c:if test="${!hasEditRight}">
-					<form:hidden path="learnerFinished" value="Finished" />
+				<form:hidden path="learnerFinished" value="Finished" />
 
-					<button type="button" class="btn btn-primary na" id="finishButton">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="label.submit" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="label.finished" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:if>
+				<button type="button" class="btn btn-primary na" id="finishButton">
+					<c:choose>
+						<c:when test="${isLastActivity}">
+							<fmt:message key="label.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.finished" />
+						</c:otherwise>
+					</c:choose>
+				</button>
 			</c:if>
 
 			<c:if test="${(mcGeneralLearnerFlowDTO.retries == 'true') && hasEditRight}">
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8b47c3282bdf668831f60df54fab447ce226d34f
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 8b47c3282bdf668831f60df54fab447ce226d34f)
@@ -221,18 +221,16 @@
 		<c:if test="${mode != 'teacher'}">
 			<div class="activity-bottom-buttons">
 				<span id="learner-submit">
-					<c:if test="${!hasEditRight || generalLearnerFlowDTO.isLearnerFinished}">
-						<button type="button" id="finishButton" class="btn btn-primary na">
-							<c:choose>
-								<c:when test="${sessionMap.isLastActivity}">
-									<fmt:message key="button.submit" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="button.endLearning" />
-								</c:otherwise>
-							</c:choose>
-						</button>
-					</c:if>
+					<button type="button" id="finishButton" class="btn btn-primary na">
+						<c:choose>
+							<c:when test="${sessionMap.isLastActivity}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</button>
 				</span>
 
 				<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight && !generalLearnerFlowDTO.noReeditAllowed}">
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8b47c3282bdf668831f60df54fab447ce226d34f
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 8b47c3282bdf668831f60df54fab447ce226d34f)
@@ -196,18 +196,16 @@
 
 			<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
 				<div class="activity-bottom-buttons">
-					<c:if test="${!hasEditRight}">
-						<button type="button" class="btn btn-primary na" id="finishButton">
-							<c:choose>
-								<c:when test="${isLastActivity}">
-									<fmt:message key="button.submitActivity" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="button.endLearning" />
-								</c:otherwise>
-							</c:choose>
-						</button>
-					</c:if>
+					<button type="button" class="btn btn-primary na" id="finishButton">
+						<c:choose>
+							<c:when test="${isLastActivity}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</button>
 	
 					<c:if test="${voteLearningForm.lockOnFinish != 'true' && hasEditRight}">
 						<button type="button" class="btn btn-secondary btn-icon-return me-2" onclick="submitMethod('redoQuestionsOk');">
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -reb8468afcebf13f633fa953b178b4a609b568c74 -r8b47c3282bdf668831f60df54fab447ce226d34f
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision eb8468afcebf13f633fa953b178b4a609b568c74)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 8b47c3282bdf668831f60df54fab447ce226d34f)
@@ -162,46 +162,46 @@
 			</div>
 
 			<!-- options  -->
-				<div class="card lcard">
-					<div class="card-body">
-			<fieldset>
-				<legend class="visually-hidden">
-					<fmt:message key="label.vote.nominations" />
-				</legend>
+			<div class="card lcard">
+				<div class="card-body">
+					<fieldset>
+						<legend class="visually-hidden">
+							<fmt:message key="label.vote.nominations" />
+						</legend>
 			
-					<div class="div-hover my-3">
-						<c:set var="count" value="0" scope="page" />
-						<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
-							<c:set var="count" value="${count + 1}" scope="page" />
-	
-							<div class="row g-0">
-								<div class="col">
-									<div class="form-check">
-										<input type="checkbox" id="vote${count}" name="checkedVotes" value="${subEntry.key}" class="form-check-input"
-											onClick="updateCount(this);">
+						<div class="div-hover my-3">
+							<c:set var="count" value="0" scope="page" />
+							<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
+								<c:set var="count" value="${count + 1}" scope="page" />
 		
-										<label for="vote${count}" class="form-check-label">
-											<c:out value="${subEntry.value}" escapeXml="false" />
+								<div class="row g-0">
+									<div class="col">
+										<div class="form-check">
+											<input type="checkbox" id="vote${count}" name="checkedVotes" value="${subEntry.key}" class="form-check-input"
+												onClick="updateCount(this);">
+			
+											<label for="vote${count}" class="form-check-label">
+												<c:out value="${subEntry.value}" escapeXml="false" />
+											</label>
+										</div>
+									</div>
+								</div>
+							</c:forEach>
+							
+							<c:if test="${voteLearningForm.allowTextEntry == 'true'}">
+								<div class="row g-0">
+									<div class="col input-group">
+										<label for="userEntry" class="input-group-text">
+											<fmt:message key="label.other" />:
 										</label>
+										<form:input cssClass="form-control" path="userEntry" size="30" maxlength="100" />
 									</div>
 								</div>
-							</div>
-						</c:forEach>
-						
-						<c:if test="${voteLearningForm.allowTextEntry == 'true'}">
-							<div class="row g-0">
-								<div class="col input-group">
-									<label for="userEntry" class="input-group-text">
-										<fmt:message key="label.other" />:
-									</label>
-									<form:input cssClass="form-control" path="userEntry" size="30" maxlength="100" />
-								</div>
-							</div>
-						</c:if>
-					</div>
-			</fieldset>
-					</div>
+							</c:if>
+						</div>
+					</fieldset>
 				</div>
+			</div>
 			<!-- End options -->
 
 			<div class="activity-bottom-buttons">
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8b47c3282bdf668831f60df54fab447ce226d34f
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 8b47c3282bdf668831f60df54fab447ce226d34f)
@@ -92,7 +92,7 @@
 						</button>
 					</c:when>
 	
-					<c:when test="${!hasEditRight}">
+					<c:otherwise>
 						<button type="button" name="learnerFinished" id="finishButton" class="btn btn-primary na">
 							<c:choose>
 								<c:when test="${isLastActivity}">
@@ -103,7 +103,7 @@
 								</c:otherwise>
 							</c:choose>
 						</button>
-					</c:when>
+					</c:otherwise>
 				</c:choose>
 			</div>