Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision 9d9cad302662383ef14103522cc2ce592c522527)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision d036ec27c2b5479b15b90c6491b296c1587cd432)
@@ -53,4 +53,5 @@
 import com.github.vertical_blank.sqlformatter.languages.Dialect;
 
+import dblearnstar.model.entities.Person;
 import dblearnstar.model.entities.SolutionAssessment;
 import dblearnstar.model.entities.Student;
@@ -156,4 +157,7 @@
 	@Persist
 	@Property
+	private Boolean hideNames;
+	@Persist
+	@Property
 	SolutionAssessment editedAssessment;
 	@Persist
@@ -201,4 +205,7 @@
 		if (hideClientInfo == null) {
 			hideClientInfo = true;
+		}
+		if (hideNames == null) {
+			hideNames = true;
 		}
 		if (filterStudent != null) {
@@ -310,5 +317,5 @@
 
 	public SelectModel getSelectStudentsModel() {
-		return new StudentSelectModel(getAllStudents());
+		return new StudentSelectModel(getAllStudents(), hideNames);
 	}
 
@@ -352,5 +359,9 @@
 
 	public String getSubmittedByNameWithId() {
-		return personManager.getPersonFullNameWithId(submission.getStudentStartedTest().getStudent().getPerson());
+		if (hideNames != null && hideNames) {
+			return "[" + submission.getStudentStartedTest().getStudent().getPerson().getUserName() + "]";
+		} else {
+			return personManager.getPersonFullNameWithId(submission.getStudentStartedTest().getStudent().getPerson());
+		}
 	}
 
@@ -540,5 +551,5 @@
 			return SqlFormatter.of(Dialect.PostgreSql)
 					.format(editedAssessment.getStudentSubmitSolution().getSubmission(), FormatConfig.builder()
-							.indent("  ").uppercase(true).linesBetweenQueries(2).maxColumnLength(100).build());
+							.indent("   ").uppercase(true).linesBetweenQueries(2).maxColumnLength(100).build());
 		} else {
 			return editedAssessment.getStudentSubmitSolution().getSubmission();
@@ -590,3 +601,13 @@
 		editedAssessment.setFeedback(getFormattedSolution());
 	}
+
+	public String getEditedAssessmentSubmitterName() {
+		Person p = editedAssessment.getStudentSubmitSolution().getStudentStartedTest().getStudent().getPerson();
+		String name = " [" + p.getUserName() + "]";
+		if (hideNames != null && hideNames) {
+		} else {
+			name = p.getLastName() + " " + p.getFirstName() + name;
+		}
+		return name;
+	}
 }
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 9d9cad302662383ef14103522cc2ce592c522527)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision d036ec27c2b5479b15b90c6491b296c1587cd432)
@@ -137,13 +137,15 @@
 						t:id="zSolution" id="zSolution">
 						<label for="solution">${message:submittedBy-label}:
-							${editedAssessment.studentSubmitSolution?.studentStartedTest.student.person.userName}
-							${editedAssessment.studentSubmitSolution?.studentStartedTest.student.person.lastName}
-							${editedAssessment.studentSubmitSolution?.studentStartedTest.student.person.firstName}</label>
-							<a href="" t:type="eventlink" t:id="copySolutionToFeedback" class="float-right btn btn-sm btn-danger p-0 pl-1 pr-1">↦</a>
+							${editedAssessmentSubmitterName}</label>
+						<a href="" t:type="eventlink" t:id="copySolutionToFeedback"
+							class="float-right btn btn-sm btn-danger p-0 pl-1 pr-1">↦</a>
 						<div class="card-body collapse" id="collapsedDescription">
 							<t:outputraw t:value="translateTaskDescription"></t:outputraw>
 						</div>
-						<div class="pre-scrollable modalSubmission" style="min-height:30rem;"><pre><t:outputraw t:value="formattedSolution"></t:outputraw></pre></div>
- 
+						<div class="pre-scrollable modalSubmission">
+							<pre><t:outputraw t:value="formattedSolution"></t:outputraw>
+							</pre>
+						</div>
+
 
 					</div>
@@ -156,26 +158,27 @@
 				</div>
 				<t:errors />
-				<div class="form-row   align-items-center">
-					<div class="form-group col-3">
-						<label t:type="label" t:for="passed" class="form-check-label">Passed</label>
-						<input t:type="checkbox" t:id="passed"
-							t:value="editedAssessment.passed" class="form-control" />
-					</div>
-					<div class="form-group col-3">
+				<div class="form-row form-inline">
+					<div class="form-group mr-2">
 						<label t:type="label" t:for="type"></label> <input
 							t:type="textfield" t:id="type" t:value="editedAssessment.type"
