diff --git a/server/basicknowledge/wagtail_hooks.py b/server/basicknowledge/wagtail_hooks.py
index 7071380e..bc844fe2 100644
--- a/server/basicknowledge/wagtail_hooks.py
+++ b/server/basicknowledge/wagtail_hooks.py
@@ -5,7 +5,7 @@ from .models import BasicKnowledge
 class InstrumentAdmin(ModelAdmin):
     model = BasicKnowledge
     menu_label = 'Instruments'
-    list_display = ('title',)
+    list_display = ('title', 'new_type')
 
 
 modeladmin_register(InstrumentAdmin)
diff --git a/server/books/models/contentblock.py b/server/books/models/contentblock.py
index f3050ece..bae27e2c 100644
--- a/server/books/models/contentblock.py
+++ b/server/books/models/contentblock.py
@@ -5,6 +5,7 @@ from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList,
 from wagtail.core.blocks import StreamBlock
 from wagtail.core.fields import StreamField
 from wagtail.images.blocks import ImageChooserBlock
+from wagtail.admin.edit_handlers import CommentPanel
 
 from books.blocks import TextBlock, BasicKnowledgeBlock, LinkBlock, VideoBlock, DocumentBlock, \
     ImageUrlBlock, AssignmentBlock, InfogramBlock, GeniallyBlock, SubtitleBlock, SurveyBlock, ModuleRoomSlugBlock, \
@@ -81,16 +82,15 @@ class ContentBlock(StrictHierarchyPage):
     ]
 
     settings_panels = [
-        FieldPanel('slug')
+        FieldPanel('slug'),
+        CommentPanel()
     ]
-
+    #
     edit_handler = TabbedInterface([
         ObjectList(content_panels, heading='Content'),
         ObjectList(settings_panels, heading='Settings'),
     ])
 
-    template = 'generic_page.html'
-
     parent_page_types = ['books.Chapter']
     subpage_types = []