diff --git a/client/src/components/Chapter.vue b/client/src/components/Chapter.vue
index 05a731db..00e6bbf9 100644
--- a/client/src/components/Chapter.vue
+++ b/client/src/components/Chapter.vue
@@ -6,6 +6,8 @@
       {{chapter.description}}
     </p>
 
+    <add-content-block-button :parent="chapter.id"></add-content-block-button>
+
     <content-block :contentBlock="contentBlock"
                    :key="contentBlock.id" v-for="contentBlock in filteredContentBlocks">
     </content-block>
@@ -14,12 +16,14 @@
 
 <script>
   import ContentBlock from '@/components/ContentBlock';
+  import AddContentBlockButton from '@/components/AddContentBlockButton';
 
   export default {
     props: ['chapter', 'index'],
 
     components: {
       ContentBlock,
+      AddContentBlockButton
     },
 
     computed: {
diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index d2edeabc..9dc3c2c1 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -25,7 +25,7 @@
 
     </div>
 
-    <add-content-block-button v-if="canChangeContentBlock" :after="contentBlock.id"></add-content-block-button>
+    <add-content-block-button :after="contentBlock.id"></add-content-block-button>
 
   </div>
 
diff --git a/server/assignments/migrations/0001_initial.py b/server/assignments/migrations/0001_initial.py
index 1bfe640b..356aeaff 100644
--- a/server/assignments/migrations/0001_initial.py
+++ b/server/assignments/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/server/assignments/migrations/0002_auto_20181005_0924.py b/server/assignments/migrations/0002_auto_20181009_1525.py
similarity index 95%
rename from server/assignments/migrations/0002_auto_20181005_0924.py
rename to server/assignments/migrations/0002_auto_20181009_1525.py
index e6c5cc4d..84f1ff77 100644
--- a/server/assignments/migrations/0002_auto_20181005_0924.py
+++ b/server/assignments/migrations/0002_auto_20181009_1525.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.conf import settings
 from django.db import migrations, models
@@ -10,9 +10,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('books', '0001_initial'),
         ('assignments', '0001_initial'),
+        ('books', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
diff --git a/server/books/migrations/0001_initial.py b/server/books/migrations/0001_initial.py
index 37ceb583..a4a282c2 100644
--- a/server/books/migrations/0001_initial.py
+++ b/server/books/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('wagtailcore', '0040_page_draft_title'),
         ('wagtailimages', '0021_image_file_hash'),
+        ('wagtailcore', '0040_page_draft_title'),
     ]
 
     operations = [
@@ -46,6 +46,7 @@ class Migration(migrations.Migration):
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
                 ('contents', wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())])), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('assignment', wagtail.core.blocks.StructBlock([('assignment_id', wagtail.core.blocks.IntegerBlock())])), ('image_block', wagtail.images.blocks.ImageChooserBlock()), ('image_url_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('task', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='tick')), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())]))], blank=True, null=True)),
                 ('type', models.CharField(choices=[('plain', 'Normal'), ('yellow', 'Gelb'), ('green', 'Grün'), ('blue', 'Blau')], default='plain', max_length=100)),
+                ('hide_in_admin', models.BooleanField(default=False)),
             ],
             options={
                 'verbose_name': 'Inhaltsblock',
diff --git a/server/books/migrations/0002_contentblock_hidden_for.py b/server/books/migrations/0002_contentblock_hidden_for.py
index b3902d67..3b0ef34b 100644
--- a/server/books/migrations/0002_contentblock_hidden_for.py
+++ b/server/books/migrations/0002_contentblock_hidden_for.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.db import migrations, models
 
@@ -8,8 +8,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('books', '0001_initial'),
         ('user', '0001_initial'),
+        ('books', '0001_initial'),
     ]
 
     operations = [
diff --git a/server/books/models/contentblock.py b/server/books/models/contentblock.py
index 7f9f81f4..247b655a 100644
--- a/server/books/models/contentblock.py
+++ b/server/books/models/contentblock.py
@@ -4,6 +4,7 @@ from django.db import models
 from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList, StreamFieldPanel
 from wagtail.core.fields import StreamField
 from wagtail.images.blocks import ImageChooserBlock
+from wagtail.core import hooks
 
 from books.blocks import TextBlock, BasicKnowledgeBlock, LinkBlock, VideoBlock, DocumentBlock, \
     ImageUrlBlock, AssignmentBlock
@@ -65,7 +66,16 @@ class ContentBlock(StrictHierarchyPage):
         ObjectList(settings_panels, heading='Settings'),
     ])
 
