diff --git a/course/templates/course/staff/all_exercise_submissions.html b/course/templates/course/staff/all_exercise_submissions.html
index 30e5df7b6..d4654b19e 100644
--- a/course/templates/course/staff/all_exercise_submissions.html
+++ b/course/templates/course/staff/all_exercise_submissions.html
@@ -6,11 +6,11 @@
 {% load colortag %}
 
 {% block title %}{% translate "ALL_SUBMISSIONS" %} | {{ block.super }}{% endblock %}
-{% block view_tag %}All Submissions{% endblock %}
+{% block view_tag %}{% translate "ALL_SUBMISSIONS" %}{% endblock %}
 
 {% block breadcrumblist %}
 {{ block.super }}
-<li class="active">All Submissions</li>
+<li class="active">{% translate "ALL_SUBMISSIONS" %}</li>
 {% endblock %}
 
 {% block columns %}
@@ -60,7 +60,7 @@
                         {% translate "ASSESSED_MANUALLY" %}
                     </th>
                     <th data-filter-type="none" data-order-disable="true">{% translate "INSPECT" %}</th>
-                    <th>Exercise</th>
+                    <th>{% translate "EXERCISE" %}</th>
                 </tr>
         </thead>
         <tbody>
diff --git a/course/views.py b/course/views.py
index 82d0c1ac0..60fa3477e 100644
--- a/course/views.py
+++ b/course/views.py
@@ -15,24 +15,23 @@
 from django.utils.text import format_lazy
 from django.utils.translation import check_for_language
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import ListView
 
 from authorization.permissions import ACCESS
+
 from exercise.cache.hierarchy import NoSuchContent
-from exercise.exercise_models import BaseExercise
 from exercise.models import LearningObject
-from exercise.staff_views import ListSubmissionsView
-from exercise.submission_models import Submission, SubmissionQuerySet, SubmissionTagging
-from exercise.viewbase import ExerciseListBaseView, ExerciseMixin
+from exercise.submission_models import Submission
+
 #from exercise.views import ResultView
 from lib.helpers import settings_text, remove_query_param_from_url, is_ajax
 from lib.viewbase import BaseTemplateView, BaseRedirectMixin, BaseFormView, BaseView, BaseRedirectView
 from userprofile.viewbase import UserProfileView
 from .forms import GroupsForm, GroupSelectForm
-from .models import Course, CourseInstance, CourseModule, Enrollment, SubmissionTag
+from .models import Course, CourseInstance, CourseModule, Enrollment
 from .permissions import EnrollInfoVisiblePermission
 from .renders import group_info_context
-from .viewbase import CourseModuleBaseView, CourseInstanceMixin, EnrollableViewMixin, CourseMixin, CourseInstanceBaseView
+from .viewbase import CourseModuleBaseView, CourseInstanceMixin,\
+    EnrollableViewMixin, CourseMixin, CourseInstanceBaseView
 
 
 class HomeView(UserProfileView):
@@ -386,7 +385,7 @@ def post(self, request, *args, **kwargs):
                     )
                 request.REQUEST_LANG = lang_code
         return response
-  
+
 class AllSubmissionsView(CourseInstanceBaseView):
     access_mode = ACCESS.ASSISTANT
     template_name = "course/staff/all_exercise_submissions.html"
@@ -410,19 +409,16 @@ def get_common_objects(self):
                 'course_instance': self.instance,
                 'is_teacher': self.instance.is_teacher(self.request.user),
             })
-        
         self.count = len(row_data)
         self.limited = self.request.GET.get('limited', False)
         self.submission_data = row_data[:self.default_limit] if self.limited else row_data
         self.not_all_url = self.url_without_limited + "?limited=true"
         self.all_url = self.url_without_limited
 
-        self.note('submission_data', 
-                  'count', 
-                  'default_limit', 
+        self.note('submission_data',
+                  'count',
+                  'default_limit',
                   'tags',
                   'limited',
                   'not_all_url',
                   'all_url')
-
-