-							class="form-control"></input>
-					</div>
-					<div class="form-group col-3">
+							class="form-control ml-1"></input>
+					</div>
+					<div class="form-group mr-2">
 						<label t:type="label" t:for="grade"></label> <input
-							t:type="textfield"
-							data-translation-message="You must provide a numeric value for the Grade."
-							data-translation="numeric" data-validation="true" t:id="grade"
-							t:value="editedAssessment.grade" class="form-control numeric"></input>
-					</div>
-					<div class="col-auto">
+							t:type="textfield" t:id="grade" t:value="editedAssessment.grade"
+							class="form-control ml-1"></input>
+					</div>
+					<div class="form-group mr-2">
+						<div class="form-check">
+							<label t:type="label" t:for="passed" class="form-check-label"></label>
+							<input t:type="checkbox" t:id="passed"
+								t:value="editedAssessment.passed" class="form-check-input ml-3"></input>
+						</div>
+					</div>
+					<div class="form-group col-2 ml-3">
 						<button type="submit" class="btn btn-primary" value="OK">OK</button>
 						<a type="button" role="button" href="" t:type="actionlink"
-							t:id="cancelFormEditor" class="btn btn-secondary">Cancel </a>
+							t:id="cancelFormEditor" class="btn btn-secondary ml-1">Cancel
+						</a>
 					</div>
 				</div>
@@ -230,30 +233,35 @@
 					<t:checkbox t:id="onlyCorrect" onclick="this.form.submit();"
 						class="form-check-input" />
-					<label t:type="label" for="onlyCorrect" class="form-check-label"></label><br />
+					<label t:type="label" for="onlyCorrect" class="form-check-label"></label>
 				</div>
 				<div class="form-group mr-3 ml-3">
 					<t:checkbox t:id="onlyLast" onclick="this.form.submit();"
 						class="form-check-input" />
-					<label t:type="label" for="onlyLast" class="form-check-label"></label><br />
+					<label t:type="label" for="onlyLast" class="form-check-label"></label>
 				</div>
 				<div class="form-group mr-3 ml-3">
 					<t:checkbox t:id="onlyAssessed" onclick="this.form.submit();"
 						class="form-check-input" />
-					<label t:type="label" for="onlyAssessed" class="form-check-label"></label><br />
+					<label t:type="label" for="onlyAssessed" class="form-check-label"></label>
 				</div>
 				<div class="form-group mr-3 ml-3">
 					<t:checkbox t:id="onlyUnAssessed" onclick="this.form.submit();"
 						class="form-check-input" />
-					<label t:type="label" for="onlyUnAssessed" class="form-check-label"></label><br />
+					<label t:type="label" for="onlyUnAssessed" class="form-check-label"></label>
 				</div>
 				<div class="form-group mr-3 ml-3">
 					<t:checkbox t:id="onlyDateOfExam" onclick="this.form.submit();"
 						class="form-check-input" />
-					<label t:type="label" for="onlyDateOfExam" class="form-check-label"></label><br />
+					<label t:type="label" for="onlyDateOfExam" class="form-check-label"></label>
 				</div>
 				<div class="form-group mr-3 ml-4">
 					<t:checkbox t:id="hideClientInfo" onclick="this.form.submit();"
 						class="form-check-input" />
-					<label t:type="label" for="hideClientInfo" class="form-check-label"></label><br />
+					<label t:type="label" for="hideClientInfo" class="form-check-label"></label>
+				</div>
+				<div class="form-group mr-3 ml-4">
+					<t:checkbox t:id="hideNames" onclick="this.form.submit();"
+						class="form-check-input" />
+					<label t:type="label" for="hideNames" class="form-check-label"></label>
 				</div>
 			</div>
@@ -275,4 +283,10 @@
 				t:rowsperpage="50" t:rowClass="${evaluationClass}"
 				class="table table-sm table-bordered">
+				<p:submittedByCell>
+					${submittedByNameWithId}<br />
+					<a href="" t:type="actionlink" t:id="ShowUserActivities"
+						t:context="submission" t:zone="zSelectStudents" role="button"
+						class="btn btn-sm btn-secondary">In Focus</a>
+				</p:submittedByCell>
 				<p:submissionCell>
 					<t:if t:test="SQL">
@@ -294,10 +308,4 @@
 					<t:code t:value="submission.clientInfo"></t:code>
 				</p:clientInfoCell>
-				<p:submittedByCell>
-				${submittedByNameWithId}<br />
-					<a href="" t:type="actionlink" t:id="ShowUserActivities"
-						t:context="submission" t:zone="zSelectStudents" role="button"
-						class="btn btn-sm btn-secondary">In Focus</a>
-				</p:submittedByCell>
 				<p:notForEvaluationCell>
 					<t:booleanindicator t:value="submission?.notForEvaluation"