diff --git a/client/src/App.vue b/client/src/App.vue
index cde2d77d..4162d657 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -69,7 +69,10 @@
 
     &__header {
       grid-area: h;
-      display: grid;
+      display: -ms-grid;
+      @supports (display: grid) {
+        display: grid;
+      }
       align-items: center;
       justify-content: space-around;
       background-color: $color-white;
@@ -81,7 +84,6 @@
       /*
        * For IE10+
        */
-      display: -ms-grid;
       -ms-grid-columns: 1fr 1fr 1fr;
       -ms-grid-rows: 60px 60px;
 
diff --git a/client/src/components/rooms/RoomWidget.vue b/client/src/components/rooms/RoomWidget.vue
index 2f1303bc..b534df2c 100644
--- a/client/src/components/rooms/RoomWidget.vue
+++ b/client/src/components/rooms/RoomWidget.vue
@@ -57,7 +57,10 @@
   }
 
   .room-widget {
-    display: grid;
+    display: -ms-grid;
+    @supports (display: grid) {
+      display: grid;
+    }
     grid-template-rows: 210px 1fr;
     overflow: hidden;
     @include widget-shadow;
@@ -65,7 +68,6 @@
     /*
      * For IE10+
      */
-    display: -ms-grid;
     -ms-grid-rows: 210px 1fr;
     -ms-grid-columns: 1fr;
 
diff --git a/client/src/pages/book.vue b/client/src/pages/book.vue
index 8020e093..01c57e0a 100644
--- a/client/src/pages/book.vue
+++ b/client/src/pages/book.vue
@@ -22,7 +22,10 @@
 
 <style scoped lang="scss">
   .book {
-    display: grid;
+    display: -ms-grid;
+    @supports (display: grid) {
+      display: grid;
+    }
     grid-template-columns: 305px 1fr;
   }
 </style>
diff --git a/client/src/pages/module.vue b/client/src/pages/module.vue
index 8032fe54..5822fea5 100644
--- a/client/src/pages/module.vue
+++ b/client/src/pages/module.vue
@@ -51,14 +51,16 @@
 
 <style scoped lang="scss">
   .module-page {
-    display: grid;
+    display: -ms-grid;
+    @supports (display: grid) {
+      display: grid;
+    }
     justify-items: center;
     grid-template-columns: 2fr 6fr 2fr;
-    
+
     /*
      * For IE10+
      */
-    display: -ms-grid;
     -ms-grid-columns: 2fr 6fr 2fr;
 
     & > :nth-child(1) {
diff --git a/client/src/pages/rooms.vue b/client/src/pages/rooms.vue
index 2e8fcb04..23f1ddf4 100644
--- a/client/src/pages/rooms.vue
+++ b/client/src/pages/rooms.vue
@@ -45,7 +45,10 @@
 
 <style scoped lang="scss">
   .rooms-page {
-    display: grid;
+    display: -ms-grid;
+    @supports (display: grid) {
+      display: grid;
+    }
     grid-template-columns: repeat(3, 1fr);
     grid-column-gap: 30px;
     grid-row-gap: 30px;
@@ -59,7 +62,6 @@
     /*
      * For IE10+
      */
-    display: -ms-grid;
     -ms-grid-columns: 1fr 1fr 1fr;
     -ms-grid-rows: 260px;
 
diff --git a/client/src/pages/topic.vue b/client/src/pages/topic.vue
index c010dad6..e2dacbf0 100644
--- a/client/src/pages/topic.vue
+++ b/client/src/pages/topic.vue
@@ -2,7 +2,9 @@
   <div class="topic">
     <h1 class="topic__title">Berufliche Grundbildung</h1>
     <p class="topic__teaser">
-      Die berufliche Grundbildung lehrt Sie, den Arbeitsalltag erfolgreich zu bewältigen, Ihre Fähigkeiten zu entwickeln und beruflich flexibel zu sein. Ebenso wichtig ist der Umgang mit verschiedensten Mitmenschen. Eine angemessene mündliche Kommunikation erleichtert
+      Die berufliche Grundbildung lehrt Sie, den Arbeitsalltag erfolgreich zu bewältigen, Ihre Fähigkeiten zu entwickeln
+      und beruflich flexibel zu sein. Ebenso wichtig ist der Umgang mit verschiedensten Mitmenschen. Eine angemessene
+      mündliche Kommunikation erleichtert
       das Zusammenleben und Zusammenarbeiten.
     </p>
     <div class="topic__modules">
@@ -37,7 +39,10 @@
 
     &__modules {
       margin-top: 40px;
-      display: grid;
+      display: -ms-grid;
+      @supports (display: grid) {
+        display: grid;
+      }
       grid-template-columns: repeat(3, 1fr);
       grid-column-gap: 40px;
     }