Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision bced7fd8adcbc75503705e1a66e0803f217405c7)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision 44c6743da17664c2b4253521226d66273d9cae16)
@@ -21,4 +21,5 @@
 package dblearnstar.webapp.pages.admin;
 
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -292,5 +293,6 @@
 		Comparator<TestInstance> comparator = (ti1,
 				ti2) -> (ti1 != null && ti2 != null && ti1.getScheduledFor() != null && ti2.getScheduledFor() != null
-						? ti1.getScheduledFor().compareTo(ti2.getScheduledFor())
+						? ti1.getScheduledFor().toInstant().truncatedTo(ChronoUnit.DAYS)
+								.compareTo(ti2.getScheduledFor().toInstant().truncatedTo(ChronoUnit.DAYS))
 						: 0);
 		Comparator<TestInstance> reverser = comparator.reversed();
@@ -345,6 +347,13 @@
 	}
 
+	private void clearResultsAndErrors() {
+		resultsEvaluation1 = null;
+		resultsEvaluation2 = null;
+		resultsErrors1 = null;
+		resultsErrors2 = null;
+	}
+
 	@CommitAfter
-	public void onActionFromReevaluateSubmission(StudentSubmitSolution s) {
+	public void onReevaluateSubmission(StudentSubmitSolution s) {
 		evaluationService.processSolution(userInfo.getUserName(), s);
 		if (request.isXHR()) {
@@ -354,8 +363,9 @@
 
 	@CommitAfter
-	public void onActionFromReevaluateEditedSubmission(StudentSubmitSolution s) {
+	public void onReevaluateEditedSubmission(StudentSubmitSolution s) {
+		clearResultsAndErrors();
 		evaluationService.processSolution(userInfo.getUserName(), s);
 		if (request.isXHR()) {
-			ajaxResponseRenderer.addRender(zModal);
+			ajaxResponseRenderer.addRender(zSQLEval);
 		}
 	}
@@ -465,7 +475,7 @@
 	}
 
-	void onActionFromViewEvaluationResults(StudentSubmitSolution s) {
-		if (resultsEvaluation1 != null) {
-			resultsEvaluation1 = null;
+	void onViewEvaluationResults(StudentSubmitSolution s) {
+		if (resultsEvaluation1 != null || resultsEvaluation2 != null) {
+			clearResultsAndErrors();
 		} else {
 			TaskInTestInstance tti = s.getTaskInTestInstance();
@@ -554,3 +564,17 @@
 	}
 
+	public boolean isAnyErrors() {
+		return (resultsErrors1 != null && resultsErrors1.size() > 0)
+				|| (resultsErrors2 != null && resultsErrors2.size() > 0);
+	}
+
+	public boolean isAnyResults() {
+		return (resultsEvaluation1 != null && resultsEvaluation1.size() > 0)
+				|| (resultsEvaluation2 != null && resultsEvaluation2.size() > 0);
+	}
+
+	public boolean isAnyStatus() {
+		return isAnyErrors() || isAnyResults();
+	}
+
 }
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java	(revision bced7fd8adcbc75503705e1a66e0803f217405c7)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java	(revision 44c6743da17664c2b4253521226d66273d9cae16)
@@ -98,6 +98,8 @@
 					queryStringManip = queryStringManip.replace("current_date", schema + ".now()");
 
-					String evalQueryString = "((" + queryStringManip + ") except (select * from " + evalViewName
-							+ ")) union ((select * from " + evalViewName + ") except (" + queryStringManip + "))";
+					String evalQueryString = "select *, 'EDEN' from ( ( " + queryStringManip
+							+ " ) except ( select * from " + evalViewName
+							+ " ) ) eden union select *, 'DVA' from ( ( select * from " + evalViewName + " ) except ( "
+							+ queryStringManip + " ) ) dva ";
 
 					logger.debug("user {} issued evalQueryString: {}", userName, evalQueryString);
@@ -478,6 +480,10 @@
 					queryStringManip = queryStringManip.replace("current_date", schema + ".now()");
 
-					String evalQueryString = "((" + queryStringManip + ") except (select * from " + evalViewName
-							+ ")) union ((select * from " + evalViewName + ") except (" + queryStringManip + "))";
+//					String evalQueryString = "((" + queryStringManip + ") except (select * from " + evalViewName
+//							+ ")) union ((select * from " + evalViewName + ") except (" + queryStringManip + "))";
+
+					String evalQueryString = "select '<span class=\"inSubmission\">In Submission</span>' as WHERE, *   from ( ( " + queryStringManip + " ) except ( select * from " + evalViewName
+							+ " ) ) eden union select '<span class=\"inCorrectSolution\">In Correct Solution</span>' as WHERE, *  from ( ( select * from " + evalViewName + " ) except ( " + queryStringManip
+							+ " ) ) dva order by 1,2";
 
 					logger.debug("user {} issued evalQueryString: {}", userName, evalQueryString);
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision bced7fd8adcbc75503705e1a66e0803f217405c7)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 44c6743da17664c2b4253521226d66273d9cae16)
@@ -27,97 +27,106 @@
 
 			<div class="card mt-2" t:type="if" t:test="editedAssessmentTaskSQL">
-				<div class="card-header">
-					<div class="row m-0 p-0 ">
-						<div class="col-3">
-							<a role="button" href="#" t:type="eventlink"
-								t:id="prettyFormatToggle"
-								class="btn btn-sm btn-primary ${classPrettyFormat}"
-								t:zone="zSolution">Format SQL <t:SVGIcon t:path="align-left" />
-							</a>
+				<div t:id="zSQLEval" t:type="zone">
+					<div class="card-header">
+						<div class="row m-0 p-0 ">
+							<div class="col-3">
+								<a role="button" href="#" t:type="eventlink"
+									t:id="prettyFormatToggle"
+									class="btn btn-sm btn-primary ${classPrettyFormat}"
+									t:zone="zSolution">Format SQL <t:SVGIcon
+										t:path="align-left" />
+								</a>
+							</div>
+							<div class="col-9 text-right">
+								${message:evaluationSimple-label}:
+								<t:booleanindicator
+									t:value="editedAssessment.studentSubmitSolution.evaluationSimple"
+									showCheckMark="true" showNo="true" />
+								${message:evaluationComplex-label}:
+								<t:booleanindicator
+									t:value="editedAssessment.studentSubmitSolution.evaluationComplex"
+									showCheckMark="true" showNo="true" />
+								${message:evaluationExam-label}:
+								<t:booleanindicator
+									t:value="editedAssessment.studentSubmitSolution.evaluationExam"
+									showCheckMark="true" showNo="true" />
+								<a href="" t:type="eventlink" t:id="reevaluateEditedSubmission"
+									t:context="editedAssessment.studentSubmitSolution"
+									t:zone="zModal" class="btn btn-sm btn-warning">${message:reevaluate-label}
+									<t:SVGIcon t:path="repeat" />
+								</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:SVGIcon t:path="eye" />
+								</a>
+							</div>
 						</div>
-						<div class="col-9 text-right">
-							${message:evaluationSimple-label}:
-							<t:booleanindicator
-								t:value="editedAssessment.studentSubmitSolution.evaluationSimple"
-								showCheckMark="true" showNo="true" />
-							${message:evaluationComplex-label}:
-							<t:booleanindicator
-								t:value="editedAssessment.studentSubmitSolution.evaluationComplex"
-								showCheckMark="true" showNo="true" />
-							${message:evaluationExam-label}:
-							<t:booleanindicator
-								t:value="editedAssessment.studentSubmitSolution.evaluationExam"
-								showCheckMark="true" showNo="true" />
-							<a href="" t:type="actionlink" t:id="reevaluateEditedSubmission"
-								t:context="editedAssessment.studentSubmitSolution"
-								t:zone="zModal" class="btn btn-sm btn-warning">${message:reevaluate-label}
-								<t:SVGIcon t:path="repeat" />
-							</a> <a href="" class="btn btn-sm btn-info" t:type="actionlink"
-								t:id="viewEvaluationResults" t:zone="zSQLEval"
-								t:context="editedAssessment.studentSubmitSolution">${message:sqlEvaluation-label}
-								<t:SVGIcon t:path="eye" />
-							</a>
+					</div>
+					<div class="card-body" t:type="if" t:test="anyStatus">
+						<div class="row">
+							<div class="col-6 bg-danger" t:type="if" t:test="resultsErrors1">
+								<ul>
+									<li t:type="loop" t:source="resultsErrors1"
+										t:value="resultsError">${resultsError}</li>
+								</ul>
+							</div>
+							<div class="col-6 bg-danger" t:type="if" t:test="resultsErrors2">
+								<ul>
+									<li t:type="loop" t:source="resultsErrors2"
+										t:value="resultsError">${resultsError}</li>
+								</ul>
+							</div>
 						</div>
-					</div>
-				</div>
-				<div class="card-body" t:id="zSQLEval" t:type="zone">
-					<div class="row">
-						<div class="col-6 bg-danger" t:type="if" t:test="resultsErrors1">
-							<ul>
-								<li t:type="loop" t:source="resultsErrors1"
-									t:value="resultsError">${resultsError}</li>
-							</ul>
+						<div class="row" t:type="if" t:test="anyResults">
+							<div class="col-12">
+								<div
+									class="alert alert-success resultspanel resultspanel-colors"
+									role="alert" t:type="if" t:test="resultsEvaluation1">
+									<h3>${message:query-results-label}1</h3>
+									<table
+										class="table table-sm table-hover table-bordered table-striped">
+										<thead>
+											<tr>
+												<th t:type="loop" t:source="resultsHeaders1"
+													t:value="oneHeader">${oneHeader}</th>
+											</tr>
+										</thead>
+										<tbody>
+											<tr t:type="loop" t:source="resultsEvaluation1"
+												t:value="oneRow">
+												<td t:type="loop" t:source="oneRow" t:value="oneColumn"><t:outputraw
+														t:value="oneColumn" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<div
+									class="alert alert-success resultspanel resultspanel-colors"
+									role="alert" t:type="if" t:test="resultsEvaluation2">
+									<h3>${message:query-results-label}2</h3>
+									<table
+										class="table table-sm table-hover table-bordered table-striped">
+										<thead>
+											<tr>
+												<th t:type="loop" t:source="resultsHeaders2"
+													t:value="oneHeader">${oneHeader}</th>
+											</tr>
+										</thead>
+										<tbody>
+											<tr t:type="loop" t:source="resultsEvaluation2"
+												t:value="oneRow">
+												<td t:type="loop" t:source="oneRow" t:value="oneColumn"><t:outputraw
+														t:value="oneColumn" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+							</div>
 						</div>
-						<div class="col-6 bg-danger" t:type="if" t:test="resultsErrors2">
-							<ul>
-								<li t:type="loop" t:source="resultsErrors2"
-									t:value="resultsError">${resultsError}</li>
-							</ul>
-						</div>
-					</div>
-					<div class="row" t:type="if" t:test="resultsEvaluation1">
-						<div class="col-sm-12">
-							<div class="alert alert-success resultspanel resultspanel-colors"
-								role="alert" t:type="if" t:test="resultsEvaluation1">
-								<h3>${message:query-results-label}</h3>
-								<table class="table table-hover table-bordered table-striped">
-									<thead>
-										<tr>
-											<th t:type="loop" t:source="resultsHeaders1"
-												t:value="oneHeader">${oneHeader}</th>
-										</tr>
-									</thead>
-									<tbody>
-										<tr t:type="loop" t:source="resultsEvaluation1"
-											t:value="oneRow">
-											<td t:type="loop" t:source="oneRow" t:value="oneColumn">${oneColumn}</td>
-										</tr>
-									</tbody>
-								</table>
-							</div>
-							<div class="alert alert-success resultspanel resultspanel-colors"
-								role="alert" t:type="if" t:test="resultsEvaluation2">
-								<h3>${message:query-results-label}</h3>
-								<table class="table table-hover table-bordered table-striped">
-									<thead>
-										<tr>
-											<th t:type="loop" t:source="resultsHeaders2"
-												t:value="oneHeader">${oneHeader}</th>
-										</tr>
-									</thead>
-									<tbody>
-										<tr t:type="loop" t:source="resultsEvaluation2"
-											t:value="oneRow">
-											<td t:type="loop" t:source="oneRow" t:value="oneColumn">${oneColumn}</td>
-										</tr>
-									</tbody>
-								</table>
-							</div>
-						</div>
 					</div>
 				</div>
 			</div>
 
-			<form t:type="form" class="form-vertical" t:id="FormEditor"
+			<form t:type="form" class="form-vertical mt-1" t:id="FormEditor"
 				id="FormEditor" t:autofocus="true">
 				<div class="form-row">
@@ -130,5 +139,5 @@
 					<div class="form-group col-6 feedback">
 						<label t:type="label" t:for="feedback"></label>
-						<textarea t:type="textarea" t:id="feedback"
+						<textarea t:type="textarea" id="feedback" t:id="feedback"
 							t:value="editedAssessment.feedback" t:mixins="WebEditor"
 							t:WebEditor.areaType="CKADMIN" />
@@ -291,5 +300,5 @@
 				<p:assessmentCell>
 					<div t:type="if" t:test="SQL">
-						<a href="" t:type="actionlink" t:id="reevaluateSubmission"
+						<a href="" t:type="eventlink" t:id="reevaluateSubmission"
 							t:context="submission" t:zone="zSubmissions"
 							class="btn btn-sm btn-warning"><img t:type="svgicon"