diff --git a/community/lms/widgets/Exercise.html b/community/lms/widgets/Exercise.html
index 1dbaecfa..04361609 100644
--- a/community/lms/widgets/Exercise.html
+++ b/community/lms/widgets/Exercise.html
@@ -1,7 +1,7 @@
 {% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
 
 <div class="exercise">
-  <h2>{{ exercise.title }}</h2>
+  <h2>Exercise {{exercise.index_label}}: {{ exercise.title }}</h2>
   <div class="exercise-description">{{frappe.utils.md_to_html(exercise.description)}}</div>
 
   {% if exercise.image %}
diff --git a/community/www/batch/progress.html b/community/www/batch/progress.html
index 2083f046..983077b1 100644
--- a/community/www/batch/progress.html
+++ b/community/www/batch/progress.html
@@ -29,7 +29,7 @@
     <h1>Batch Progress</h1>
     {% for exercise in report.exercises %}
     <div class="exercise-submissions">
-      <h2>{{exercise.title}}</h2>
+      <h2>Exercise {{exercise.index_label}}: {{exercise.title}}</h2>
       {% for s in report.get_submissions_of_exercise(exercise.name) %}
       <div class="submission">
         <h4><a href="/{{s.owner.username}}">{{s.owner.full_name}}</a></h4>
diff --git a/community/www/batch/progress.py b/community/www/batch/progress.py
index 5556d03d..af22ede5 100644
--- a/community/www/batch/progress.py
+++ b/community/www/batch/progress.py
@@ -25,7 +25,7 @@ class BatchReport:
             self.submissions_by_exercise[s.exercise].append(s)
 
     def get_exercises(self, course_name):
-        return frappe.get_all("Exercise", {"course": course_name}, ["name", "title"])
+        return frappe.get_all("Exercise", {"course": course_name}, ["name", "title", "index_label"], order_by="index_label")
 
     def get_submissions_of_exercise(self, exercise_name):
         return self.submissions_by_exercise[exercise_name]