diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index 22b0a4040..97d3f6275 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -8,7 +8,11 @@ title: $:/core/ui/PageTemplate
 <!-- The sidebar header -->
 <header class="sidebar-header">
 
-{{SiteTitle}}.title <br><small>{{SiteSubtitle}}</small>
+<div class="title">{{SiteTitle}}</div><div class="tw-subtitle">{{SiteSubtitle}}</div>
+
+<div class="tw-page-controls">
+<$button message="tw-new-tiddler" class="btn-invisible">{{$:/core/images/new-button}}</$button><$link to="$:/ControlPanel">{{$:/core/images/options-button}}</$link><$button message="tw-save-wiki" class="btn-invisible">{{$:/core/images/save-button}}</$button>
+</div>
 
 {{$:/core/ui/SideBar}}
 
diff --git a/core/ui/SideBar.tid b/core/ui/SideBar.tid
index 1548153a2..fe84805bd 100644
--- a/core/ui/SideBar.tid
+++ b/core/ui/SideBar.tid
@@ -22,10 +22,6 @@ title: $:/core/ui/SideBar
 
 <$reveal state="$:/temp/search" type="match" text="">
 
-<div class="tw-page-controls">
-<$button message="tw-new-tiddler" class="btn-invisible">{{$:/core/images/new-button}}</$button><$link to="$:/ControlPanel">{{$:/core/images/options-button}}</$link><$button message="tw-save-wiki" class="btn-invisible">{{$:/core/images/save-button}}</$button>
-</div>
-
 <div class="tw-tab-set">
 <div class="tw-tab-buttons"><$button type="set" set="$:/state/sideBarTabSet" setTo="openTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Open</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="recentTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Recent</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="toolsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tools</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="moreTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">More</$button></div>
 <div class="tw-tab-divider tw-sidebar-tab-divider">
diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid
index 893af5e37..0e2fa36b8 100644
--- a/core/ui/ViewTemplate.tid
+++ b/core/ui/ViewTemplate.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/ViewTemplate
 modifier: JeremyRuston
 
-<span class="title"><span class="tw-tiddler-controls"><$button popup="$:/state/tiddlerInfo" qualifyTiddlerTitles="yes" class="btn-invisible">{{$:/core/images/info-button}}</$button><$button message="tw-edit-tiddler" class="btn-invisible">{{$:/core/images/edit-button}}</$button><$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button}}</$button>
+<div class="tw-tiddler-view"><span class="title"><span class="tw-tiddler-controls"><$button popup="$:/state/tiddlerInfo" qualifyTiddlerTitles="yes" class="btn-invisible">{{$:/core/images/info-button}}</$button><$button message="tw-edit-tiddler" class="btn-invisible">{{$:/core/images/edit-button}}</$button><$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button}}</$button>
 
 </span><$view field="title"/></span>
 
@@ -11,11 +11,11 @@ modifier: JeremyRuston
 
 </$reveal>
 
-<div class="small"><$view field="modifier" format="link"/> <$view field="modified" format="relativedate"/></div>
+<div class="tw-subtitle"><$view field="modifier" format="link"/> <$view field="modified" format="relativedate"/></div>
 
 <div class="tw-tags-wrapper"><$list filter="[is[current]tags[]]" template="$:/core/ui/TagTemplate" /></div>
 
 <div class="body">
 	<$view field="text" format="wikified">
 	</$view>
-</div>
+</div></div>
\ No newline at end of file
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 0975ce0c9..029aefdd0 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -392,6 +392,11 @@ a.tw-tiddlylink-missing {
 	color: #182955;
 }
 
+.tw-subtitle {
+	font-size: 0.9em;
+	color: #c0c0c0;
+}
+
 .tw-tiddler-missing .title {
   font-style: italic;
   font-weight: normal;