diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html
index 671d894e..45b30cad 100644
--- a/datacenterlight/templates/datacenterlight/base.html
+++ b/datacenterlight/templates/datacenterlight/base.html
@@ -10,7 +10,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="Data Center Light by ungleich">
         <meta name="author" content="ungleich GmbH">
-
+        {% cms_toolbar %}
         <title>Data Center Light -
         {% block title %}VM hosting made in Switzerland{% endblock %}</title>
         <!-- Bootstrap Core CSS -->
@@ -41,7 +41,6 @@
     </head>
 
     <body>
-        {% cms_toolbar %}
         <!-- Navigation -->
         {% include "datacenterlight/includes/_navbar.html" %}
 
diff --git a/datacenterlight/templates/datacenterlight/cms_page.html b/datacenterlight/templates/datacenterlight/cms_page.html
index f42528e4..3e3b038a 100644
--- a/datacenterlight/templates/datacenterlight/cms_page.html
+++ b/datacenterlight/templates/datacenterlight/cms_page.html
@@ -1,17 +1,19 @@
 {% extends "datacenterlight/base.html" %}
 {% load staticfiles cms_tags sekizai_tags %}
+{% block title %}
+{% page_attribute page_title %}
+{% endblock %}
 {% block content %}
 {% addtoblock "css" %}
 <link href="{% static 'datacenterlight/css/cms.css' %}" media="screen" rel="stylesheet" type="text/css"/>
 {% endaddtoblock %}
-
 <div class="dcl-cms_page-full-width">
     <div class="dcl-cms_page-header">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 col-md-12">
                     <div class="single-heading">
-                        <h2>{% placeholder 'datacenterlight_cms_page_title' %}</h2>
+                        <h2>{% page_attribute page_title %}</h2>
                     </div>
                 </div>
             </div>
