diff --git a/lms/www/classes/progress.html b/lms/www/classes/progress.html
index 402e91eb..3db03b3f 100644
--- a/lms/www/classes/progress.html
+++ b/lms/www/classes/progress.html
@@ -49,18 +49,22 @@
 {% macro Progress(class_info, student) %}
 <div>
 	{% for assessment in assessments %}
-	<div>
+	<div class="list-row level">
 		<div>
 			{{ assessment.title }}
 		</div>
-		{{ assessment.submission}}
+
 		{% if assessment.submission %}
-		<div>
-			{{ assessment.submission.status }}
-		</div>
-		<a class="btn btn-secondary btn-sm" href="{{ assessment.url }}">
-			{{ _("Grade") }}
-		</a>
+			{% set status = assessment.submission.status %}
+			{% set color = "green" if status == "Pass" else "red" if status == "Fail" else "orange"  %}
+			<div>
+				<div class="indicator-pill {{ color }}">
+					{{ assessment.submission.status }}
+				</div>
+				<a class="btn btn-secondary btn-sm" href="{{ assessment.url }}">
+					{{ _("Grade") }}
+				</a>
+			</div>
 		{% endif %}
 	</div>
 	{% endfor %}
diff --git a/lms/www/utils.py b/lms/www/utils.py
index aa4b6e7c..26b0f8a5 100644
--- a/lms/www/utils.py
+++ b/lms/www/utils.py
@@ -74,29 +74,30 @@ def get_assessments(is_moderator, class_name, member):
 			assessment.title = frappe.db.get_value(
 				"LMS Assignment", assessment.assessment_name, "title"
 			)
-			if is_moderator:
-				assessment.url = f"/assignments/{assessment.assessment_name}"
-			else:
-				existing_submission = frappe.db.exists(
-					{
-						"doctype": "LMS Assignment Submission",
-						"member": member,
-						"assignment": assessment.assessment_name,
-					}
-				)
-				print(existing_submission)
-				if existing_submission:
-					assessment.submission = frappe.db.get_value(
-						"LMS Assignment Submission",
-						existing_submission,
-						["name", "grade", "comments"],
-						as_dict=True,
-					)
 
-				submission_name = existing_submission if existing_submission else "new-submission"
-				assessment.url = (
-					f"/assignment-submission/{assessment.assessment_name}/{submission_name}"
+			existing_submission = frappe.db.exists(
+				{
+					"doctype": "LMS Assignment Submission",
+					"member": member,
+					"assignment": assessment.assessment_name,
+				}
+			)
+
+			if existing_submission:
+				assessment.submission = frappe.db.get_value(
+					"LMS Assignment Submission",
+					existing_submission,
+					["name", "status", "comments"],
+					as_dict=True,
 				)
+
+			assessment.edit_url = f"/assignments/{assessment.assessment_name}"
+			assessment.grade_url = f"/assignment-grading/{existing_submission}"
+			submission_name = existing_submission if existing_submission else "new-submission"
+			assessment.url = (
+				f"/assignment-submission/{assessment.assessment_name}/{submission_name}"
+			)
+
 		elif assessment.assessment_type == "LMS Quiz":
 			assessment.title = frappe.db.get_value(
 				"LMS Quiz", assessment.assessment_name, "title"