diff --git a/components/AddClosedEndedQuestion.vue b/components/AddClosedEndedQuestion.vue
index 9794c9a..37300de 100644
--- a/components/AddClosedEndedQuestion.vue
+++ b/components/AddClosedEndedQuestion.vue
@@ -52,7 +52,7 @@ import { collection, doc, addDoc, writeBatch } from 'firebase/firestore'
 // https://vee-validate.logaretm.com/v3/guide/basics.html
 import { ValidationProvider, ValidationObserver, extend } from 'vee-validate'
 import { required } from 'vee-validate/dist/rules'
-import { ClosedEndedQuestion, ClosedEndedQuestionConverter } from '~/plugins/closed-ended-question'
+import { ClosedEndedQuestion, ClosedEndedQuestionConverter, states } from '~/plugins/closed-ended-question'
 
 // Override the default error message of required fields
 extend('required', {
@@ -75,6 +75,11 @@ export default {
     }
   },
   methods: {
+    isAuthorized () {
+      const isTutor = this.$auth.currentUser.email.endsWith('@iu.org')
+      const isAdmin = this.$store.getters.isAdmin
+      return isTutor || isAdmin
+    },
     submit () {
       this.loading = true
 
@@ -86,14 +91,17 @@ export default {
         this.$auth.currentUser.uid, // Ref: https://firebase.google.com/docs/reference/js/v8/firebase.User
         Date.now() / 1000, // Current UNIX timestamp in seconds
         this.comment ? [this.comment] : [],
-        'neu'
+        this.isAuthorized() ? states.approved : states.new
       )
 
       // Add a new document with a generated id
       addDoc(collection(this.$db, `kurse/${this.$store.state.selectedCourse}/fragenGeschlossen`).withConverter(ClosedEndedQuestionConverter), q)
       .then((docRef) => {
         // Successfully added new question to database
-        this.$toast({ content: 'Deine Frage wurde eingereicht!', color: 'success' })
+        const content = this.isAuthorized()
+          ? 'Die Frage wurde hinzugefügt!'
+          : 'Deine Frage wurde eingereicht und wartet auf Bestätigung durch den Tutor!'
+        this.$toast({ content, color: 'success' })
       })
       .catch((error) => {
         // Failed to add question to database; display error message
@@ -131,7 +139,7 @@ export default {
           this.$auth.currentUser.uid, // Ref: https://firebase.google.com/docs/reference/js/v8/firebase.User
           Date.now() / 1000, // Current UNIX timestamp in seconds
           [],
-          'genehmigt'
+          states.approved
         )
 
         const questionRef = doc(collection(this.$db, `kurse/${this.$store.state.selectedCourse}/fragenGeschlossen`).withConverter(ClosedEndedQuestionConverter))
diff --git a/components/Challenge.vue b/components/Challenge.vue
new file mode 100644
index 0000000..a45c3de
--- /dev/null
+++ b/components/Challenge.vue
@@ -0,0 +1,35 @@
+<template>
+  <v-container fluid>
+    <v-subheader class="text-h5 text--primary">Challenge</v-subheader>
+    <v-divider></v-divider>
+    <v-btn depressed color="success" class="my-3" @click="playVersus">
+      <v-icon left>mdi-play</v-icon>
+      Quiz Spielen
+    </v-btn>
+    <AddClosedEndedQuestion />
+  </v-container>
+</template>
+
+<script>
+export default {
+  name: 'ChallengeComponent',
+  props: {
+    courseId: {
+      type: String,
+      required: true
+    }
+  },
+  data () {
+    return {
+    }
+  },
+  created () {
+  },
+  methods: {
+    playVersus () {
+      // TODO
+      this.$router.push(`${this.$route.path}/play`)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/components/Coop.vue b/components/Coop.vue
index b874841..2a14eb3 100644
--- a/components/Coop.vue
+++ b/components/Coop.vue
@@ -1,17 +1,22 @@
 <template>
-  <v-expansion-panels>
-    <v-expansion-panel
-      v-for="(item, i) in questions"
-      :key="i"
-    >
-      <v-expansion-panel-header>
-        {{ item.question }}
-      </v-expansion-panel-header>
-      <v-expansion-panel-content class="text-pre-wrap">
-        <div class="text-pre-wrap">{{ item.solution }}</div>
-      </v-expansion-panel-content>
-    </v-expansion-panel>
-  </v-expansion-panels>
+  <v-container fluid>
+    <v-subheader class="text-h5 text--primary">Offene Fragen</v-subheader>
+    <v-divider></v-divider>
+    <v-expansion-panels focusable class="my-3">
+      <v-expansion-panel
+        v-for="(item, i) in questions"
+        :key="i"
+      >
+        <v-expansion-panel-header>
+          {{ item.question }}
+        </v-expansion-panel-header>
+        <v-expansion-panel-content class="text-pre-wrap">
+          <div class="text-pre-wrap">{{ item.solution }}</div>
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+    </v-expansion-panels>
+    <AddOpenEndedQuestion />
+  </v-container>
 </template>
 
 <script>
@@ -21,7 +26,7 @@ import { OpenEndedQuestionConverter } from '~/plugins/open-ended-question'
 export default {
   name: 'CoopComponent',
   props: {
-    courseID: {
+    courseId: {
       type: String,
       required: true
     }
@@ -37,7 +42,7 @@ export default {
   methods: {
     getQuestions () {
       // Create a reference to the open-ended questions collection of the currently selected course
-      const questionsRef = collection(this.$db, `kurse/${this.courseID}/fragenOffen`).withConverter(OpenEndedQuestionConverter)
+      const questionsRef = collection(this.$db, `kurse/${this.courseId}/fragenOffen`).withConverter(OpenEndedQuestionConverter)
 
       // Execute the query
       getDocs(questionsRef).then((querySnapshot) => {
diff --git a/components/DemoInfoDialog.vue b/components/DemoInfoDialog.vue
index 93da611..b08d0f5 100644
--- a/components/DemoInfoDialog.vue
+++ b/components/DemoInfoDialog.vue
@@ -3,9 +3,9 @@
 <template>
   <v-dialog v-model="show" width="500">
     <template #activator="{ on, attrs }">
-      <v-btn fixed top left dark color="red lighten-2" v-bind="attrs" v-on="on">
+      <v-btn fixed top dark color="red lighten-2" :style="{left: '50%', transform:'translateX(-50%)'}" v-bind="attrs" v-on="on">
         <v-icon left>mdi-alert-circle-outline</v-icon>
-        Demo-Account Info
+        Mit Demo-Account Anmelden
       </v-btn>
     </template>
     <v-card elevation="12" class="mx-auto">
@@ -44,7 +44,6 @@
 
 <script>
 import { signInWithEmailAndPassword } from 'firebase/auth'
-export const demoAccounts = ['max.muster.test@iubh-fernstudium.de', 'tutor.test@iu.org', 'admin.test@iu.org']
 
 export default {
   data () {
diff --git a/pages/courses/_course.vue b/pages/courses/_course.vue
index 630a629..598b628 100644
--- a/pages/courses/_course.vue
+++ b/pages/courses/_course.vue
@@ -1,10 +1,5 @@
 <template>
   <v-container fluid fill-height>
-    <v-row>
-      <v-col cols="12">
-        <span class="text-h4">{{ title }}</span>
-      </v-col>
-    </v-row>
     <NuxtChild />
   </v-container>
 </template>
@@ -16,20 +11,8 @@ export default {
       courseID: undefined
     }
   },
-  computed: {
-    title () {
-      const courseName = this.$store.getters.getCourseByID(this.courseID).name
-      return `${this.courseID.toUpperCase()} - ${courseName}`
-    }
-  },
   created () {
     this.courseID = this.$route.params.course
   }
 }
 </script>
-
-<style>
-.tete {
-  flex: 1 1 auto;
-}
-</style>
\ No newline at end of file
diff --git a/pages/courses/_course/index.vue b/pages/courses/_course/index.vue
index 6c5a7a0..68fef82 100644
--- a/pages/courses/_course/index.vue
+++ b/pages/courses/_course/index.vue
@@ -1,19 +1,22 @@
 <template>
-  <v-container>
-    <v-row>
-      <v-col cols="auto">
-        <v-btn depressed color="primary" @click="playVersus">Challenge Mode</v-btn>
-      </v-col>
-      <v-col cols="12">
-        <Coop :courseID="courseID" />
-      </v-col>
-      <v-col cols="12">
-        <AddClosedEndedQuestion />
-      </v-col>
-      <v-col cols="12">
-        <AddOpenEndedQuestion />
-      </v-col>
-    </v-row>
+  <v-container fluid class="pa-0">
+    <v-sheet class="rounded-lg pa-2">
+      <span class="text-h4 text--secondary">{{ courseID.toUpperCase() }}</span>
+      <span class="text-h4">{{ $store.getters.getCourseByID(courseID).name }}</span>
+    </v-sheet>
+    <v-container>
+      <v-row>
+        <v-col v-if="isAuthorized" cols="12">
+          <TutorPanel :course-id="courseID" />
+        </v-col>
+        <v-col cols="12">
+          <Challenge :course-id="courseID" />
+        </v-col>
+        <v-col cols="12">
+          <Coop :course-id="courseID" />
+        </v-col>
+      </v-row>
+    </v-container>
   </v-container>
 </template>
 
@@ -26,15 +29,14 @@ export default {
     }
   },
   computed: {
+    isAuthorized () {
+      const isTutor = this.$auth.currentUser.email.endsWith('@iu.org')
+      const isAdmin = this.$store.getters.isAdmin
+      return isTutor || isAdmin
+    }
   },
   created () {
     this.courseID = this.$route.params.course
-  },
-  methods: {
-    playVersus () {
-      // TODO
-      this.$router.push(`${this.$route.path}/play`)
-    }
   }
 }
 </script>
diff --git a/pages/courses/_course/play.vue b/pages/courses/_course/play.vue
index 151efb8..69f7878 100644
--- a/pages/courses/_course/play.vue
+++ b/pages/courses/_course/play.vue
@@ -41,7 +41,7 @@ import {
 import _sampleSize from 'lodash-es/sampleSize'
 import _shuffle from 'lodash-es/shuffle'
 import _capitalize from 'lodash-es/capitalize'
-import { ClosedEndedQuestionConverter } from '~/plugins/closed-ended-question'
+import { ClosedEndedQuestionConverter, states } from '~/plugins/closed-ended-question'
 import { Game, GameConverter } from '~/plugins/game'
 
 export default {
@@ -101,7 +101,7 @@ export default {
 
       // Create a query against the collection.
       // Only questions with the status "approved" (=genehmigt) should be fetched from the database
-      const q = query(questionsRef, where('status', '==', 'genehmigt'))
+      const q = query(questionsRef, where('status', '==', states.approved))
 
       // Execute the query
       return getDocs(q).then((querySnapshot) => {
diff --git a/plugins/closed-ended-question.js b/plugins/closed-ended-question.js
index 8d56c7d..eb042d7 100644
--- a/plugins/closed-ended-question.js
+++ b/plugins/closed-ended-question.js
@@ -11,6 +11,12 @@ export class ClosedEndedQuestion {
   }
 }
 
+export const states = {
+  new: 'neu',
+  approved: 'genehmigt',
+  declined: 'abgelehnt'
+}
+
 // Firestore data converter
 export const ClosedEndedQuestionConverter = {
   toFirestore: (closedEndedQuestion) => {