Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css
===================================================================
--- dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css	(revision 6f7196682564b7aa4b11e7226b1b57eb3ea849cb)
+++ dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css	(revision ee25809e5a6fb4a0fb719e5f304f7ce1b5b4e34b)
@@ -12,89 +12,10 @@
 
 th {
+/*
 	font-size: 65% !important;
 	overflow: scroll;
+*/
 }
 
-td {
-	font-size: 70% !important;
-	overflow: auto;
-}
-
-td[data-grid-property="submittedOn"] {
-	/* 	width: 10em !important; */
-	
-}
-
-td[data-grid-property="evaluationExam"] {
-	width: 4em !important;
-	max-width: 5em !important;
-	word-break: break-all;
-}
-
-td[data-grid-property="evaluationSimple"] {
-	width: 4em !important;
-	max-width: 5em !important;
-	word-break: break-all;
-}
-
-td[data-grid-property="evaluationComplex"] {
-	width: 4em !important;
-	max-width: 5em !important;
-	word-break: break-all;
-}
-
-td[data-grid-property="notForEvaluation"] {
-	width: 4em !important;
-	max-width: 5em !important;
-	word-break: break-all;
-}
-
-td[data-grid-property="submittedBy"] {
-	width: 9em !important;
-}
-
-td[data-grid-property="task"] {
-	max-width: 10em;
-}
-
-td[data-grid-property="submission"] {
-	
-}
-
-td[data-grid-property="submission"] .code {
-	font-size: 75% !important;
-	line-height: 0.8em !important;
-	height: 19em !important;
-	width: 99% !important;
-	white-space: pre-wrap;
-}
-
-td[data-grid-property="submission"] .code img {
-	max-width: 80% !important;
-}
-
-td[data-grid-property="assessment"] {
-	max-width: 23em !important;
-	min-width: 15em !important;
-}
-
-td[data-grid-property="assessment"] pre {
-	font-size: 75% !important;
-	line-height: 0.8em !important;
-	max-height: 12em !important;
-	white-space: pre-wrap;
-}
-
-td a.btn {
-	font-size: 65%;
-}
-
-td[data-grid-property="clientInfo"] {
-	max-width: 10%;
-}
-
-td[data-grid-property="ipAddress"] {
-	max-width: 10%;
-}
 
 code p {
@@ -104,6 +25,7 @@
 }
 
-.modalSubmission {
-	min-height: 23em;
+.submittedCode {
+	max-width: 60em;
+	max-height: 12em;
 }
 
@@ -112,6 +34,8 @@
 }
 
-#solution {
-	min-height:30em !important;
+.modalSubmission {
+	max-height: 10em !important;
+	background: #e0e0e0 !important;
+	padding: 0.5em !important;
 }
 
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 6f7196682564b7aa4b11e7226b1b57eb3ea849cb)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision ee25809e5a6fb4a0fb719e5f304f7ce1b5b4e34b)
@@ -20,7 +20,5 @@
 					</h3>
 				</div>
-				<div class="card-body collapse" id="collapsedDescription">
-					<t:outputraw t:value="translateTaskDescription"></t:outputraw>
-				</div>
+
 			</div>
 
@@ -133,7 +131,13 @@
 					<div class="form-group col-6  ${classSQLsolution}" t:type="zone"
 						t:id="zSolution" id="zSolution">
-						<label for="solution">${message:solution-label}</label>
+						<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>
+						<div class="card-body collapse" id="collapsedDescription">
+							<t:outputraw t:value="translateTaskDescription"></t:outputraw>
+						</div>
 						<t:code id="solution" t:id="solution" t:value="formattedSolution"
-							class="modalSubmission form-control col-12"></t:code>
+							t:additionalclass="literal:modalSubmission"></t:code>
 					</div>
 					<div class="form-group col-6 feedback">
@@ -147,8 +151,8 @@
 				<div class="form-row   align-items-center">
 					<div class="form-group col-3">
-						<label t:type="label" t:for="passed">Passed <input
-							t:type="checkbox" t:id="passed" t:value="editedAssessment.passed"
-							class="form-control"></input>
-						</label>
+						<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">
@@ -267,5 +271,6 @@
 				class="table table-sm table-hover table-bordered table-striped">
 				<p:submissionCell>
-					<t:code t:value="submission.submission"></t:code>
+					<t:code t:additionalClass="literal:submittedCode"
+						t:value="submission.submission"></t:code>
 				</p:submissionCell>
 				<p:clientInfoCell>