Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css
===================================================================
--- dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css	(revision 119b2767591d24aef19f9b6507480c6d87c3f3fe)
+++ dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
@@ -80,4 +80,8 @@
 }
 
+table.tblCompareData tbody {
+	background: var(  --main-bg-color);
+}
+
 table tbody tr.correct {
 	background: var(--color-correct) !important;
Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css
===================================================================
--- dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css	(revision 119b2767591d24aef19f9b6507480c6d87c3f3fe)
+++ dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
@@ -13,9 +13,11 @@
   --main-bg-color: #260661ff;
   --main-bg-color2: #260661ff;
-  --main-bg-color-box: #330B7Dff;
+  --main-bg-color3: #42119cff;
+  --main-bg-color-box: #42119cff;
   --main-bg-color-accent: #330B7Dff;
   --main-bg-color-accent2: #00000080;
   --main-font-color: white;
   --main-font-color-hover: #E9FA5A;
+  --main-link-color: #A074F0;
   --yt-font-color: #8E6600;
   --sidebar-bg-color: #260661ff;
@@ -159,13 +161,18 @@
   
   .card {
-    background-color: #7C8B00 !important;
+    background-color: var(--main-bg-color) !important;
+    border-color: var(--main-bg-color3) !important;
   }
   
   .card-header {
-    background-color: #A1B400 !important;
-  }
-  
+    background-color: var(--main-bg-color-accent) !important;
+  }
+
+  .card-header h3 {
+    color: var(--main-font-color) !important;
+  }
+    
   .bg-light {
-    background-color: #7C8B00 !important;
+    background-color:var(--main-bg-color3) !important;
   }
   
@@ -180,5 +187,9 @@
   
   .dropdown-menu {
-    background-color: #a0a0a0ff;
+    background-color: var(--main-bg-color2);
+  }
+  
+  .dropdown-menu a {
+    color: var(--main-link-color) !important;
   }
   
@@ -193,6 +204,11 @@
   
   .cke_wysiwyg_frame {
-  	background-color: #7C8B00 !important;
-  }
-  
-}
+  	background-color: #6060ff !important;
+  }
+
+	p.comment {
+		background: #7C8B00;
+	}
+
+  
+}
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml	(revision 119b2767591d24aef19f9b6507480c6d87c3f3fe)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
@@ -105,5 +105,5 @@
 									t:value="runningAssessmentDiscussion">
 									<div class=" ${indentation}">
-										<a role="button" class="btn btn-sm"
+										<a role="button" class="btn btn-sm btn-link"
 											href="#disc${runningAssessmentDiscussion.assessmentDiscussionId}">
 											<svg t:type="svgicon" t:path="file" />
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/QueryTest.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/QueryTest.tml	(revision 119b2767591d24aef19f9b6507480c6d87c3f3fe)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/QueryTest.tml	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
@@ -189,5 +189,5 @@
 			</ul>
 			<div class="mt-0">
-				<table t:type="grid" t:source="historyOfSolutions"
+				<table t:type="grid" t:source="historyOfSolutions" class="table table-sm table-bordered table-hover"
 					t:row="historicalSolution" t:rowsPerPage="10"
 					t:include="submittedOn,submission,evaluationSimple,evaluationComplex"
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 119b2767591d24aef19f9b6507480c6d87c3f3fe)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
@@ -78,10 +78,11 @@
 						<div class="row" t:type="if" t:test="anyResults">
 							<div class="col-12">
+								<h3>${message:query-results-label}1</h3>
 								<div
-									class="alert alert-success resultspanel resultspanel-colors"
+									class="alert 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">
+									
+									<table 
+										class="tblCompareData table table-sm table-hover table-bordered table-striped">
 										<thead>
 											<tr>
@@ -93,16 +94,18 @@
 											<tr t:type="loop" t:source="resultsEvaluation1"
 												t:value="oneRow">
-												<td t:type="loop" t:source="oneRow" t:value="oneColumn"><t:outputraw
+												<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>
 								</div>
+									<h3>${message:query-results-label}2</h3>
 								<div
-									class="alert alert-success resultspanel resultspanel-colors"
+									class="alert 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">
+										class="tblCompareData table table-sm table-hover table-bordered table-striped">
 										<thead>
 											<tr>
@@ -114,9 +117,11 @@
 											<tr t:type="loop" t:source="resultsEvaluation2"
 												t:value="oneRow">
-												<td t:type="loop" t:source="oneRow" t:value="oneColumn"><t:outputraw
+												<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>
 								</div>
 							</div>
@@ -268,5 +273,5 @@
 				t:source="allSubmissions" t:row="submission" t:model="modelSSS"
 				t:rowsperpage="50" t:rowClass="${evaluationClass}"
-				class="table table-sm table-hover table-bordered table-striped">
+				class="table table-sm table-bordered">
 				<p:submissionCell>
 					<t:code t:additionalClass="literal:submittedCode"