Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision 332b3025e0d7e242e4d50f458f775db94bb29536)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision fd16ca6794849ec455a4ea55955abac6d2eb99e4)
@@ -419,4 +419,5 @@
 
 	void onActionFromAddAssessment(StudentSubmitSolution s) {
+		clearResultsAndErrors();
 		editedAssessment = new SolutionAssessment();
 		editedAssessment.setStudentSubmitSolution(s);
@@ -448,4 +449,5 @@
 
 	public void onActionFromCancelFormEditor() {
+		clearResultsAndErrors();
 		editedAssessment = null;
 		if (request.isXHR()) {
@@ -578,6 +580,6 @@
 
 	public boolean isAnyResults() {
-		return (resultsEvaluation1 != null && resultsEvaluation1.size() > 0)
-				|| (resultsEvaluation2 != null && resultsEvaluation2.size() > 0);
+		return (resultsEvaluation1 != null )
+				|| (resultsEvaluation2 != null );
 	}
 
Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css
===================================================================
--- dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css	(revision 332b3025e0d7e242e4d50f458f775db94bb29536)
+++ dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css	(revision fd16ca6794849ec455a4ea55955abac6d2eb99e4)
@@ -36,4 +36,11 @@
 	max-width: 60em;
 	max-height: 12em;
+	font-size: 75%;
+	line-height: 0.85em !important;
+}
+
+.submittedText {
+	max-width: 60em;
+	max-height: 18em;
 }
 
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 332b3025e0d7e242e4d50f458f775db94bb29536)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision fd16ca6794849ec455a4ea55955abac6d2eb99e4)
@@ -79,9 +79,8 @@
 							<div class="col-12">
 								<h3>${message:query-results-label}1</h3>
-								<div
-									class="alert resultspanel resultspanel-colors"
-									role="alert" t:type="if" t:test="resultsEvaluation1">
-									
-									<table 
+								<div class="alert resultspanel resultspanel-colors" role="alert"
+									t:type="if" t:test="resultsEvaluation1">
+
+									<table
 										class="tblCompareData table table-sm table-hover table-bordered table-striped">
 										<thead>
@@ -94,16 +93,16 @@
 											<tr t:type="loop" t:source="resultsEvaluation1"
 												t:value="oneRow">
-												<td class="p-1 m-0" t:type="loop" t:source="oneRow" t:value="oneColumn"><t:outputraw
-														t:value="oneColumn" /></td>
+												<td class="p-1 m-0" t:type="loop" t:source="oneRow"
+													t:value="oneColumn"><t:outputraw t:value="oneColumn" /></td>
 											</tr>
 										</tbody>
 									</table>
-									<p:else><p>/</p>
+									<p:else>
+										<p>/</p>
 									</p:else>
 								</div>
-									<h3>${message:query-results-label}2</h3>
-								<div
-									class="alert resultspanel resultspanel-colors"
-									role="alert" t:type="if" t:test="resultsEvaluation2">
+								<h3>${message:query-results-label}2</h3>
+								<div class="alert resultspanel resultspanel-colors" role="alert"
+									t:type="if" t:test="resultsEvaluation2">
 									<table
 										class="tblCompareData table table-sm table-hover table-bordered table-striped">
@@ -117,10 +116,11 @@
 											<tr t:type="loop" t:source="resultsEvaluation2"
 												t:value="oneRow">
-												<td class="p-1 m-0" t:type="loop" t:source="oneRow" t:value="oneColumn"><t:outputraw
-														t:value="oneColumn" /></td>
+												<td class="p-1 m-0" t:type="loop" t:source="oneRow"
+													t:value="oneColumn"><t:outputraw t:value="oneColumn" /></td>
 											</tr>
 										</tbody>
 									</table>
-									<p:else><p>/</p>
+									<p:else>
+										<p>/</p>
 									</p:else>
 								</div>
@@ -143,6 +143,7 @@
 							<t:outputraw t:value="translateTaskDescription"></t:outputraw>
 						</div>
-						<t:code id="solution" t:id="solution" t:value="formattedSolution"
-							t:additionalclass="literal:modalSubmission"></t:code>
+						<div class="pre-scrollable modalSubmission" style="min-height:30rem;"><pre><t:outputraw t:value="formattedSolution"></t:outputraw></pre></div>
+ 
+
 					</div>
 					<div class="form-group col-6 feedback">
@@ -158,6 +159,5 @@
 						<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"/>
+							t:value="editedAssessment.passed" class="form-control" />
 					</div>
 					<div class="form-group col-3">
@@ -275,6 +275,18 @@
 				class="table table-sm table-bordered">
 				<p:submissionCell>
-					<t:code t:additionalClass="literal:submittedCode"
-						t:value="submission.submission"></t:code>
+					<t:if t:test="SQL">
+						<t:code t:additionalClass="literal:submittedCode"
+							t:value="submission.submission"></t:code>
+					</t:if>
+					<t:if t:test="DDL">
+						<div class="pre-scrollable submittedCode">
+							<t:outputraw t:value="submission.submission"></t:outputraw>
+						</div>
+					</t:if>
+					<t:if t:test="TEXT">
+						<div class="pre-scrollable submittedText">
+							<t:outputraw t:value="submission.submission"></t:outputraw>
+						</div>
+					</t:if>
 				</p:submissionCell>
 				<p:clientInfoCell>