diff --git a/twig/cp/control-panel.html.twig b/twig/cp/control-panel.html.twig
index 2a9ca7f..e76582a 100644
--- a/twig/cp/control-panel.html.twig
+++ b/twig/cp/control-panel.html.twig
@@ -29,9 +29,11 @@
     </footer>
 
     {% if editor == 'ace' %}
-    {% include '@novaconium/javascript/ace.html.twig' %}
+      {% include '@novaconium/javascript/page-edit.html.twig' %}
+      {% include '@novaconium/javascript/ace.html.twig' %}
     {% endif %}
 
+
     {% if debug is not empty %}
       <div id="debug">
           <h2>Debugging Information</h2>
diff --git a/twig/foot.html.twig b/twig/foot.html.twig
index 343200e..e0fffd7 100644
--- a/twig/foot.html.twig
+++ b/twig/foot.html.twig
@@ -3,8 +3,3 @@
     right before the /body
     such as javascript
 -->
-{% include '@novaconium/javascript/page-edit.html.twig' %}
-
-{% if editor == 'ace' %}
-{% include '@novaconium/javascript/ace.html.twig' %}
-{% endif %}
diff --git a/views/editpage/tab-main.html.twig b/views/editpage/tab-main.html.twig
index 262c6b4..bf78f91 100644
--- a/views/editpage/tab-main.html.twig
+++ b/views/editpage/tab-main.html.twig
@@ -13,4 +13,17 @@
         <textarea id="body" name="body" rows="10" style="display: none;">{{ rows.body|default('')|e('html') }}</textarea>
         <div id="body-editor" class="ace-editor"></div>  {# Ace mounts here #}
     </div>
+</div>
+
+<div class="form-group">
+    <label for="draft">
+        <input
+            type="checkbox"
+            id="draft"
+            name="draft"
+            value="1"
+            {% if rows.draft|default(false) %}checked{% endif %}
+        >
+        Save as draft
+    </label>
 </div>
\ No newline at end of file