+    hide_in_admin = models.BooleanField(default=False)
+
     template = 'generic_page.html'
 
     parent_page_types = ['books.Chapter']
     subpage_types = []
+
+
+@hooks.register('construct_explorer_page_queryset')
+def remove_user_created_content_blocks_from_menu(parent_page, pages, request):
+    if parent_page.content_type.model == 'chapter':
+        return ContentBlock.get_by_parent(parent_page.specific).exclude(hide_in_admin=True)
+    return pages
diff --git a/server/books/schema/mutations/contentblock.py b/server/books/schema/mutations/contentblock.py
index 57478e10..046fde65 100644
--- a/server/books/schema/mutations/contentblock.py
+++ b/server/books/schema/mutations/contentblock.py
@@ -74,7 +74,7 @@ class AddContentBlock(relay.ClientIDMutation):
         title = content_block_data.get('title')
         contents = content_block_data.get('contents')
 
-        new_content_block = ContentBlock(title=title)
+        new_content_block = ContentBlock(title=title, hide_in_admin=True)
 
         if parent is not None:
             parent_chapter = get_object(Chapter, parent).specific
diff --git a/server/books/schema/queries.py b/server/books/schema/queries.py
index 3f2754d5..fe869107 100644
--- a/server/books/schema/queries.py
+++ b/server/books/schema/queries.py
@@ -10,7 +10,7 @@ class ContentBlockNode(DjangoObjectType):
     class Meta:
         model = ContentBlock
         only_fields = [
-            'slug', 'title', 'type', 'contents', 'hidden_for'
+            'slug', 'title', 'type', 'contents', 'hidden_for',
         ]
         filter_fields = [
             'slug', 'title',
diff --git a/server/objectives/migrations/0001_initial.py b/server/objectives/migrations/0001_initial.py
index e89acc5a..3ab6d8b8 100644
--- a/server/objectives/migrations/0001_initial.py
+++ b/server/objectives/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/server/objectives/migrations/0002_auto_20181005_0924.py b/server/objectives/migrations/0002_auto_20181009_1525.py
similarity index 96%
rename from server/objectives/migrations/0002_auto_20181005_0924.py
rename to server/objectives/migrations/0002_auto_20181009_1525.py
index d593bfc1..7e1f811b 100644
--- a/server/objectives/migrations/0002_auto_20181005_0924.py
+++ b/server/objectives/migrations/0002_auto_20181009_1525.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.conf import settings
 from django.db import migrations, models
@@ -10,9 +10,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('books', '0002_contentblock_hidden_for'),
         ('objectives', '0001_initial'),
+        ('books', '0002_contentblock_hidden_for'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
diff --git a/server/rooms/migrations/0001_initial.py b/server/rooms/migrations/0001_initial.py
index 6709d0d1..c3061660 100644
--- a/server/rooms/migrations/0001_initial.py
+++ b/server/rooms/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.db import migrations, models
 import django_extensions.db.fields
diff --git a/server/rooms/migrations/0002_auto_20181005_0924.py b/server/rooms/migrations/0002_auto_20181009_1525.py
similarity index 95%
rename from server/rooms/migrations/0002_auto_20181005_0924.py
rename to server/rooms/migrations/0002_auto_20181009_1525.py
index 033307c4..b198e28d 100644
--- a/server/rooms/migrations/0002_auto_20181005_0924.py
+++ b/server/rooms/migrations/0002_auto_20181009_1525.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.conf import settings
 from django.db import migrations, models
@@ -10,9 +10,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('rooms', '0001_initial'),
         ('user', '0001_initial'),
+        ('rooms', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
diff --git a/server/user/migrations/0001_initial.py b/server/user/migrations/0001_initial.py
index 4657799e..4f1616e7 100644
--- a/server/user/migrations/0001_initial.py
+++ b/server/user/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-05 09:24
+# Generated by Django 2.0.6 on 2018-10-09 15:25
 
 from django.conf import settings
 import django.contrib.auth.models
@@ -60,7 +60,7 @@ class Migration(migrations.Migration):
                 ('year', models.PositiveIntegerField(validators=[django.core.validators.MinValueValidator(1900), django.core.validators.MaxValueValidator(2200)])),
                 ('is_deleted', models.BooleanField(default=False)),
                 ('school', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.School')),
-                ('users', models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
+                ('users', models.ManyToManyField(related_name='school_classes', to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(