Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/instructor/RelationSchemaEvaluation.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/instructor/RelationSchemaEvaluation.java	(revision 84e4fead888903bb3e7695be01ba8160bc698a9f)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/instructor/RelationSchemaEvaluation.java	(revision cfd2bb41b298e8a69686cdcf02f98708df2659d6)
@@ -44,5 +44,5 @@
 @AdministratorPage
 @InstructorPage
-@Import(module = { "zoneUpdateEffect" })
+@Import(module = { "zoneUpdateEffect" }, stylesheet = { "SubmissionEvaluations.css" })
 public class RelationSchemaEvaluation {
 
@@ -98,4 +98,6 @@
 	@Property
 	List<String> resultsErrors;
+	@Property
+	String resultError;
 
 	void onActivate(TaskInTestInstance taskInTestInstance) {
@@ -173,4 +175,11 @@
 	}
 
+	public void onMarkPos2(Object[] context) {
+		setEvaluationPointGrade(context, "2");
+		if (request.isXHR()) {
+			ajaxResponseRenderer.addRender(zEvaluationTable);
+		}
+	}
+
 	public void onMarkNeg(Object[] context) {
 		setEvaluationPointGrade(context, "-1");
@@ -205,4 +214,15 @@
 	}
 
+	public void onSetUngradedPos2() {
+		for (String[] ss : getFilteredEvaluationData()) {
+			if (ss[1] == null || ss[1].equals("")) {
+				setEvaluationPointGrade(ss, "2");
+			}
+		}
+		if (request.isXHR()) {
+			ajaxResponseRenderer.addRender(zEvaluationTable);
+		}
+	}
+
 	public void onSetUngradedNeg() {
 		for (String[] ss : getFilteredEvaluationData()) {
@@ -247,5 +267,7 @@
 		if (oneRow != null && oneRow[1] != null) {
 			Integer grade = Integer.parseInt(oneRow[1]);
-			if (grade > 0) {
+			if (grade >= 2) {
+				return "grade-pos2";
+			} else if (grade == 1) {
 				return "grade-pos";
 			} else if (grade == 0) {
@@ -382,4 +404,8 @@
 				.getDDLEvaluationDataFromStudentDatabases(getSubmissions());
 		evaluationData = results.getFirstItem();
+		for (int i = 0; i < evaluationData.size(); i++) {
+			evaluationData.get(i)[3] = evaluationData.get(i)[3].replaceFirst("202122z_va_ispit_......",
+					"exam_by_******"); // @TODO: направено за SIGITE презентација да се преправи
+		}
 		resultsHeadersSimple = results.getSecondItem();
 		resultsErrors = results.getThirdItem();
@@ -417,3 +443,6 @@
 	}
 
+	void onClearErrors() {
+		resultsErrors = null;
+	}
 }
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/instructor/RelationSchemaEvaluation.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/instructor/RelationSchemaEvaluation.tml	(revision 84e4fead888903bb3e7695be01ba8160bc698a9f)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/instructor/RelationSchemaEvaluation.tml	(revision cfd2bb41b298e8a69686cdcf02f98708df2659d6)
@@ -3,20 +3,4 @@
 	xmlns:t="http://tapestry.apache.org/schema/tapestry_5_4.xsd"
 	xmlns:p="tapestry:parameter">
-
-<style>
-.grade-pos {
-	background: var(--color-correct);
-}
-
-.grade-neg {
-	background: var(--color-incorrect-wrong);
-	color: yellow;
-}
-
-.grade-zero {
-	background: var(--color-incorrect);
-	color: white;
-}
-</style>
 
 <h1>${message:instructor/relationSchemaEvaluation-pagelink}</h1>
@@ -44,11 +28,13 @@
 		<t:submit t:value="Filter" />
 		<a href="" class="ml-auto btn btn-info" t:type="eventlink"
-			t:id="loadSavedData"><img t:type="svgicon"
-			t:path="file" t:height="1.5em" /> Reload saved data</a> <a href="" class="ml-auto btn btn-info" t:type="eventlink"
+			t:id="loadSavedData"><img t:type="svgicon" t:path="file"
+			t:height="1.5em" /> Reload saved data</a> <a href=""
+			class="ml-auto btn btn-info" t:type="eventlink"
 			t:id="saveDataAndGenerateReports"><img t:type="svgicon"
-			t:path="database" t:height="1.5em" /> Save data &amp; generate reports</a> <a href=""
-			class="ml-auto btn btn-outline-danger" t:type="eventlink"
-			t:id="refreshData"><img t:type="svgicon" t:path="alert-triangle"
-			t:height="1.5em" /> Reconstruct the entire evaluation set</a>
+			t:path="database" t:height="1.5em" /> Save data &amp; generate
+			reports</a> <a href="" class="ml-auto btn btn-outline-danger"
+			t:type="eventlink" t:id="refreshData"><img t:type="svgicon"
+			t:path="alert-triangle" t:height="1.5em" /> Reconstruct the entire
+			evaluation set</a>
 	</form>
 </div>
@@ -58,11 +44,13 @@
 <div class="mb-3">
 	<p>
-		<a href="" class="ml-auto btn btn-success" t:type="eventlink"
+		<a href="" class="ml-auto btn grade-pos2" t:type="eventlink"
+			t:id="setUngradedPos2">Set ungraded to +2</a> <a href=""
+			class="ml-auto btn grade-pos" t:type="eventlink"
 			t:id="setUngradedPos">Set ungraded to +1</a> <a href=""
-			class="ml-auto btn btn-secondary" t:type="eventlink"
+			class="ml-auto btn grade-zero" t:type="eventlink"
 			t:id="setUngradedZero">Set ungraded to 0</a> <a href=""
-			class="ml-auto btn btn-danger" t:type="eventlink"
+			class="ml-auto btn grade-neg" t:type="eventlink"
 			t:id="setUngradedNeg">Set ungraded to -1</a> <a href=""
-			class="ml-auto btn btn-light" t:type="eventlink" t:id="resetGraded">Reset
+			class="ml-auto btn btn-outline-primary" t:type="eventlink" t:id="resetGraded">Reset
 			graded</a>
 	</p>
@@ -70,7 +58,13 @@
 
 <div t:type="zone" t:id="zEvaluationTable" id="zEvaluationTable">
-	<div t:type="if" t:test="resultsErrors">${resultsErrors}</div>
+	<div t:type="if" t:test="resultsErrors">
+		<a href="" class="btn btn-sm btn-default" t:type="eventlink"
+			t:id="clearErrors">Clear errors</a>
+		<ul>
+			<li t:type="loop" t:source="resultsErrors" t:value="resultError">${resultError}</li>
+		</ul>
+	</div>
 	Rows: ${filteredEvaluationData.size()}
-	<table class="table table-hover table-bordered ">
+	<table class="table table-sm table-bordered ">
 		<thead class="table-dark">
 			<tr>
@@ -86,13 +80,17 @@
 			<tr t:type="loop" t:source="filteredEvaluationData" t:value="oneRow"
 				class=" ${correctnessClass} ">
-				<td style="width: 10em;"><a href="" t:type="eventlink"
-					t:id="markPos" t:zone="zEvaluationTable" t:context="oneRow"
-					class="btn btn-sm btn-success">+1</a> <a href="" t:type="eventlink"
-					t:id="markZero" t:zone="zEvaluationTable" t:context="oneRow"
-					class="btn btn-sm btn-secondary">0</a> <a href=""
+				<td class="actions"><a href="" t:type="eventlink"
+					t:id="markPos2" t:zone="zEvaluationTable" t:context="oneRow"
+					class="btn btn-sm grade-pos2 p-1">+2</a> <a href=""
+					t:type="eventlink" t:id="markPos" t:zone="zEvaluationTable"
+					t:context="oneRow" class="btn btn-sm grade-pos p-1">+1</a> <a
+					href="" t:type="eventlink" t:id="markZero"
+					t:zone="zEvaluationTable" t:context="oneRow"
+					class="btn btn-sm grade-zero p-1">0</a> <a href=""
 					t:type="eventlink" t:id="markNeg" t:zone="zEvaluationTable"
-					t:context="oneRow" class="btn btn-sm btn-danger">-1</a> <a href=""
-					t:type="eventlink" t:id="markReset" t:zone="zEvaluationTable"
-					t:context="oneRow" class="btn btn-sm btn-light">/</a></td>
+					t:context="oneRow" class="btn btn-sm grade-neg p-1">-1</a> <a
+					href="" t:type="eventlink" t:id="markReset"
+					t:zone="zEvaluationTable" t:context="oneRow"
+					class="btn btn-sm btn-outline-primary p-1">/</a></td>
 				<td t:type="loop" t:source="parsedRow" t:value="oneColumn">${oneColumn}</td>
 			</tr>