diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
index 4a75e0d8f6a3..a2ef7ff252ab 100644
--- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
+++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -1370,7 +1370,7 @@ public String buildMainPanelContext(VelocityPortlet portlet, Context context, Ru
 
         return template;
 
-    } // buildNormalContext
+    } // buildMainPanelContext
 
     /**
      * local function for getting assignment object
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm
index a94b93735bbb..c17aca06b965 100644
--- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm
+++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm
@@ -352,6 +352,7 @@
                 tool-id="sakai.assignment"
                 entity-id="$assignment.Id"
                 evaluated-item-id="$submission.Id"
+                evaluated-item-owner-id="$submitterId"
 
                 #if($!rbcs-state-details && "$!rbcs-state-details" != "")
                 state-details='$rbcs-state-details'
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission_withgrader.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission_withgrader.vm
index dc65174d158b..cfe5dbbf4bd3 100644
--- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission_withgrader.vm
+++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission_withgrader.vm
@@ -1,4 +1,4 @@
-<!-- start: chef_assignments_instructor_grading_submission.vm  -->
+<!-- start: chef_assignments_instructor_grading_submission_withgrader.vm  -->
 #set( $H = '-' )
 #javascript("/library/js/lang-datepicker/lang-datepicker.js")
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
index f5debc7f5a8e..cc88966fb905 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
@@ -321,52 +321,52 @@ public boolean isVisible() {
 
 							gradeScore.add(new Label("outOf").setVisible(false));
 
-							final WebMarkupContainer sakaiRubricPreview = new WebMarkupContainer("sakai-rubric-student-button");
-							sakaiRubricPreview.add(AttributeModifier.append("display", "icon"));
-							sakaiRubricPreview.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
-							sakaiRubricPreview.add(AttributeModifier.append("evaluated-item-id", assignment.getId() + "." + studentUuid));
-							sakaiRubricPreview.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
+							final WebMarkupContainer sakaiRubricButton = new WebMarkupContainer("sakai-rubric-student-button");
+							sakaiRubricButton.add(AttributeModifier.append("display", "icon"));
+							sakaiRubricButton.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
+							sakaiRubricButton.add(AttributeModifier.append("evaluated-item-id", assignment.getId() + "." + studentUuid));
+							sakaiRubricButton.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
 
-							addInstructorAttributeOrHide(sakaiRubricPreview, assignment.getId(), studentUuid, showingStudentView);
+							addInstructorAttributeOrHide(sakaiRubricButton, assignment.getId(), studentUuid, showingStudentView);
 
 							if (assignment.getId() != null) {
-								sakaiRubricPreview.add(AttributeModifier.append("entity-id", assignment.getId()));
+								sakaiRubricButton.add(AttributeModifier.append("entity-id", assignment.getId()));
 							}
 
-							gradeScore.add(sakaiRubricPreview);
+							gradeScore.add(sakaiRubricButton);
 						} else {
 							gradeScore.add(
 									new Label("grade", FormatHelper.convertEmptyGradeToDash(FormatHelper.formatGradeForDisplay(rawGrade))));
 							gradeScore.add(new Label("outOf",
 									new StringResourceModel("label.studentsummary.outof", null, assignment.getPoints())));
 
-							final WebMarkupContainer sakaiRubricPreview = new WebMarkupContainer("sakai-rubric-student-button");
-							sakaiRubricPreview.add(AttributeModifier.append("display", "icon"));
-							sakaiRubricPreview.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
+							final WebMarkupContainer sakaiRubricButton = new WebMarkupContainer("sakai-rubric-student-button");
+							sakaiRubricButton.add(AttributeModifier.append("display", "icon"));
+							sakaiRubricButton.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
 
-							addInstructorAttributeOrHide(sakaiRubricPreview, assignment.getId(), studentUuid, showingStudentView);
+							addInstructorAttributeOrHide(sakaiRubricButton, assignment.getId(), studentUuid, showingStudentView);
 
 							if (assignment.isExternallyMaintained()) {
-								sakaiRubricPreview.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_ASSIGNMENT));
+								sakaiRubricButton.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_ASSIGNMENT));
 								String[] bits = assignment.getExternalId().split("/");
 								if (bits != null && bits.length >= 1) {
 									String assignmentId = bits[bits.length-1];
 									String submissionId = rubricsService.getRubricEvaluationObjectId(assignmentId, studentUuid, RubricsConstants.RBCS_TOOL_ASSIGNMENT);
-									sakaiRubricPreview.add(AttributeModifier.append("entity-id", assignmentId));
-									sakaiRubricPreview.add(AttributeModifier.append("evaluated-item-id", submissionId));
+									sakaiRubricButton.add(AttributeModifier.append("entity-id", assignmentId));
+									sakaiRubricButton.add(AttributeModifier.append("evaluated-item-id", submissionId));
 								} else {
 									log.warn(assignment.getExternalId() + " is not a valid assignment reference");
 								}
 							} else {
-								sakaiRubricPreview.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
-								sakaiRubricPreview.add(AttributeModifier.append("evaluated-item-id", assignment.getId() + "." + studentUuid));
+								sakaiRubricButton.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
+								sakaiRubricButton.add(AttributeModifier.append("evaluated-item-id", assignment.getId() + "." + studentUuid));
 
 								if (assignment.getId() != null) {
-									sakaiRubricPreview.add(AttributeModifier.append("entity-id", assignment.getId()));
+									sakaiRubricButton.add(AttributeModifier.append("entity-id", assignment.getId()));
 								}
 							}
 
-							gradeScore.add(sakaiRubricPreview);
+							gradeScore.add(sakaiRubricButton);
 						}
 						if (gradeInfo != null && gradeInfo.isDroppedFromCategoryScore()) {
 							gradeScore.add(AttributeModifier.append("class", "gb-summary-grade-score-dropped"));
@@ -391,15 +391,15 @@ public boolean isVisible() {
 		});
 	}
 
-	private void addInstructorAttributeOrHide(WebMarkupContainer sakaiRubricPreviewButton, Long assignmentId, String studentId, boolean showingStudentView) {
+	private void addInstructorAttributeOrHide(WebMarkupContainer sakaiRubricButton, Long assignmentId, String studentId, boolean showingStudentView) {
 
 		if (!showingStudentView && (GradeSummaryTablePanel.this.getUserRole() == GbRole.INSTRUCTOR
 					|| GradeSummaryTablePanel.this.getUserRole() == GbRole.TA)) {
-			sakaiRubricPreviewButton.add(AttributeModifier.append("instructor", true));
+			sakaiRubricButton.add(AttributeModifier.append("instructor", true));
 		} else {
 			GradeDefinition gradeDefinition = businessService.getGradeForStudentForItem(studentId, assignmentId);
 			if (gradeDefinition.getGrade() == null) {
-				sakaiRubricPreviewButton.setVisible(false);
+				sakaiRubricButton.setVisible(false);
 			}
 		}
 	}
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java
index 1ec24618e4c2..7ab693761aa6 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java
@@ -74,7 +74,8 @@ public void onInitialize() {
         sakaiRubricGrading.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
         sakaiRubricGrading.add(AttributeModifier.append("entity-id", assignmentId));
         sakaiRubricGrading.add(AttributeModifier.append("evaluated-item-id", assignmentId + "." + studentUuid));
-		sakaiRubricGrading.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
+        sakaiRubricGrading.add(AttributeModifier.append("evaluated-item-owner-id", studentUuid));
+        sakaiRubricGrading.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
         form.add(sakaiRubricGrading);
 
         final GbAjaxButton submit = new GbAjaxButton("submit") {
diff --git a/msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java b/msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java
index bd6047bccbfa..ceb2782d8f80 100644
--- a/msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java
+++ b/msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java
@@ -6535,7 +6535,7 @@ public String generatePermissionScript(){
   	PermissionLevel contributorLevel = permissionLevelManager.getDefaultContributorPermissionLevel();
   	  	
   	StringBuilder sBuffer = new StringBuilder();  	
-  	sBuffer.append("<script type=\"text/javascript\">\n");   	  	
+  	sBuffer.append("<script>\n");
   	sBuffer.append("var ownerLevelArray = " + ownerLevel + ";\n");
   	sBuffer.append("var authorLevelArray = " + authorLevel + ";\n");
   	sBuffer.append("var noneditingAuthorLevelArray = " + noneditingAuthorLevel + ";\n");
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfMsgGrade.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfMsgGrade.jsp
index c81407f3ac72..5daaaf821f82 100644
--- a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfMsgGrade.jsp
+++ b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfMsgGrade.jsp
@@ -207,6 +207,7 @@
                     tool-id="sakai.gradebookng"
                     entity-id='<%= entityId %>'
                     evaluated-item-id='<%= rbcsEvaluationId %>'
+                    evaluated-item-owner-id='<h:outputText value="#{ForumTool.selectedMessage.message.authorId}" />'
                 ></sakai-rubric-grading>
             <%}%>
 
diff --git a/rubrics/tool/src/main/frontend/webcomponents/js/sakai-rubric-grading.js b/rubrics/tool/src/main/frontend/webcomponents/js/sakai-rubric-grading.js
index b817ab77ccc7..9d128ef06512 100644
--- a/rubrics/tool/src/main/frontend/webcomponents/js/sakai-rubric-grading.js
+++ b/rubrics/tool/src/main/frontend/webcomponents/js/sakai-rubric-grading.js
@@ -12,7 +12,7 @@ export class SakaiRubricGrading extends RubricsElement {
     super();
 
     this.selectedRatings = [];
-    this.existingEvalution = false;
+    this.existingEvaluation = false;
 
     this.rubric = { title: "" };
     this.criteria = [];
@@ -28,6 +28,7 @@ export class SakaiRubricGrading extends RubricsElement {
       toolId: { attribute: "tool-id", type: String },
       entityId: { attribute: "entity-id", type: String },
       evaluatedItemId: { attribute: "evaluated-item-id", type: String },
+      evaluatedItemOwnerId: { attribute: "evaluated-item-owner-id", type: String },
 
       // Non attribute
       evaluation: { type: Object },
@@ -209,7 +210,7 @@ export class SakaiRubricGrading extends RubricsElement {
     let evaluation = {
       evaluatorId: window.top.portal.user.id,
       evaluatedItemId: this.evaluatedItemId,
-      evaluatedItemOwnerId: window.top.portal.siteId,
+      evaluatedItemOwnerId: this.evaluatedItemOwnerId,
       overallComment: "",
       criterionOutcomes: crit,
       toolItemRubricAssociation: this.association._links.self.href,
@@ -331,7 +332,7 @@ export class SakaiRubricGrading extends RubricsElement {
         this.evaluation = data._embedded.evaluations[0] || { criterionOutcomes: [] };
         this.selectedRatings = this.evaluation.criterionOutcomes.map(ed => ed.selectedRatingId);
         if (this.criteria) this.decorateCriteria();
-        this.existingEvalution = true;
+        this.existingEvaluation = true;
 
         this.rubric = rubric;
 
diff --git a/samigo/samigo-app/src/webapp/jsf/evaluation/rubricModal.jsp b/samigo/samigo-app/src/webapp/jsf/evaluation/rubricModal.jsp
index ba912b50b4ba..74ae52b15193 100644
--- a/samigo/samigo-app/src/webapp/jsf/evaluation/rubricModal.jsp
+++ b/samigo/samigo-app/src/webapp/jsf/evaluation/rubricModal.jsp
@@ -7,6 +7,7 @@
 			tool-id="sakai.samigo"
 			entity-id='<h:outputText value="pub.#{questionScores.publishedId}.#{questionScores.itemId}"/>'
 			evaluated-item-id='<h:outputText value="#{description.assessmentGradingId}.#{questionScores.itemId}" />'
+			evaluated-item-owner-id='<h:outputText value="#{description.idString}" />'
 			item-id='<h:outputText value="#{description.assessmentGradingId}"/>'
 		</sakai-rubric-grading>
 	</div>
diff --git a/webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js b/webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
index 56d370eb0131..796783c06685 100644
--- a/webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
+++ b/webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
@@ -1,13 +1,13 @@
-import {SakaiElement} from "/webcomponents/sakai-element.js";
-import {css, html, LitElement} from "/webcomponents/assets/lit-element/lit-element.js";
-import {unsafeHTML} from "/webcomponents/assets/lit-html/directives/unsafe-html.js";
+import { SakaiElement } from "/webcomponents/sakai-element.js";
+import { css, html, LitElement } from "/webcomponents/assets/lit-element/lit-element.js";
+import { unsafeHTML } from "/webcomponents/assets/lit-html/directives/unsafe-html.js";
 import "/webcomponents/fa-icon.js";
 import "./sakai-grader-file-picker.js";
 import "../sakai-date-picker.js";
 import "../sakai-group-picker.js";
 import "../sakai-document-viewer.js";
-import {gradableDataMixin} from "./sakai-gradable-data-mixin.js";
-import {Submission} from "./submission.js";
+import { gradableDataMixin } from "./sakai-gradable-data-mixin.js";
+import { Submission } from "./submission.js";
 import "/rubrics-service/webcomponents/rubric-association-requirements.js";
 import "/rubrics-service/webcomponents/sakai-rubric-grading-button.js";
 
@@ -62,7 +62,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
       totalGraded: Number,
       token: { type: String },
       rubric: { type: Object },
-      assignmentsI18n: Object,
+      assignmentsI18n: Object
     };
   }
 
@@ -72,7 +72,9 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     this.i18nPromise.then(() => this.loadData(newValue));
   }
 
-  get gradableId() { return this._gradableId; }
+  get gradableId() {
+    return this._gradableId;
+  }
 
   set submission(newValue) {
 
@@ -89,11 +91,11 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     this.submittedTextMode = this._submission.submittedText;
 
     if (this.feedbackCommentEditor) {
-      this.feedbackCommentEditor.setData(this._submission.feedbackComment, () => this.modified = false );
+      this.feedbackCommentEditor.setData(this._submission.feedbackComment, () => this.modified = false);
     }
 
     if (this.privateNotesEditor) {
-      this.privateNotesEditor.setData(this._submission.privateNotes, () => this.modified = false );
+      this.privateNotesEditor.setData(this._submission.privateNotes, () => this.modified = false);
     }
 
     const rubric = this.querySelector("sakai-rubric-grading");
@@ -108,7 +110,9 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     }
   }
 
-  get submission() { return this._submission; }
+  get submission() {
+    return this._submission;
+  }
 
   shouldUpdate(changed) {
     return this.i18n && this.submission;
@@ -213,7 +217,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
               `}
             </div>
           </div>
-          ${this.submission.groupId && this.submission.submittedTime ?  html`<div class="grader-group-members">${this.submission.groupMembers}</div>` : ""}
+          ${this.submission.groupId && this.submission.submittedTime ? html`<div class="grader-group-members">${this.submission.groupMembers}</div>` : ""}
           <div class="attachments">
             ${this.submission.submittedAttachments.length > 0 ? html`
               <div class="attachments-header">${this.assignmentsI18n["gen.stuatt"]}:</div>
@@ -230,8 +234,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
               ${this.letterGradeOptions.map(grade => html`<option value="${grade}" .selected=${this.submission.grade === grade}>${grade}</option>`)}
             </select>
             ${this.renderSaved()}
-          ` : ""
-          }
+          ` : ""}
           ${this.gradeScale === "SCORE_GRADE_TYPE" ? html`
             <span>${this.assignmentsI18n["gen.assign.gra"]}</span>
             <input aria-label="${this.i18n["number_grade_label"]}"
@@ -268,6 +271,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
               tool-id="${this.toolId}"
               entity-id="${this.entityId}"
               evaluated-item-id="${this.submission.id}"
+              evaluated-item-owner-id="${this.submission.firstSubmitterId}"
               @click=${this.toggleRubric}></sakai-rubric-grading-button>
             <div id="rubric-panel" title="${this.i18n["rubric"]}" style="display: none;">
               <sakai-rubric-grading
@@ -275,6 +279,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
                 tool-id="${this.toolId}"
                 entity-id="${this.entityId}"
                 evaluated-item-id="${this.submission.id}"
+                evaluated-item-owner-id="${this.submission.firstSubmitterId}"
                 @total-points-updated=${this.onTotalPointsUpdated}
                 @rubric-rating-changed=${this.onRubricRatingChanged}
                 @rubric-ratings-changed=${this.onRubricRatingsChanged}
@@ -336,13 +341,13 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
           ${this.showResubmission ? html`
             <div class="resubmission-block">
               <span>${this.assignmentsI18n["allow.resubmit.number"]}:</span>
-              <select aria-label="${this.i18n["attempt_selector_label"]}" @change=${(e) => this.resubmitNumber = e.target.value}>
+              <select aria-label="${this.i18n["attempt_selector_label"]}" @change=${e => this.resubmitNumber = e.target.value}>
                 <option value="0" .selected=${this.submission.allowResubmitNumber === "1"}>0</option>
                 <option value="1" .selected=${this.submission.allowResubmitNumber === "1"}>1</option>
                 <option value="2" .selected=${this.submission.allowResubmitNumber === "2"}>2</option>
               </select>
               <span>${this.assignmentsI18n["allow.resubmit.closeTime"]}:</span>
-              <sakai-date-picker parse-format="YYYY-MM-DD HH:mm" @datetime-selected=${(e) => this.resubmitDate = e.detail.epochMillis} initial-value="${this.resubmitDate}"></sakai-date-picker>
+              <sakai-date-picker parse-format="YYYY-MM-DD HH:mm" @datetime-selected=${e => this.resubmitDate = e.detail.epochMillis} initial-value="${this.resubmitDate}"></sakai-date-picker>
             </div>
           ` : ""}
         ` : ""}
@@ -351,8 +356,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
           <button accesskey="d" name="return" @click=${this.saveAndRelease}>${this.assignmentsI18n["gen.retustud"]}</button>
           <button accesskey="x" name="cancel" @click=${this.cancel}>${this.assignmentsI18n["gen.can"]}</button>
         </div>
-      </div>`
-      : ""}
+      </div>` : ""}
     `;
   }
 
@@ -385,14 +389,16 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     return this.showOfficialPhoto && !this.gradable.anonymousGrading && this.submission.firstSubmitterId && !this.submission.groupId;
   }
 
-  fileNameFromRef(ref) { return ref.substring(ref.lastIndexOf("\/") + 1); }
+  fileNameFromRef(ref) {
+    return ref.substring(ref.lastIndexOf("\/") + 1);
+  }
 
   toggleRubric(e) {
 
     if (!this.rubricShowing) {
       $("#rubric-panel").dialog({
         width: "70%",
-        close: (e) => this.rubricShowing = false
+        close: e => this.rubricShowing = false
       });
       this.rubricShowing = true;
     } else {
@@ -413,15 +419,12 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     if (!height) height = 60;
 
     let editor = CKEDITOR.replace(id, {
-      toolbar : [
-        ['Bold', 'Italic', 'Underline', 'TextColor'],
-        ['NumberedList','BulletedList', 'Blockquote']
-      ],
+      toolbar: [['Bold', 'Italic', 'Underline', 'TextColor'], ['NumberedList', 'BulletedList', 'Blockquote']],
       width: width,
       height: height,
-      startupFocus: true,
+      startupFocus: true
     });
-    editor.on("change", () => this.modified = true );
+    editor.on("change", () => this.modified = true);
     return editor;
   }
 
@@ -429,7 +432,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
 
     if (!this.feedbackTextEditor) {
       this.feedbackTextEditor = this.replaceWithEditor("grader-feedback-text-editor", "100%", 600);
-      this.feedbackTextEditor.setData(this.submission.feedbackText, () => this.modified = false );
+      this.feedbackTextEditor.setData(this.submission.feedbackText, () => this.modified = false);
       this.querySelector("#grader-feedback-text").style.display = "none";
       this.querySelector("#edit-inline-feedback-button").style.display = "none";
       this.querySelector("#show-inline-feedback-button").style.display = "block";
@@ -456,7 +459,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     if (!feedbackPanel.dialog("instance")) {
       feedbackPanel.dialog({
         width: "auto",
-        close: (e, ui) => this.toggleFeedback(),
+        close: (e, ui) => this.toggleFeedback()
       });
       this.feedbackCommentEditor = this.replaceWithEditor("grader-feedback-comment", "100%", 120);
     } else {
@@ -480,7 +483,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     if (!privateNotesPanel.dialog("instance")) {
       privateNotesPanel.dialog({
         width: "auto",
-        close: (e, ui) => this.togglePrivateNotes(),
+        close: (e, ui) => this.togglePrivateNotes()
       });
       this.privateNotesEditor = this.replaceWithEditor("grader-private-notes", "100%", 120);
     } else {
@@ -549,7 +552,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
 
   loadData(gradableId) {
 
-    let doIt = (data) => {
+    let doIt = data => {
 
       this.gradeScale = data.gradable.gradeScale;
 
@@ -579,11 +582,10 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
 
     formData.valid = true;
 
-    this.querySelector("sakai-grader-file-picker").files.forEach((f,i) => formData.set(`attachment${i}`, f, f.name));
+    this.querySelector("sakai-grader-file-picker").files.forEach((f, i) => formData.set(`attachment${i}`, f, f.name));
     formData.set("grade", this.submission.grade);
 
-    if (this.gradeScale === "SCORE_GRADE_TYPE"
-      && (parseFloat(this.submission.grade.replace(",", ".")) > parseFloat(this.gradable.maxGradePoint.replace(",", ".")))) {
+    if (this.gradeScale === "SCORE_GRADE_TYPE" && parseFloat(this.submission.grade.replace(",", ".")) > parseFloat(this.gradable.maxGradePoint.replace(",", "."))) {
       if (!confirm(this.tr("confirm_exceed_max_grade", [this.gradable.maxGradePoint], "grader"))) {
         formData.valid = false;
       } else {
@@ -611,7 +613,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     if (this.debug) {
       // Display the key/value pairs
       for (var pair of formData.entries()) {
-        console.log(pair[0]+ ': '+ pair[1]);
+        console.log(pair[0] + ': ' + pair[1]);
       }
     }
 
@@ -644,24 +646,20 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
 
   submitGradingData(formData) {
 
-    fetch("/direct/assignment/setGrade.json",
-            {method: "POST", cache: "no-cache", credentials: "same-origin", body: formData})
-      .then(r => r.json())
-      .then(data => {
+    fetch("/direct/assignment/setGrade.json", { method: "POST", cache: "no-cache", credentials: "same-origin", body: formData }).then(r => r.json()).then(data => {
 
-        let submission = new Submission(data, this.groups);
+      let submission = new Submission(data, this.groups);
 
-        submission.grade = formData.get("grade");
+      submission.grade = formData.get("grade");
 
-        this.querySelector("sakai-grader-file-picker").reset();
-        this.submissions.splice(this.submissions.findIndex(s => s.id === submission.id), 1, submission);
-        this.originalSubmissions.splice(this.originalSubmissions.findIndex(s => s.id === submission.id), 1, submission);
-        this.modified = false;
-        this.submission = submission;
-        this.totalGraded = this.submissions.filter(s => s.graded).length;
-        this.saved = true;
-      })
-      .catch (e => console.error(`Failed to save grade for submission ${this.submission.id}: ${e}`));
+      this.querySelector("sakai-grader-file-picker").reset();
+      this.submissions.splice(this.submissions.findIndex(s => s.id === submission.id), 1, submission);
+      this.originalSubmissions.splice(this.originalSubmissions.findIndex(s => s.id === submission.id), 1, submission);
+      this.modified = false;
+      this.submission = submission;
+      this.totalGraded = this.submissions.filter(s => s.graded).length;
+      this.saved = true;
+    }).catch(e => console.error(`Failed to save grade for submission ${this.submission.id}: ${e}`));
   }
 
   resetEditors(cancelling) {
@@ -694,7 +692,9 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
     this.modified = false;
   }
 
-  canNavigate() { return this.modified ? confirm(this.i18n["confirm_discard_changes"]) : true; }
+  canNavigate() {
+    return this.modified ? confirm(this.i18n["confirm_discard_changes"]) : true;
+  }
 
   validateGradeInput(e) {
 
@@ -813,7 +813,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
       this.submissions = this.submissions.filter(s => group.users.includes(s.firstSubmitterId));
     }
 
-    this.submissions.sort((a,b) => a.firstSubmitterName.localeCompare(b.firstSubmitterName));
+    this.submissions.sort((a, b) => a.firstSubmitterName.localeCompare(b.firstSubmitterName));
 
     if (this.submissions.length > 0) {
       this.submission = this.submissions[0];
@@ -838,16 +838,14 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
 
       let ref = e.target.dataset.ref;
 
-      fetch(`/direct/assignment/removeFeedbackAttachment?gradableId=${this.gradableId}&submissionId=${this.submission.id}&ref=${ref}`)
-        .then(r => {
+      fetch(`/direct/assignment/removeFeedbackAttachment?gradableId=${this.gradableId}&submissionId=${this.submission.id}&ref=${ref}`).then(r => {
 
-          if (r.status === 200) {
-            this.submission.feedbackAttachments.splice(this.submission.feedbackAttachments.findIndex(fa => fa === ref), 1);
-            this.requestUpdate();
-          }
-        })
-        .catch(error => console.error(`Failed to remove attachment on server: ${error}`));
-      }
+        if (r.status === 200) {
+          this.submission.feedbackAttachments.splice(this.submission.feedbackAttachments.findIndex(fa => fa === ref), 1);
+          this.requestUpdate();
+        }
+      }).catch(error => console.error(`Failed to remove attachment on server: ${error}`));
+    }
   }
 
   groupSelected(e) {