diff --git a/core/styles/base.tid b/core/styles/base.tid
index d41de34ea..944110acd 100644
--- a/core/styles/base.tid
+++ b/core/styles/base.tid
@@ -68,9 +68,6 @@ a.tw-tiddlylink-missing {
 }
 
 .edit-header {
-	padding: 1em;	
-	background-color: #000;
-	color: #fff;
 }
 
 .sidebar-header {
@@ -78,14 +75,18 @@ a.tw-tiddlylink-missing {
 	top: 0;
 	left: 0;
 	bottom: 0;
-	width: 10em;
+	width: {{$:/core/styles/metrics##sidebarwidth}};
 	overflow-y: auto;
 	overflow-x: auto;
 	padding: 1em;
 }
 
+.tw-menu-list-item {
+	white-space: nowrap;
+}
+
 .story-river {
-	margin-left: 10em;
+	margin-left: {{$:/core/styles/metrics##sidebarwidth}};
 	padding: 2em;
 }
 
@@ -94,6 +95,7 @@ a.tw-tiddlylink-missing {
 	margin-bottom: 2em;
 	background-color: {{$:/core/styles/colourmappings##tiddlerbackground}};
 	max-width: 40em;
+	<<box-shadow "5px 5px 5px rgba(0, 0, 0, 0.1)">>
 }
 
 .tw-tiddler-frame .title {
@@ -119,7 +121,7 @@ a.tw-tiddlylink-missing {
 	border: 1px solid {{$:/core/styles/colourmappings##dropdownborder}};
 	background-color: {{$:/core/styles/colourmappings##dropdownbackground}};
 	<<border-radius 4px>>
-	<<box-shadow "0 5px 10px rgba(0, 0, 0, 0.2)">>
+	<<box-shadow "5px 5px 10px rgba(0, 0, 0, 0.2)">>
 	padding: 0.5em 0em 0.5em 0em;
 	white-space: nowrap;
 }
diff --git a/core/styles/colours.tid b/core/styles/colours.tid
index 39d27ceb7..a2d9f26a6 100644
--- a/core/styles/colours.tid
+++ b/core/styles/colours.tid
@@ -1,7 +1,7 @@
 title: $:/core/styles/colours
 type: application/x-tiddler-dictionary
 
-primary: `#65d`
+primary: `#6a5ccc`
 background: `#fff`
 pagebackground: `#ececec`
 medium: `#888`
\ No newline at end of file
diff --git a/core/styles/metrics.tid b/core/styles/metrics.tid
index 8eb535f5f..506710f79 100644
--- a/core/styles/metrics.tid
+++ b/core/styles/metrics.tid
@@ -3,3 +3,4 @@ type: application/x-tiddler-dictionary
 
 fontsize: `14px`
 lineheight: `20px`
+sidebarwidth: `25%`
diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index 19a6e6fd6..9190136c3 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -11,18 +11,17 @@ title: $:/templates/PageTemplate
 </div>
 
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" listview=classic itemClass="tw-menu-list-item"/>
+
+<div class="edit-controls">
+<$button message="tw-NewTiddler" class="btn btn-mini btn-success">New</$button>
+<$button message="tw-save-wiki" class="btn btn-mini btn-primary">Save</$button>
+</div>
+
 </header>
 
 <!-- The story river -->
 <section class="story-river">
 
-<!-- The edit bar -->
-<header class="edit-header">
-<$button message="tw-NewTiddler" class="btn btn-mini btn-success">New</$button>
-<$button message="tw-save-wiki" class="btn btn-mini btn-primary">Save</$button>
-</header>
-
-
 <!-- The main story -->
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/templates/ViewTemplate" editTemplate="$:/templates/EditTemplate" listview="scroller" itemClass="tw-tiddler-frame"/>