diff --git a/lms/lmsdb/models.py b/lms/lmsdb/models.py
index df87b034..e338b6cf 100644
--- a/lms/lmsdb/models.py
+++ b/lms/lmsdb/models.py
@@ -770,6 +770,7 @@ def _by_file(cls, file_id: int):
             .switch()
             .join(User)
             .where(cls.file == file_id)
+            .order_by(cls.timestamp.asc())
         )
 
     @classmethod
diff --git a/lms/static/comments.js b/lms/static/comments.js
index 170f1887..13be4dc1 100644
--- a/lms/static/comments.js
+++ b/lms/static/comments.js
@@ -1,10 +1,11 @@
 const DEFAULT_COMMENTED_LINE_COLOR = '#fab3b0';
+const STUDENT_COMMENTED_LINE_COLOR = '#a9f6f9';
 const FLAKE_COMMENTED_LINE_COLOR = '#fac4c3';
 const HOVER_LINE_STYLE = '1px solid #0d0d0f';
 
-function markLine(target, color) {
-  if (target.dataset && target.dataset.marked === 'true') { return; }
-  if (target.dataset && target.dataset.vimbackground === 'true') { return; }
+function markLine(target, color, deletion = false) {
+  if (target.dataset && target.dataset.marked === 'true' && !deletion) { return; }
+  if (target.dataset && target.dataset.vimbackground === 'true' && !deletion) { return; }
   target.style.background = color;
 }
 
@@ -45,7 +46,7 @@ function formatCommentData(commentData) {
 function addCommentToLine(line, commentData) {
   const commentElement = document.querySelector(`.line[data-line="${line}"]`);
   const formattedComment = formatCommentData(commentData);
-  const commentText = `<span class="comment" data-line="${line}" data-commentid="${commentData.id}">${formattedComment}</span>`;
+  const commentText = `<span class="comment" data-line="${line}" data-commentid="${commentData.id}" data-author-role="${commentData.author_role}">${formattedComment}</span>`;
   let existingPopover = bootstrap.Popover.getInstance(commentElement);
   if (existingPopover !== null) {
     const existingContent = `${existingPopover.config.content} <hr>`;
@@ -65,13 +66,18 @@ function addCommentToLine(line, commentData) {
   if (commentData.is_auto) {
     markLine(commentElement, FLAKE_COMMENTED_LINE_COLOR);
   } else {
-    markLine(commentElement, DEFAULT_COMMENTED_LINE_COLOR);
+    const lineColor = window.getLineColorByRole(commentData.author_role);
+    markLine(commentElement, lineColor, true);
     commentElement.dataset.marked = true;
   }
 
   return existingPopover;
 }
 
+function getLineColorByRole(authorRole) {
+  return authorRole === 1 ? STUDENT_COMMENTED_LINE_COLOR : DEFAULT_COMMENTED_LINE_COLOR;
+}
+
 function treatComments(comments) {
   if (comments === undefined) {
     console.error('Probably bad xhr request');
@@ -143,6 +149,7 @@ window.markLink = markLine;
 window.hoverLine = hoverLine;
 window.addCommentToLine = addCommentToLine;
 window.isUserGrader = isUserGrader;
+window.getLineColorByRole = getLineColorByRole;
 window.addEventListener('load', () => {
   const codeElement = document.getElementById('code-view').dataset;
   window.solutionId = codeElement.id;
diff --git a/lms/static/grader.js b/lms/static/grader.js
index 2efaa9d7..b6421ea7 100644
--- a/lms/static/grader.js
+++ b/lms/static/grader.js
@@ -67,8 +67,12 @@ function visuallyRemoveComment(commentId) {
       removeContent = `${commentElement.outerHTML} <hr>`;
     }
     existingPopover.config.content = existingPopover.config.content.replace(removeContent, '');
+    const commentParent = commentElement.parentNode;
     hr.parentNode.removeChild(hr);
-    commentElement.parentNode.removeChild(commentElement);
+    commentParent.removeChild(commentElement);
+    const lastAuthorRole = commentParent.lastChild.previousElementSibling.dataset.authorRole;
+    const newLineColor = window.getLineColorByRole(lastAuthorRole);
+    window.markLine(lineElement, newLineColor, true);
   }
 }