diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid
index bde31110a..641f9b1dd 100644
--- a/core/ui/PageTemplate/sidebar.tid
+++ b/core/ui/PageTemplate/sidebar.tid
@@ -7,8 +7,7 @@ tags: $:/tags/PageTemplate
 			<div class="tw-site-title">{{$:/SiteTitle}}</div>
 			<div class="tw-site-subtitle">{{$:/SiteSubtitle}}</div>
 			<div class="tw-page-controls">
-				<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">						<$transclude tiddler=<<listItem>>/>
-				</$list>
+				<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 			</div>
 			{{$:/core/ui/SideBarLists}}
 		</$reveal>
diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid
index 0b806e7c9..0933103a5 100644
--- a/core/ui/SideBarLists.tid
+++ b/core/ui/SideBarLists.tid
@@ -8,8 +8,7 @@ title: $:/core/ui/SideBarLists
 				<$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link>
 			</$linkcatcher>
 		</$reveal>
-		<$reveal state="$:/temp/search" type="match" text=""> &nbsp;
-			<$link to="$:/AdvancedSearch" class="btn-invisible">&hellip;</$link>
+		<$reveal state="$:/temp/search" type="match" text="">&nbsp;<$link to="$:/AdvancedSearch" class="btn-invisible">&hellip;</$link>
 		</$reveal>
 	</div>
 	<$reveal state="$:/temp/search" type="nomatch" text="">
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 3ff40aea6..e7a77a295 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -369,7 +369,7 @@ a.tw-tiddlylink-external:hover {
 }
 
 .tw-search {
-	padding-top: .5em;
+	padding-top: 14px;
 }
 
 .tw-search a svg {
@@ -453,7 +453,7 @@ a.tw-tiddlylink-external:hover {
 		overflow-x: auto;
 		-webkit-overflow-scrolling: touch;
 		margin: 0 0 0 -42px;
-		padding: 99px 0 28px 42px;
+		padding: 84px 0 28px 42px;
 	}
 
 	.story-river {
@@ -461,7 +461,7 @@ a.tw-tiddlylink-external:hover {
 		left: {{$:/themes/tiddlywiki/vanilla/metrics##storyleft}};
 		top: {{$:/themes/tiddlywiki/vanilla/metrics##storytop}};
 		width: {{$:/themes/tiddlywiki/vanilla/metrics##storywidth}};
-		padding: 56px 42px 42px 42px;
+		padding: 42px 42px 42px 42px;
 	}
 }
 
@@ -968,6 +968,10 @@ canvas.tw-edit-bitmapeditor  {
 	padding-top: 14px;
 }
 
+.tw-sidebar-lists .tw-tab-buttons {
+	padding-top: 15px;	
+}
+
 .tw-sidebar-lists .tw-tab-buttons button.tw-tab-selected {
 	background-color: <<colour sidebar-tab-background-selected>>;
 	color: <<colour sidebar-tab-foreground-selected>>;