diff --git a/www/api/data/components/component-actions/commands/tests/addAction/Add%20two%20actions.js b/www/api/data/components/component-actions/commands/tests/addAction/Add%20two%20actions.js
deleted file mode 100644
index 18329e0..0000000
--- a/www/api/data/components/component-actions/commands/tests/addAction/Add%20two%20actions.js
+++ /dev/null
@@ -1,26 +0,0 @@
-function(assert) {
-  var button = document.createElement("button");
-  window.editor = {
-    "pageData" : {
-      "component" : {
-        "parts" : {
-          "actions" : []
-        }
-      }
-    }
-  };
-
-  commands.addAction(button);
-  assert.equal(
-    editor.pageData.component.parts.actions.length,
-    1,
-    "button adds an action"
-  );
-
-  commands.addAction(button);
-  assert.equal(
-    editor.pageData.component.parts.actions.length,
-    2,
-    "button adds an action"
-  );
-}
\ No newline at end of file
diff --git a/www/api/data/pages/page-frame/pageTemplates/Edit page frame.html b/www/api/data/pages/page-frame/pageTemplates/Edit page frame.html
index 2cd346d..e412fe5 100644
--- a/www/api/data/pages/page-frame/pageTemplates/Edit page frame.html	
+++ b/www/api/data/pages/page-frame/pageTemplates/Edit page frame.html	
@@ -1,8 +1,8 @@
 <main>
-  <div class="simplycode-header">
+  <div>
     <h1>Edit page frame</h1>
     <div class="simplycode-controls">
-      <button class="simplycode-button" data-simply-command="savePageFrame">Save</button>
+      <button class="ds-button" data-simply-command="savePageFrame">Save</button>
     </div>
   </div>
   <simply-render rel="componentDescription"></simply-render>
diff --git a/www/api/data/pages/page-frame/pageTemplates/Edit%20page%20frame.html b/www/api/data/pages/page-frame/pageTemplates/Edit%20page%20frame.html
deleted file mode 100644
index 2cd346d..0000000
--- a/www/api/data/pages/page-frame/pageTemplates/Edit%20page%20frame.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<main>
-  <div class="simplycode-header">
-    <h1>Edit page frame</h1>
-    <div class="simplycode-controls">
-      <button class="simplycode-button" data-simply-command="savePageFrame">Save</button>
-    </div>
-  </div>
-  <simply-render rel="componentDescription"></simply-render>
-  <simply-render rel="componentPageFrame"></simply-render>
-</main>
\ No newline at end of file
diff --git a/www/api/data/pages/page-frame/pageTemplates/Edit-page-frame.html b/www/api/data/pages/page-frame/pageTemplates/Edit-page-frame.html
deleted file mode 100644
index e412fe5..0000000
--- a/www/api/data/pages/page-frame/pageTemplates/Edit-page-frame.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<main>
-  <div>
-    <h1>Edit page frame</h1>
-    <div class="simplycode-controls">
-      <button class="ds-button" data-simply-command="savePageFrame">Save</button>
-    </div>
-  </div>
-  <simply-render rel="componentDescription"></simply-render>
-  <simply-render rel="componentPageFrame"></simply-render>
-</main>
\ No newline at end of file
diff --git a/www/api/data/pages/page-frame/routes/page-frame.js b/www/api/data/pages/page-frame/routes/page-frame.js
index 447595c..25eae09 100644
--- a/www/api/data/pages/page-frame/routes/page-frame.js
+++ b/www/api/data/pages/page-frame/routes/page-frame.js
@@ -21,6 +21,6 @@ function() {
     });
     editor.pageData.component = component;
     editor.pageData.count = {};
-    editor.pageData.page = "Edit-page-frame";
+    editor.pageData.page = "Edit page frame";
   });
 }
\ No newline at end of file
diff --git a/www/api/data/pages/page/pageTemplates/Edit%20page.html b/www/api/data/pages/page/pageTemplates/Edit%20page.html
deleted file mode 100644
index b49e5f3..0000000
--- a/www/api/data/pages/page/pageTemplates/Edit%20page.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<main>
-  <div class="simplycode-header">
-    <h1>Edit page: <span data-simply-field="component.id"></span></h1>
-    <div class="simplycode-controls">
-      <button class="simplycode-button" data-simply-command="savePage">Save</button>
-      <button class="simplycode-button" data-simply-command="deletePage">Delete</button>
-    </div>
-  </div>
-  <simply-render rel="componentDescription"></simply-render>
-  <simply-render rel="componentPageTemplate"></simply-render>
-  <simply-render rel="componentPageCss"></simply-render>
-  <simply-render rel="componentCommands"></simply-render>
-  <simply-render rel="componentActions"></simply-render>
-  <simply-render rel="componentDataApi"></simply-render>
-  <simply-render rel="componentRoutes"></simply-render>
-  <simply-render rel="componentTransformers"></simply-render>
-  <simply-render rel="componentDataSources"></simply-render>
-  <simply-render rel="componentSorters"></simply-render>
-</main>
\ No newline at end of file
diff --git a/www/api/data/pages/publish/actions/tests/getRouteWeight/Fixed%20path%203%20items.js b/www/api/data/pages/publish/actions/tests/getRouteWeight/Fixed%20path%203%20items.js
deleted file mode 100644
index 52eff0b..0000000
--- a/www/api/data/pages/publish/actions/tests/getRouteWeight/Fixed%20path%203%20items.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function(assert) {
-  var route = {
-    "route" : "#foo/bar/bla",
-    "code" : ""
-  };
-  var weight = actions.getRouteWeight(route);
-  assert.equal(111, weight, "Path with 3 fixed items weighs 111");
-}
\ No newline at end of file
diff --git a/www/api/data/pages/publish/pageTemplates/Publish App.html b/www/api/data/pages/publish/pageTemplates/Publish App.html
index 754613f..099d32e 100644
--- a/www/api/data/pages/publish/pageTemplates/Publish App.html	
+++ b/www/api/data/pages/publish/pageTemplates/Publish App.html	
@@ -1,7 +1,7 @@
 <main>
   <h1>App preview</h1>
   <div class="field">
-    <button class="simplycode-button" data-simply-command="saveAppHtml">Publish App</button>
+    <button class="ds-button" data-simply-command="saveAppHtml">Publish App</button>
   </div>
   <simply-render rel="fullAppPreview"></simply-render>
 </main>
\ No newline at end of file
diff --git a/www/api/data/pages/publish/pageTemplates/Publish%20App.html b/www/api/data/pages/publish/pageTemplates/Publish%20App.html
deleted file mode 100644
index 099d32e..0000000
--- a/www/api/data/pages/publish/pageTemplates/Publish%20App.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<main>
-  <h1>App preview</h1>
-  <div class="field">
-    <button class="ds-button" data-simply-command="saveAppHtml">Publish App</button>
-  </div>
-  <simply-render rel="fullAppPreview"></simply-render>
-</main>
\ No newline at end of file