diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index 8cbb2c0d..46d27d03 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -40,14 +40,16 @@
 {% block titlebar %}
     <div class="button-bar">
         {% if not uri.param('new') %}
-            <a class="button" href="#modal"><i class="fa fa-plus"></i> Add Page</a>
-            {# <a class="button" href="{{ uri.route(true) }}/new:1"><i class="fa fa-plus"></i> Add Page</a> #}
             {% if context %}
                 {% if not uri.param('expert') %}
                     <a class="button" href="{{ uri.route(true) }}/expert:1">Normal mode</a>
                 {% else %}
                     <a class="button" href="{{ uri.route(true) }}">Expert mode</a>
                 {% endif %}
+                <a class="button" href="#modal"><i class="fa fa-check"></i> Save</a>
+            {% else %}
+                <a class="button" href="#modal"><i class="fa fa-plus"></i> Add Page</a>
+                {# <a class="button" href="{{ uri.route(true) }}/new:1"><i class="fa fa-plus"></i> Add Page</a> #}
             {% endif %}
         {% endif %}
     </div>
diff --git a/themes/grav/templates/partials/blueprints-raw.html.twig b/themes/grav/templates/partials/blueprints-raw.html.twig
index 6a484d30..50ea602a 100644
--- a/themes/grav/templates/partials/blueprints-raw.html.twig
+++ b/themes/grav/templates/partials/blueprints-raw.html.twig
@@ -15,7 +15,7 @@
         {% include 'forms/fields/textarea/textarea.html.twig' %}
     </div>
 
-    <div class="button-bar">
+{#     <div class="button-bar">
         <button class="button" name="task" value="raw">Save</button>
-    </div>
+    </div> #}
 </form>