diff --git a/cms/apps.py b/cms/apps.py
index 160100e..6807913 100644
--- a/cms/apps.py
+++ b/cms/apps.py
@@ -7,6 +7,4 @@ class CmsConfig(AppConfig):
     verbose_name = _('Content Management System')
 
     def ready(self):
-        # Need to load view models of all installed apps to make the
-        # register_view decorator work
-        autodiscover_modules('views')
+        autodiscover_modules('cms')
diff --git a/cms/templates/cms/base.html b/cms/templates/cms/base.html
index b7e86cf..d8df9e7 100644
--- a/cms/templates/cms/base.html
+++ b/cms/templates/cms/base.html
@@ -12,7 +12,7 @@
     <link rel="icon" href="{% static 'favicon.png' %}">
     {% block extrahead %}{% endblock %}
   </head>
-  <body>
+  <body class="{% block bodyclass %}{% endblock %}">
 
     <main>
       {% block main %}
diff --git a/cms/templates/cms/sections/section.html b/cms/templates/cms/sections/section.html
index 7fe875c..34f1aee 100644
--- a/cms/templates/cms/sections/section.html
+++ b/cms/templates/cms/sections/section.html
@@ -38,6 +38,9 @@
       </div>
     {% endif %}
 
-    {% include 'cms/editlink.html' %}
+    {% if request.user.is_staff %}
+      <a class="edit" href="edit/{{section.number}}/">{% trans 'edit' %}</a>
+    {% endif %}
+
   </div>
 </section>
