diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index 5e88a0dfa..1843a718c 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -12,7 +12,9 @@ title: $:/core/ui/PageTemplate
 {{$:/LeftSideBar}}
 
 <!-- The sidebar header -->
-<header class="sidebar-header"><div class="titlebar">{{SiteTitle}}</div><div class="tw-subtitle">{{SiteSubtitle}}</div>
+<header class="sidebar-header">
+<div class="titlebar">{{SiteTitle}}</div>
+<div class="tw-subtitle">{{SiteSubtitle}}</div>
 
 <div class="tw-page-controls">
 <$list filter="[is[shadow]!has[draft.of]tag[$:/tags/PageControls]] [!is[shadow]!has[draft.of]tag[$:/tags/PageControls]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 899adb59d..607f7de11 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -358,6 +358,15 @@ a.tw-tiddlylink-external {
 	padding-left: 7px;
 }
 
+.story-river {
+	position: relative;
+}
+
+.tw-story-spacer {
+	position: absolute;
+	min-height: 100%;
+}
+
 @media (max-width: {{$:/themes/tiddlywiki/snowwhite/metrics##storywidth}}) {
 	.sidebar-header {
 		padding: 14px;
@@ -380,7 +389,7 @@ a.tw-tiddlylink-external {
 		overflow-x: auto;
 		-webkit-overflow-scrolling: touch;
 		margin: 0 0 0 -42px;
-		padding: 84px 0 28px 42px;
+		padding: 70px 0 28px 42px;
 	}
 
 	.story-river {
@@ -388,7 +397,7 @@ a.tw-tiddlylink-external {
 		left: {{$:/themes/tiddlywiki/snowwhite/metrics##storyleft}};
 		top: {{$:/themes/tiddlywiki/snowwhite/metrics##storytop}};
 		width: {{$:/themes/tiddlywiki/snowwhite/metrics##storywidth}};
-		padding: 42px;
+		padding: 56px 42px 42px 42px;
 	}
 }