diff --git a/cms/static/cms/cms.scss b/cms/static/cms/cms.scss
index cf043de..33b530d 100644
--- a/cms/static/cms/cms.scss
+++ b/cms/static/cms/cms.scss
@@ -9,6 +9,7 @@ html, body {
 }
 
 div.wrapper {
+  box-sizing: border-box;
   max-width: 700px;
   margin: auto;
   padding: 0 1rem;
@@ -19,7 +20,7 @@ div.spacer {
   clear: both;
 }
 
-header, section, footer {
+header, nav, section, footer {
   padding: 1rem;
 }
 
@@ -119,6 +120,7 @@ div.edit {
     position: fixed;
     left: 1em;
     top: 1em;
+    z-index: 1000;
   }
 }
 
@@ -126,6 +128,7 @@ div.edit a, div.edit button, a.edit{
   font-size: 1rem !important;
   font-weight: normal !important;
   color: red !important;
+  text-transform: none !important;
   text-decoration: none;
   color: inherit;
   border: none;
diff --git a/cms/static/cms/cms.scss.css b/cms/static/cms/cms.scss.css
index 7ee07d1..5bca308 100644
--- a/cms/static/cms/cms.scss.css
+++ b/cms/static/cms/cms.scss.css
@@ -4,6 +4,7 @@ html, body {
   padding: 0; }
 
 div.wrapper {
+  box-sizing: border-box;
   max-width: 700px;
   margin: auto;
   padding: 0 1rem; }
@@ -12,7 +13,7 @@ div.spacer {
   height: 1rem;
   clear: both; }
 
-header, section, footer {
+header, nav, section, footer {
   padding: 1rem; }
 
 @media (min-width: 500px) {
@@ -84,12 +85,14 @@ div.edit {
   div.edit.page {
     position: fixed;
     left: 1em;
-    top: 1em; }
+    top: 1em;
+    z-index: 1000; }
 
 div.edit a, div.edit button, a.edit {
   font-size: 1rem !important;
   font-weight: normal !important;
   color: red !important;
+  text-transform: none !important;
   text-decoration: none;
   color: inherit;
   border: none;
diff --git a/cms/static/cms/cms.scss.css.map b/cms/static/cms/cms.scss.css.map
index 4a6335c..9980f5a 100644
--- a/cms/static/cms/cms.scss.css.map
+++ b/cms/static/cms/cms.scss.css.map
@@ -5,5 +5,5 @@
 		"cms.scss"
 	],
 	"names": [],
-	"mappings": "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"
+	"mappings": "AAIA,AAAA,IAAI,EAAE,IAAI,CAAC;EACT,WAAW,EALN,UAAU;EAMf,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,GAAG,AAAA,QAAQ,CAAC;EACV,UAAU,EAAE,UAAU;EACtB,SAAS,EAAE,KAAK;EAChB,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,MAAM,GAChB;;AAED,AAAA,GAAG,AAAA,OAAO,CAAC;EACT,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC;EAC3B,OAAO,EAAE,IAAI,GACd;;AAGC,MAAM,EAAC,SAAS,EAAE,KAAK;EADzB,AAEI,GAFD,CAEC,MAAM,AAAA,UAAU,CAAC;IACf,OAAO,EAAE,IAAI,GACd;EAJL,AAKI,GALD,CAKC,EAAE,AAAA,KAAK,CAAC;IACN,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,MAAM,GAqBnB;IA9BL,AAWM,GAXH,CAKC,EAAE,AAAA,KAAK,CAML,EAAE,CAAC;MACD,MAAM,EAAE,GAAG;MACX,OAAO,EAAE,CAAC;MACV,OAAO,EAAE,YAAY,GAetB;MA7BP,AAgBQ,GAhBL,CAKC,EAAE,AAAA,KAAK,CAML,EAAE,CAKA,CAAC,CAAC;QACA,UAAU,EAAE,QAAQ;QACpB,OAAO,EAAE,YAAY;QACrB,eAAe,EAAE,IAAI;QACrB,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,MAAM,GAMlB;QA5BT,AAwBU,GAxBP,CAKC,EAAE,AAAA,KAAK,CAML,EAAE,CAKA,CAAC,AAQE,MAAM,EAxBjB,GAAG,CAKC,EAAE,AAAA,KAAK,CAML,EAAE,CAKA,CAAC,AAQW,QAAQ,CAAC;UACjB,SAAS,EAAE,UAAU;UACrB,gBAAgB,EAAE,MAAM,GACzB;;AAMT,MAAM,EAAC,SAAS,EAAE,KAAK;EAjCzB,AAkCI,GAlCD,CAkCC,MAAM,AAAA,UAAU,CAAC;IACf,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,CAAC;IACV,GAAG,EAAE,CAAC;IACN,KAAK,EAAE,CAAC,GAcT;IApDL,AAwCM,GAxCH,CAkCC,MAAM,AAAA,UAAU,CAMd,gBAAgB,EAxCtB,GAAG,CAkCC,MAAM,AAAA,UAAU,CAMI,gBAAgB,AAAA,OAAO,EAxC/C,GAAG,CAkCC,MAAM,AAAA,UAAU,CAM6B,gBAAgB,AAAA,MAAM,CAAC;MAChE,UAAU,EAAE,gBAAgB,GAC7B;IA1CP,AA2CM,GA3CH,CAkCC,MAAM,AAAA,UAAU,AASb,UAAU,CAAC;MACV,QAAQ,EAAE,KAAK,GAChB;IA7CP,AA8CM,GA9CH,CAkCC,MAAM,AAAA,UAAU,AAYb,MAAM,CAAC;MACN,OAAO,EAAE,YAAY,GACtB;IAhDP,AAiDM,GAjDH,CAkCC,MAAM,AAAA,UAAU,AAeb,MAAM,CAAC;MACN,OAAO,EAAE,eAAe,GACzB;EAnDP,AAsDI,GAtDD,CAsDC,EAAE,AAAA,KAAK,CAAC;IACN,QAAQ,EAAE,KAAK;IACf,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,WAAW,EAAE,GAAG;IAChB,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,UAAU,EAAE,KAAK;IACjB,UAAU,EAAE,IAAI;IAehB,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,gBAAgB,GAI5B;IAtFL,AAoEM,GApEH,CAsDC,EAAE,AAAA,KAAK,CAcL,EAAE,CAAC;MACD,OAAO,EAAE,GAAG;MACZ,MAAM,EAAE,KAAK;MACb,aAAa,EAAE,cAAc;MAC7B,WAAW,EAAE,GAAG;MAChB,UAAU,EAAE,MAAM,GAMnB;MA/EP,AA2EQ,GA3EL,CAsDC,EAAE,AAAA,KAAK,CAcL,EAAE,CAOA,CAAC,CAAC;QACA,KAAK,EAAE,KAAK;QACZ,eAAe,EAAE,IAAI,GACtB;IA9ET,AAmFM,GAnFH,CAsDC,EAAE,AAAA,KAAK,AA6BJ,QAAQ,CAAC;MACR,SAAS,EAAE,aAAa,GACzB;;AAKP,AAAA,GAAG,AAAA,KAAK,CAAC;EACP,UAAU,EAAE,MAAM,GAOnB;EARD,AAEE,GAFC,AAAA,KAAK,AAEL,KAAK,CAAC;IACL,QAAQ,EAAE,KAAK;IACf,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,GAAG;IACR,OAAO,EAAE,IAAI,GACd;;AAGH,AAAA,GAAG,AAAA,KAAK,CAAC,CAAC,EAAE,GAAG,AAAA,KAAK,CAAC,MAAM,EAAE,CAAC,AAAA,KAAK,CAAA;EACjC,SAAS,EAAE,eAAe;EAC1B,WAAW,EAAE,iBAAiB;EAC9B,KAAK,EAAE,cAAc;EACrB,cAAc,EAAE,eAAe;EAC/B,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,OAAO;EACd,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,MAAM;EACf,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC,GAQX;EApBD,AAcE,GAdC,AAAA,KAAK,CAAC,CAAC,AAcP,OAAO,EAdE,GAAG,AAAA,KAAK,CAAC,MAAM,AAcxB,OAAO,EAdmB,CAAC,AAAA,KAAK,AAchC,OAAO,CAAC;IACP,OAAO,EAAE,IAAI,GACd;EAhBH,AAiBE,GAjBC,AAAA,KAAK,CAAC,CAAC,AAiBP,MAAM,EAjBG,GAAG,AAAA,KAAK,CAAC,MAAM,AAiBxB,MAAM,EAjBoB,CAAC,AAAA,KAAK,AAiBhC,MAAM,CAAC;IACN,OAAO,EAAE,IAAI,GACd;;AAGH,AACE,OADK,CACL,OAAO,CAAC;EACN,KAAK,EAAE,IAAI,GAwFZ;EA1FH,AAII,OAJG,CACL,OAAO,CAGL,GAAG,AAAA,YAAY,CAAC;IACd,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,eAAe,EAAE,aAAa,GAuC/B;IA9CL,AASM,OATC,CACL,OAAO,CAGL,GAAG,AAAA,YAAY,CAKb,GAAG,AAAA,WAAW,CAAC;MAIb,IAAI,EAAE,OAAO;MACb,aAAa,EAAE,GAAG;MAClB,UAAU,EAAE,UAAU,GA8BvB;MA7CP,AAUQ,OAVD,CACL,OAAO,CAGL,GAAG,AAAA,YAAY,CAKb,GAAG,AAAA,WAAW,CACZ,GAAG,AAAA,QAAQ,CAAC;QACV,OAAO,EAAE,CAAC,GACX;MAZT,AAiBQ,OAjBD,CACL,OAAO,CAGL,GAAG,AAAA,YAAY,CAKb,GAAG,AAAA,WAAW,CAQZ,GAAG,AAAA,MAAM,CAAC;QACR,SAAS,EAAE,KAAK,GACjB;MAnBT,AAqBQ,OArBD,CACL,OAAO,CAGL,GAAG,AAAA,YAAY,CAKb,GAAG,AAAA,WAAW,CAYZ,GAAG,AAAA,MAAM,CAAC;QACR,WAAW,EAAE,GAAG;QAChB,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE,QAAQ,GAanB;QArCT,AA0BU,OA1BH,CACL,OAAO,CAGL,GAAG,AAAA,YAAY,CAKb,GAAG,AAAA,WAAW,CAYZ,GAAG,AAAA,MAAM,CAKP,GAAG,CAAC;UACF,QAAQ,EAAE,QAAQ;UAClB,GAAG,EAAE,CAAC;UACN,IAAI,EAAE,CAAC;UACP,KAAK,EAAE,CAAC;UACR,MAAM,EAAE,CAAC;UACT,KAAK,EAAE,IAAI;UACX,MAAM,EAAE,IAAI;UACZ,UAAU,EAAE,KAAK;UACjB,eAAe,EAAE,MAAM,GACxB;MAGH,MAAM,EAAC,SAAS,EAAE,KAAK;QAvC/B,AASM,OATC,CACL,OAAO,CAGL,GAAG,AAAA,YAAY,CAKb,GAAG,AAAA,WAAW,CAAC;UA+BX,UAAU,EAAE,GAAG,GAKlB;MAHC,MAAM,EAAC,SAAS,EAAE,KAAK;QA1C/B,AASM,OATC,CACL,OAAO,CAGL,GAAG,AAAA,YAAY,CAKb,GAAG,AAAA,WAAW,CAAC;UAkCX,UAAU,EAAE,IAAI,GAEnB;EA7CP,AAiDM,OAjDC,CACL,OAAO,CA+CL,GAAG,AAAA,MAAM,CACP,GAAG,CAAC;IACF,KAAK,EAAE,IAAI,GACZ;EAnDP,AAsDI,OAtDG,CACL,OAAO,CAqDL,GAAG,AAAA,MAAM,CAAC;IACR,SAAS,EAAE,GAAG;IACd,UAAU,EAAE,MAAM,GACnB;EAzDL,AA+DM,OA/DC,CACL,OAAO,CA6DL,GAAG,AAAA,MAAM,CACP,GAAG,AAAA,OAAO,CAAC;IACT,KAAK,EAAE,IAAI;IACX,cAAc,EAAE,GAAG;IACnB,QAAQ,EAAE,QAAQ,GASnB;IA3EP,AAoEQ,OApED,CACL,OAAO,CA6DL,GAAG,AAAA,MAAM,CACP,GAAG,AAAA,OAAO,CAKR,MAAM,CAAC;MACL,QAAQ,EAAE,QAAQ;MAClB,KAAK,EAAE,IAAI;MACX,MAAM,EAAE,IAAI;MACZ,IAAI,EAAE,CAAC;MACP,GAAG,EAAE,CAAC,GACP;EA1ET,AA8EI,OA9EG,CACL,OAAO,CA6EL,GAAG,AAAA,OAAO,CAAC;IACT,UAAU,EAAE,MAAM,GAUnB;IAzFL,AAgFM,OAhFC,CACL,OAAO,CA6EL,GAAG,AAAA,OAAO,CAER,CAAC,CAAC;MACA,eAAe,EAAE,IAAI;MACrB,UAAU,EAAE,KAAK;MACjB,KAAK,EAAE,KAAK;MACZ,OAAO,EAAE,QAAQ;MACjB,SAAS,EAAE,KAAK;MAChB,aAAa,EAAE,GAAG;MAClB,OAAO,EAAE,YAAY,GACtB;;AAKP,mBAAmB;AAEnB,AACE,IADE,CACF,GAAG,AAAA,aAAa,CAAC;EACf,MAAM,EAAE,cAAc;EACtB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,SAAS;EACjB,UAAU,EAAE,KAAK;EACjB,KAAK,EAAE,GAAG;EACV,WAAW,EAAE,IAAI,GAClB;;AARH,AAUE,IAVE,CAUF,QAAQ,CAAC;EACP,OAAO,EAAE,GAAG;EACZ,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,GAAG,GAMnB;EApBH,AAiBI,IAjBA,CAUF,QAAQ,CAON,MAAM,CAAC;IACL,SAAS,EAAE,MAAM,GAClB;;AAnBL,AAsBE,IAtBE,CAsBF,GAAG,AAAA,UAAU,CAAC;EACZ,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,MAAM;EACf,SAAS,EAAE,CAAC,GACb;;AA1BH,AA2BE,IA3BE,CA2BF,GAAG,AAAA,UAAU,GAAG,CAAC,CAAC;EAChB,SAAS,EAAE,IAAI,GAChB;;AA7BH,AA8BE,IA9BE,CA8BF,GAAG,AAAA,UAAU,AAAA,MAAM,CAAC;EAClB,MAAM,EAAE,cAAc;EACtB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,KAAK,GAClB;;AAnCH,AAqCI,IArCA,CAoCF,GAAG,AAAA,UAAU,AAAA,SAAS,CACpB,GAAG,AAAA,MAAM,CAAC;EACR,WAAW,EAAE,GAAG,GACjB;;AAvCL,AAwCI,IAxCA,CAoCF,GAAG,AAAA,UAAU,AAAA,SAAS,CAIpB,KAAK,EAxCT,IAAI,CAoCF,GAAG,AAAA,UAAU,AAAA,SAAS,CAIb,MAAM,EAxCjB,IAAI,CAoCF,GAAG,AAAA,UAAU,AAAA,SAAS,CAIL,QAAQ,CAAC;EACtB,MAAM,EAAE,eAAe,GACxB;;AA1CL,AA6CE,IA7CE,CA6CF,GAAG,AAAA,MAAM,CAAC;EACR,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,GAAG,GACjB;;AAhDH,AAkDE,IAlDE,CAkDF,GAAG,AAAA,MAAM,CAAC;EACR,QAAQ,EAAE,MAAM;EAChB,MAAM,EAAE,KAAK,GACd;;AArDH,AAuDE,IAvDE,CAuDF,GAAG,AAAA,SAAS,EAvDd,IAAI,CAuDY,IAAI,AAAA,SAAS,CAAC;EAC1B,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,eAAe;EAC1B,WAAW,EAAE,cAAc,GAC5B;;AA3DH,AA6DE,IA7DE,CA6DF,IAAI,AAAA,SAAS,CAAC;EACZ,UAAU,EAAE,MAAM,GACnB;;AA/DH,AAiEE,IAjEE,CAiEF,KAAK,EAjEP,IAAI,CAiEK,MAAM,EAjEf,IAAI,CAiEa,QAAQ,CAAC;EACtB,UAAU,EAAE,KAAK;EACjB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,cAAc;EACtB,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,YAAY;EACpB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,UAAU;EACtB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,GAAG,GACb;;AA3EH,AA6EE,IA7EE,CA6EF,GAAG,AAAA,uBAAuB,CAAC;EACzB,OAAO,EAAE,gBAAgB,GAC1B;;AA/EH,AAgFE,IAhFE,CAgFF,GAAG,AAAA,WAAW,CAAC;EACb,UAAU,EAAE,qBAAqB;EACjC,MAAM,EAAE,yBAAyB,GAClC;;AAnFH,AAqFE,IArFE,CAqFF,KAAK,CAAA,AAAA,IAAC,CAAD,QAAC,AAAA,EAAe;EACnB,KAAK,EAAE,IAAI,GACZ;;AAvFH,AAyFE,IAzFE,CAyFF,MAAM,CAAC;EACL,UAAU,EAAE,KAAK,GAClB;;AA3FH,AA6FE,IA7FE,CA6FF,GAAG,AAAA,UAAU,CAAC;EACZ,MAAM,EAAE,cAAc;EACtB,UAAU,EAAE,KAAK;EACjB,OAAO,EAAE,GAAG,GAGb;EAnGH,AAkGI,IAlGA,CA6FF,GAAG,AAAA,UAAU,CAKX,KAAK,CAAC;IAAE,MAAM,EAAE,IAAK,GAAE;;AAlG3B,AAqGE,IArGE,CAqGF,EAAE,AAAA,UAAU,CAAC;EACX,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,GAAG;EAClB,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,GAAG;EACV,SAAS,EAAE,eAAe,GAM3B;EAjHH,AA6GI,IA7GA,CAqGF,EAAE,AAAA,UAAU,CAQV,EAAE,CAAC;IACD,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC,GACX;;AAhHL,AAmHE,IAnHE,CAmHF,OAAO,CAAC;EACN,KAAK,EAAE,GAAG;EACV,WAAW,EAAE,IAAI,GAClB"
 }
\ No newline at end of file
diff --git a/cms/templates/cms/edit.html b/cms/templates/cms/edit.html
index e89726e..2d0cd73 100644
--- a/cms/templates/cms/edit.html
+++ b/cms/templates/cms/edit.html
@@ -55,3 +55,25 @@
     </div>
   </form>
 {% endblock %}
+
+{% block extrabody %}
+  <script type="text/javascript" src="/static/admin/js/urlify.js"></script>
+  <script>
+    /* My own implementation of Django's prepopulate.js */
+
+    var slugfield = document.getElementById('id_slug');
+    var titlefield = document.getElementById('id_title');
+
+    if (slugfield && titlefield) {
+        var virgin = slugfield.value === '';
+
+        if (virgin) {
+            titlefield.addEventListener('input', function(event) {
+                if (virgin) {
+                    slugfield.value = URLify(titlefield.value);
+                }
+            });
+        }
+    }
+  </script>
+{% endblock %}
diff --git a/cms/templates/cms/page.html b/cms/templates/cms/page.html
index ec26fcc..4ba1fda 100644
--- a/cms/templates/cms/page.html
+++ b/cms/templates/cms/page.html
@@ -1,13 +1,13 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
-{% block title %}{{block.super}} - {{object.title}}{% endblock %}
+{% block title %}{{block.super}} - {{page.title}}{% endblock %}
 
 {% block content %}
   <div class="edit page">
     {% if user.is_staff %}
-      {% if object.slug %}
-        <a href="{% url 'cms:updatepage' object.pk %}">{% trans 'edit this page' %}</a>
+      {% if page.slug %}
+        <a href="{% url 'cms:updatepage' page.pk %}">{% trans 'edit this page' %}</a>
       {% else %}
         <a href="{% url 'cms:updatehomepage' %}">{% trans 'edit this page' %}</a>
       {% endif %}
@@ -16,7 +16,7 @@
     {% endif %}
   </div>
 
-  {% for section in object.sections.all %}
+  {% for section in sections %}
     <section class="{{section.type}} color{{section.color}}">
       {% include 'cms/sections/'|add:section.type|add:'.html' %}
     </section>
@@ -26,7 +26,7 @@
     <section>
       <div class="wrapper">
         <div class="edit">
-          <a href="{% url 'cms:createsection' object.pk %}">+ {% trans 'new section' %}</a>
+          <a href="{% url 'cms:createsection' page.pk %}">+ {% trans 'new section' %}</a>
         </div>
       </div>
     </section>
diff --git a/cms/views.py b/cms/views.py
index 5fd010a..7c07a77 100644
--- a/cms/views.py
+++ b/cms/views.py
@@ -32,6 +32,16 @@ class PageView(MenuMixin, MemoryMixin, DetailView):
     model = Page
     template_name = 'cms/page.html'
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        page = self.object
+        sections = page.sections.all()
+        context.update({
+            'page': page,
+            'sections': sections,
+        })
+        return context
+
 class CreatePage(StaffRequiredMixin, MenuMixin, CreateView):
     model = Page
     form_class = PageForm