Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision 32ca832c8b0996359c4bc83e6c13a054fe8c7f7f)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision 0652bd8b28f20844beb2dc409d96e192ea271c12)
@@ -224,4 +224,10 @@
 	}
 
+	public void onActivate(SolutionAssessment sa) {
+		logger.warn("Activated with sa={} from {} by {} {}", sa, request.getRemoteHost(), userInfo.getUserName(),
+				request.getHeader("User-Agent"));
+		editedAssessment = genericService.getByPK(SolutionAssessment.class, sa.getSolutionAssessmentId());
+	}
+
 	public List<StudentSubmitSolution> getAllSubmissions() {
 		List<StudentSubmitSolution> lista = null;
@@ -375,5 +381,5 @@
 	@CommitAfter
 	public void onReevaluateSubmission(StudentSubmitSolution s) {
-		evaluationService.processSolution(userInfo.getUserName(), s);
+		evaluationService.reEvalSolution(userInfo.getUserName(), s);
 		if (request.isXHR()) {
 			ajaxResponseRenderer.addRender(zSubmissions);
@@ -384,5 +390,5 @@
 	public void onReevaluateEditedSubmission(StudentSubmitSolution s) {
 		clearResultsAndErrors();
-		evaluationService.processSolution(userInfo.getUserName(), s);
+		evaluationService.reEvalSolution(userInfo.getUserName(), s);
 		if (request.isXHR()) {
 			ajaxResponseRenderer.addRender(zSQLEval);
@@ -585,4 +591,26 @@
 	}
 
+	@CommitAfter
+	void onAssessEditedAsCorrectSubmission() {
+		editedAssessment.setFeedback(messages.get("assessmentComment-correct"));
+		editedAssessment.setEvaluatedOn(new Date());
+		editedAssessment.setGrade(editedAssessment.getStudentSubmitSolution().getTaskInTestInstance().getPoints());
+		editedAssessment.setPassed(true);
+		if (request.isXHR()) {
+			ajaxResponseRenderer.addRender(zModal);
+		}
+	}
+
+	@CommitAfter
+	void onAssessEditedAsIncorrectSubmission() {
+		editedAssessment.setFeedback(messages.get("assessmentComment-incorrect"));
+		editedAssessment.setEvaluatedOn(new Date());
+		editedAssessment.setGrade(0.0F);
+		editedAssessment.setPassed(false);
+		if (request.isXHR()) {
+			ajaxResponseRenderer.addRender(zModal);
+		}
+	}
+
 	public boolean isAnyErrors() {
 		return (resultsErrors1 != null && resultsErrors1.size() > 0)
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 32ca832c8b0996359c4bc83e6c13a054fe8c7f7f)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 0652bd8b28f20844beb2dc409d96e192ea271c12)
@@ -28,5 +28,5 @@
 					<div class="card-header">
 						<div class="row m-0 p-0 ">
-							<div class="col-3">
+							<div class="col-2">
 								<a role="button" href="#" t:type="eventlink"
 									t:id="prettyFormatToggle"
@@ -36,5 +36,5 @@
 								</a>
 							</div>
-							<div class="col-9 text-right">
+							<div class="col-10 text-right">
 								${message:evaluationSimple-label}:
 								<t:booleanindicator
@@ -55,7 +55,15 @@
 								</a> <a href="" class="btn btn-sm btn-info" t:type="eventlink"
 									t:id="viewEvaluationResults" t:zone="zSQLEval"
-									t:context="editedAssessment.studentSubmitSolution">${message:sqlEvaluation-label}
+									t:context="editedAssessment.studentSubmitSolution">${message:viewEvalResults-label}
 									<t:SVGIcon t:path="eye" />
-								</a>
+								</a> <a href="" t:type="eventlink"
+									t:id="assessEditedAsCorrectSubmission" t:async="true"
+									t:zone="zModal" class="btn btn-sm btn-success correct"><img
+									t:type="svgicon" t:path="check" />${message:assessmentComment-correct}</a>
+								<a href="" t:type="eventlink"
+									t:id="assessEditedAsIncorrectSubmission" t:async="true"
+									t:zone="zModal" class="btn btn-sm btn-warning incorrect"><img
+									t:type="svgicon" t:path="x" />${message:assessmentComment-incorrect}</a>
+
 							</div>
 						</div>