diff --git a/core/templates/ControlPanel.tid b/core/templates/ControlPanel.tid
new file mode 100644
index 000000000..1cb363794
--- /dev/null
+++ b/core/templates/ControlPanel.tid
@@ -0,0 +1,10 @@
+title: $:/templates/ControlPanel
+
+<$button message="tw-new-tiddler" class="btn btn-mini btn-success">New Tiddler</$button>
+
+<$button message="tw-save-wiki" class="btn btn-mini btn-primary">Save Changes</$button>
+
+---
+
+{{$:/snippets/encryptionstatus}}
+
diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index b449de98c..4c7df3bee 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -18,13 +18,6 @@ title: $:/templates/PageTemplate
 <!-- The main story -->
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/templates/ViewTemplate" editTemplate="$:/templates/EditTemplate" listview="classic" itemClass="tw-tiddler-frame"/>
 
-<!-- Config area -->
-<div class="config-area">
-! Temporary Control Panel
-
-{{$:/snippets/encryptionstatus}}
-</div>
-
 <!-- End of story river -->
 </section>
 
diff --git a/core/templates/SideBar.tid b/core/templates/SideBar.tid
index 4b4f3ca58..1ad5091ac 100644
--- a/core/templates/SideBar.tid
+++ b/core/templates/SideBar.tid
@@ -2,7 +2,7 @@ title: $:/templates/SideBar
 
 <!-- The implementation of tabs here is currently a bit unreadable -->
 <div class="tw-tab-set">
-<div class="tw-tab-buttons"><$button type="set" set="myTabset" setTo="openTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Open</$button><$button type="set" set="myTabset" setTo="allTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">All</$button><$button type="set" set="myTabset" setTo="systemTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">System</$button></div>
+<div class="tw-tab-buttons"><$button type="set" set="myTabset" setTo="openTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Open</$button><$button type="set" set="myTabset" setTo="allTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">All</$button><$button type="set" set="myTabset" setTo="systemTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">System</$button><$button type="set" set="myTabset" setTo="toolsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tools</$button></div>
 <div class="tw-tab-contents">
 <$reveal type="match" state="myTabset" text="openTab" qualifyTiddlerTitles="yes">
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" itemClass="tw-menu-list-item"/>
@@ -13,9 +13,8 @@ title: $:/templates/SideBar
 <$reveal type="match" state="myTabset" text="systemTab" qualifyTiddlerTitles="yes">
 <$list filter="[is[system]sort[title]]" itemClass="tw-menu-list-item"/>
 </$reveal>
+<$reveal type="match" state="myTabset" text="toolsTab" qualifyTiddlerTitles="yes">
+{{$:/templates/ControlPanel}}
+</$reveal>
 </div>
 
-<div class="edit-controls">
-<$button message="tw-new-tiddler" class="btn btn-mini btn-success">New</$button>
-<$button message="tw-save-wiki" class="btn btn-mini btn-primary">Save</$button>
-</div>