diff --git a/client/src/components/content-block-form/AddContentLink.vue b/client/src/components/content-block-form/AddContentLink.vue
index 726ebd83..9d284309 100644
--- a/client/src/components/content-block-form/AddContentLink.vue
+++ b/client/src/components/content-block-form/AddContentLink.vue
@@ -1,14 +1,14 @@
 <template>
   <a
     class="add-content-link"
-    @click="$emit('click')"><plus-icon class="add-content-link__icon"/> <span class="add-content-link__text">Neuer Inhalt</span></a>
+    @click="$emit('click')"
+  ><plus-icon class="add-content-link__icon" /> <span class="add-content-link__text">Neuer Inhalt</span></a>
 </template>
 
 <script>
- import Cross from '@/components/icons/Cross';
  import PlusIcon from '@/components/icons/PlusIcon';
  export default {
-   components: {PlusIcon, Cross}
+   components: { PlusIcon }
 
    //
  };
diff --git a/client/src/components/content-block-form/ContentElement.vue b/client/src/components/content-block-form/ContentElement.vue
index 3217a916..4fb04252 100644
--- a/client/src/components/content-block-form/ContentElement.vue
+++ b/client/src/components/content-block-form/ContentElement.vue
@@ -1,11 +1,10 @@
 <template>
   <div class="content-element">
     <component
-      :is="type(element)"
-      :class="{'content-element__chooser': type(element) === 'content-block-element-chooser-widget'}"
+      :class="['content-element__component', {'content-element__chooser': type(element) === 'content-block-element-chooser-widget'}]"
       v-bind="element"
-      class="content-element__component"
-      @change-type="changeType($event)"
+      :is="type(element)"
+      @change-type="changeType"
 
       @link-change-url="changeText"
       @link-change-text="changeText"
@@ -21,10 +20,12 @@
 
     <a
       class="contents-form__remove icon-button"
-      @click="$emit('remove')">
+      @click="$emit('remove')"
+    >
       <trash-icon
         class="contents-form__trash-icon icon-button__icon"
-        v-if="type(element) !== 'content-block-element-chooser-widget'"/>
+        v-if="type(element) !== 'content-block-element-chooser-widget'"
+      />
     </a>
   </div>
 </template>
diff --git a/client/src/components/content-block-form/ContentFormSection.vue b/client/src/components/content-block-form/ContentFormSection.vue
index 87c6db85..471568ee 100644
--- a/client/src/components/content-block-form/ContentFormSection.vue
+++ b/client/src/components/content-block-form/ContentFormSection.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="content-form-section">
-    <h2 class="content-form-section__heading">{{ title }}</h2>
-    <slot/>
+    <h2 class="content-form-section__heading">
+      {{ title }}
+    </h2>
+    <slot />
   </div>
 </template>
 
diff --git a/client/src/components/ui/Toggle.vue b/client/src/components/ui/Toggle.vue
index 5be5294a..24d0697f 100644
--- a/client/src/components/ui/Toggle.vue
+++ b/client/src/components/ui/Toggle.vue
@@ -1,16 +1,17 @@
 <template>
   <label
     :for="id"
-    :class="{'toggle--bordered': bordered}"
-    class="toggle">
+    :class="['toggle', {'toggle--bordered': bordered}]"
+  >
     <input
-      :id="id"
       :checked="checked"
       class="toggle__input"
       type="checkbox"
-      @change.prevent="$emit('input', $event.target.checked)">
+      :id="id"
+      @change.prevent="$emit('input', $event.target.checked)"
+    >
     <span class="toggle__toggle-wrapper">
-      <span class="toggle__toggle"/>
+      <span class="toggle__toggle" />
     </span>
     <span class="toggle__label">{{ label }}</span>
   </label>
diff --git a/client/src/pages/topic-page.vue b/client/src/pages/topic-page.vue
index b424e208..efc4fa80 100644
--- a/client/src/pages/topic-page.vue
+++ b/client/src/pages/topic-page.vue
@@ -7,7 +7,10 @@
     <div class="topic__content">
       <h1
         data-cy="topic-title"
-        class="topic__title">{{ topic.title }}</h1>
+        class="topic__title"
+      >
+        {{ topic.title }}
+      </h1>
       <p class="topic__teaser">
         {{ topic.teaser }}
       </p>
@@ -15,25 +18,27 @@
         <div
           class="topic__video-link topic__link"
           v-if="topic.vimeoId"
-          @click="openVideo">
-          <play-icon class="topic__video-link-icon topic__link-icon"/>
+          @click="openVideo"
+        >
+          <play-icon class="topic__video-link-icon topic__link-icon" />
           <span class="topic__link-description">Video schauen</span>
         </div>
         <a
           :href="topic.instructions"
           target="_blank"
           class="topic__instruction-link topic__link"
-          v-if="me.isTeacher && topic.instructions">
-          <bulb-icon class="topic__instruction-icon topic__link-icon"/>
+          v-if="me.isTeacher && topic.instructions"
+        >
+          <bulb-icon class="topic__instruction-icon topic__link-icon" />
           <span class="topic__link-description">Anweisungen zum Thema anzeigen</span>
         </a>
-
       </div>
       <div class="topic__modules">
         <module-teaser
+          v-for="module in modules"
           :key="module.slug"
           v-bind="module"
-          v-for="module in modules"/>
+        />
       </div>
     </div>
   </div>
diff --git a/client/src/router/index.js b/client/src/router/index.js
index d5e77804..55ce0676 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -26,7 +26,7 @@ const surveyPage = () => import(/* webpackChunkName: "survey" */'@/pages/survey'
 const styleGuidePage = () => import('@/pages/styleguide');
 const joinClass = () => import('@/pages/joinClass');
 
-const topic = () => import('@/pages/topic');
+const topic = () => import('@/pages/topic-page');
 
 const p404 = () => import('@/pages/p404');
 const submission = () => import('@/pages/studentSubmission');
@@ -110,7 +110,7 @@ const router = new Router({
   },
 });
 
-router.afterEach((to, from) => {
+router.afterEach(() => {
   store.commit('setEditModule', false);
   store.dispatch('showMobileNavigation', false);
 });