Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Code.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Code.java	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Code.java	(revision fa404a571be9a5b680488e86d220dea7c822c160)
@@ -21,4 +21,5 @@
 package dblearnstar.webapp.components;
 
+import org.apache.commons.text.StringEscapeUtils;
 import org.apache.tapestry5.ComponentResources;
 import org.apache.tapestry5.annotations.Parameter;
@@ -42,4 +43,8 @@
 	}
 
+	public String getEscapedValue() {
+		return StringEscapeUtils.escapeHtml4(value);
+	}
+	
 	public Boolean getNullValue() {
 		if (value == null) {
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/SolutionComparatorPage.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/SolutionComparatorPage.java	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/SolutionComparatorPage.java	(revision fa404a571be9a5b680488e86d220dea7c822c160)
@@ -95,5 +95,5 @@
 	private TaskInTestInstance taskInTestInstance;
 	@Property
-	private float totalPoints;
+	private Float totalPoints;
 	@Property
 	Map<TaskInTestInstance, List<SolutionAssessment>> mapTTItoSA;
@@ -115,5 +115,5 @@
 
 	public void prepareMapOfEvaluationsAndTotal() {
-		totalPoints = 0;
+		totalPoints = testManager.getTotalPoints(studentId, selectedTestInstance.getTestInstanceId());
 		mapTTItoSA = new HashMap<TaskInTestInstance, List<SolutionAssessment>>();
 		for (TaskInTestInstance tti : taskInTestInstances) {
@@ -130,5 +130,5 @@
 	public Boolean getHasManySolutions() {
 		List<SolutionAssessment> list = mapTTItoSA.get(taskInTestInstance);
-		if (list != null && list.size() > 0) {
+		if (list != null && list.size() > 1) {
 			return true;
 		} else {
@@ -178,5 +178,5 @@
 			return sss.getTaskInTestInstance().getStudentSubmitSolutions().stream()
 					.filter(p -> (p.getEvaluations() != null && p.getEvaluations().size() > 0
-							&& p.getEvaluations().get(0).getPassed()!=null && p.getEvaluations().get(0).getPassed()
+							&& p.getEvaluations().get(0).getPassed() != null && p.getEvaluations().get(0).getPassed()
 							&& p.getStudentSubmitSolutionId() != sss.getStudentSubmitSolutionId()))
 					.collect(Collectors.toList());
@@ -282,4 +282,14 @@
 
 	}
+	
+	public String getSolutionCorrectnessClass() {
+		if (oneOfTheEvaluatedSolutions.getPassed()) {
+			return " solutionCorrect ";
+		}
+		if (!oneOfTheEvaluatedSolutions.getPassed()) {
+			return " solutionInCorrect ";
+		}
+		return " ";
+	}
 
 }
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java	(revision fa404a571be9a5b680488e86d220dea7c822c160)
@@ -425,5 +425,5 @@
 		try {
 			Query q = getEntityManager().createQuery("""
-					select max(sa.grade)
+					select max(sa.grade) as maksot
 					from SolutionAssessment sa
 					join sa.studentSubmitSolution sss
@@ -435,5 +435,5 @@
 			q.setParameter("studentId", studentId);
 			q.setParameter("testInstanceId", testInstanceId);
-			float total = (float) 0;
+			Float total = (float) 0;
 			for (Float sa : UsefulMethods.castList(Float.class, q.getResultList())) {
 				if (sa != null) {
Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css
===================================================================
--- dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
+++ dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css	(revision fa404a571be9a5b680488e86d220dea7c822c160)
@@ -30,4 +30,6 @@
   --bs-light-rgb: rgba(42,42,42,0.5);
   --bs-bg-opacity: rgba(42,42,42,0.5);
+  --color-incorrect: #7b000c; 	/* https://www.w3schools.com/colors/colors_british.asp - Carnival red */
+  --color-correct: #277c2c; /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ 
   }
 }
@@ -146,4 +148,12 @@
 }
 
+.solutionCorrect {
+	background-color: var(--color-correct) !important;	
+}
+
+.solutionInCorrect {
+	background-color: var(--color-incorrect) !important;	
+}
+
 @media (prefers-color-scheme: dark) {
   a {
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml	(revision fa404a571be9a5b680488e86d220dea7c822c160)
@@ -4,5 +4,5 @@
 	<t:if t:test="!nullValue">
 		<t:if t:test="value">
-			<pre id="${id}" class="pre-scrollable code ${allClasses}"><code><t:outputraw t:value="value"></t:outputraw></code></pre>
+			<pre id="${id}" class="pre-scrollable code ${allClasses}"><code><t:outputraw t:value="escapedValue"></t:outputraw></code></pre>
 		</t:if>
 	</t:if>
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Layout.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Layout.tml	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Layout.tml	(revision fa404a571be9a5b680488e86d220dea7c822c160)
@@ -37,4 +37,5 @@
 						t:value="pageName"><a class="nav-link ${classForPageName}"
 						t:type="pagelink" t:page="prop:pageName">${pageNameTitle}</a></li>
+                                         <li class="nav-item"><a class="nav-link" href="/materijali" target="_blank">Материјали <t:SVGIcon t:path="external-link" t:width="16" /></a></li> 
 				</t:if>
 				<t:if t:test="userInfo?.administrator">
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/SolutionComparatorPage.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/SolutionComparatorPage.tml	(revision 4c92f436cbcf0dfda8e9557da54596b300765d44)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/SolutionComparatorPage.tml	(revision fa404a571be9a5b680488e86d220dea7c822c160)
@@ -36,5 +36,5 @@
 			<div t:type="if"
 				t:test="oneOfTheEvaluatedSolutions.studentSubmitSolution"
-				class="card-body bg-light p-2">
+				class="card-body p-2 ${solutionCorrectnessClass}">
 				<div class="row">
 					<div class="col-6">
@@ -96,5 +96,5 @@
 							<div t:type="if" t:test="otherSolutions">
 								<p>
-									<a class="btn btn-outline-info" role="button"
+									<a class="btn btn-outline-light" role="button"
 										data-toggle="collapse"
 										href="#collapseSolutions${taskInTestInstance.taskInTestInstanceId}"
@@ -111,6 +111,6 @@
 											t:value="otherStudentSubmitSolution">
 											<t:if t:test="SQL">
-												<div class="card">
-													<div class="card-body">
+												<div class="card card-body p-0 m-1">
+													<div>
 														<t:code t:additionalClass="literal:p-2"
 															t:value="otherStudentSubmitSolution.submission"></t:code>