diff --git a/client/src/pages/studentSubmission.vue b/client/src/pages/studentSubmission.vue
index f68126bd..02f8b18d 100644
--- a/client/src/pages/studentSubmission.vue
+++ b/client/src/pages/studentSubmission.vue
@@ -1,20 +1,19 @@
 <template>
-  <div class="article submission-page">
-    <div class="article__header">
-      <!-- <h1 class="article__title">{{studentSubmission.assignment.title}}</h1> -->
-      <h1>Aufgabe</h1>
+  <div class="submission-page">
+    <div class="submission-page__header submission-header">
+      <h2>Aufgabe</h2>
       <p>{{studentSubmission.assignment.assignment}}</p>
     </div>
-    <div class="article__content article-content">
-            <h2 class="article__subtitle">Ergebnis von {{fullName}}</h2>
-      <p v-if="studentSubmission.document && studentSubmission.document.length > 0" class="article-content__document">
+    <div class="submission-page__content submission-content">
+      <h2>Ergebnis von {{fullName}}</h2>
+        <p v-if="studentSubmission.document && studentSubmission.document.length > 0" class="article-content__document">
         <a :href="studentSubmission.document" class="entry-document__link link" target="_blank">
           <student-submission-document :document="studentSubmission.document"></student-submission-document>
         </a>
       </p>
-      <p class="article-content__text" v-html="text"></p>
+      <p v-html="text"></p>
     </div>
-    <div class="feedback-submission">
+    <div class="submission-page__feedback feedback">
       <feedback-form
         v-if="studentSubmission"
         @turnIn="turnIn"
@@ -197,14 +196,15 @@
 </script>
 
 <style scoped lang="scss">
-  @import "@/styles/_functions.scss";
-  .article-content {
-    &__document {
-      margin-bottom: 1rem;
+  @import "@/styles/_variables.scss";
+
+  .submission-page {
+    &__content {
+      margin-top: 1.5*$large-spacing;
     }
 
-    &__text /deep/ > p {
-      margin-bottom: 1em;
+    &__feedback {
+      margin-top: $large-spacing;
     }
   }