diff --git a/frontend/src/pages/SubscriptionWorkPage.vue b/frontend/src/pages/SubscriptionWorkPage.vue
index aa1636ee49851bf4de21702297a0e878661e0822..0449d1a6c2007966582ff351eab97a33914385f9 100644
--- a/frontend/src/pages/SubscriptionWorkPage.vue
+++ b/frontend/src/pages/SubscriptionWorkPage.vue
@@ -2,7 +2,7 @@
   <v-layout
     row wrap
   >
-    <v-flex xs12 md6>
+    <v-flex xs12 md6 class="sub-correction">
       <submission-correction
         :assignment="currentAssignment"
         :key="subscription.pk"
@@ -125,5 +125,10 @@
 </script>
 
 <style scoped>
-
+  .sub-correction {
+    position: sticky;
+    top: 64px;
+    overflow-y: auto;
+    height: 90vh;
+  }
 </style>
diff --git a/frontend/src/pages/student/StudentSubmissionPage.vue b/frontend/src/pages/student/StudentSubmissionPage.vue
index 4d77dbc5bdcc91b2f211f61692f2492c2645bd28..bfc9b2096408f46e3359e58b04f941393a5b9072 100644
--- a/frontend/src/pages/student/StudentSubmissionPage.vue
+++ b/frontend/src/pages/student/StudentSubmissionPage.vue
@@ -17,13 +17,14 @@
           <template slot="table-content">
             <tr v-for="(code, lineNo) in submission" :key="lineNo">
               <submission-line :code="code" :lineNo="lineNo">
-                <feedback-comment
-                  v-if="feedback[lineNo] && showFeedback"
-                  v-for="(comment, index) in feedback[lineNo]"
-                  v-bind="comment"
-                  :line-no="lineNo"
-                  :key="index"
-                />
+                <template v-for="(comment, index) in feedback[lineNo]">
+                  <feedback-comment
+                    v-if="feedback[lineNo] && showFeedback"
+                    v-bind="comment"
+                    :line-no="lineNo"
+                    :key="index"
+                  />
+                </template>
               </submission-line>
             </tr>
           </template>
@@ -32,11 +33,11 @@
           :tests="submission.tests"
           :expand="true"
           class="mt-3"
-        ></submission-tests>
+        />
       </v-flex>
       <v-flex lg6 md12 mt-5 pl-3>
         <submission-type
-        v-bind="submissionType">
+          v-bind="submissionType">
         </submission-type>
       </v-flex>
     </v-layout>