diff --git a/core/ui/ListItemTemplate.tid b/core/ui/ListItemTemplate.tid
index 637864e2e..3887e1263 100644
--- a/core/ui/ListItemTemplate.tid
+++ b/core/ui/ListItemTemplate.tid
@@ -1,7 +1,5 @@
 title: $:/core/ui/ListItemTemplate
 
 <div class="tc-menu-list-item">
-<$link to={{!!title}}>
-<$view field="title"/>
-</$link>
+<$link />
 </div>
\ No newline at end of file
diff --git a/core/ui/PluginInfoDefaultContents.tid b/core/ui/PluginInfoDefaultContents.tid
index f006d0c60..b5685f327 100644
--- a/core/ui/PluginInfoDefaultContents.tid
+++ b/core/ui/PluginInfoDefaultContents.tid
@@ -5,9 +5,7 @@ title: $:/core/ui/PluginInfo/Default/contents
 <ul>
 <$list filter="[all[current]plugintiddlers[]sort[title]]" emptyMessage=<<lingo Empty/Hint>>>
 <li>
-<$link to={{!!title}}>
-<$view field="title"/>
-</$link>
+<$link />
 </li>
 </$list>
 </ul>
diff --git a/core/ui/PluginListItemTemplate.tid b/core/ui/PluginListItemTemplate.tid
index f781bca92..66a2e64b4 100644
--- a/core/ui/PluginListItemTemplate.tid
+++ b/core/ui/PluginListItemTemplate.tid
@@ -1,9 +1,5 @@
 title: $:/core/ui/PluginListItemTemplate
 
 <div class="tc-menu-list-item">
-<$link to={{!!title}}>
-<$view field="description">
-<$view field="title"/>
-</$view>
-</$link>
+<$link to={{!!title}}><$view field="description"><$view field="title"/></$view></$link>
 </div>
\ No newline at end of file
diff --git a/core/ui/ViewTemplate/subtitle.tid b/core/ui/ViewTemplate/subtitle.tid
index c3511c4f7..a23026861 100644
--- a/core/ui/ViewTemplate/subtitle.tid
+++ b/core/ui/ViewTemplate/subtitle.tid
@@ -1,10 +1,10 @@
 title: $:/core/ui/ViewTemplate/subtitle
 tags: $:/tags/ViewTemplate
 
+\whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-subtitle">
-<$link to={{!!modifier}}>
-<$view field="modifier"/>
-</$link> <$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>
+<$link to={{!!modifier}} />
+<$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>
 </div>
 </$reveal>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index f611d71ab..6abacf18c 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/ViewTemplate/title
 tags: $:/tags/ViewTemplate
 
+\whitespace trim
 \define title-styles()
 fill:$(foregroundColor)$;
 \end
diff --git a/core/wiki/macros/timeline.tid b/core/wiki/macros/timeline.tid
index ecc0c7e7a..b949d0432 100644
--- a/core/wiki/macros/timeline.tid
+++ b/core/wiki/macros/timeline.tid
@@ -4,6 +4,7 @@ tags: $:/tags/Macro
 title: $:/core/macros/timeline
 
 \define timeline-title()
+\whitespace trim
 <!-- Override this macro with a global macro 
      of the same name if you need to change 
      how titles are displayed on the timeline 
@@ -17,9 +18,7 @@ title: $:/core/macros/timeline
 <$view field="$dateField$" format="date" template="$format$"/>
 <$list filter="[sameday:$dateField${!!$dateField$}!is[system]$subfilter$!sort[$dateField$]]">
 <div class="tc-menu-list-subitem">
-<$link to={{!!title}}>
-<<timeline-title>>
-</$link>
+<$link to={{!!title}}><<timeline-title>></$link>
 </div>
 </$list>
 </div>
diff --git a/core/wiki/viewswitcher.tid b/core/wiki/viewswitcher.tid
index 73544ed30..0586aade5 100644
--- a/core/wiki/viewswitcher.tid
+++ b/core/wiki/viewswitcher.tid
@@ -4,13 +4,10 @@ title: $:/snippets/viewswitcher
 $:/core/images/storyview-$(storyview)$
 \end
 <$linkcatcher to="$:/view">
-<div class="tc-chooser">
+<div class="tc-chooser tc-viewswitcher">
 <$list filter="[storyviews[]]" variable="storyview">
 <$set name="cls" filter="[<storyview>prefix{$:/view}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>>
-<$link to=<<storyview>>>
-<$transclude tiddler=<<icon>>/>
-<$text text=<<storyview>>/>
-</$link>
+<$link to=<<storyview>>><$transclude tiddler=<<icon>>/><$text text=<<storyview>>/></$link>
 </div>
 </$set>
 </$list>
diff --git a/themes/tiddlywiki/tight/base.tid b/themes/tiddlywiki/tight/base.tid
index 62ec25541..347927e9c 100644
--- a/themes/tiddlywiki/tight/base.tid
+++ b/themes/tiddlywiki/tight/base.tid
@@ -43,6 +43,10 @@ tags: [[$:/tags/Stylesheet]]
 		font-weight: 700;
 	}
 
+	html body.tc-body .tc-tiddler-frame .tc-subtitle .tc-tiddlylink {
+		margin-right: .3em;
+	}
+
 	html body.tc-body .tc-tiddler-frame .tc-tags-wrapper {
 		margin: 0;
 	}
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 0ca784c76..28d551966 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -970,6 +970,7 @@ button.tc-btn-invisible.tc-remove-tag-button {
 
 .tc-tiddler-title-icon {
 	vertical-align: middle;
+	margin-right: .1em;
 }
 
 .tc-system-title-prefix {
@@ -991,6 +992,10 @@ button.tc-btn-invisible.tc-remove-tag-button {
 	font-weight: 300;
 }
 
+.tc-subtitle .tc-tiddlylink {
+	margin-right: .3em;
+}
+
 .tc-tiddler-missing .tc-title {
   font-style: italic;
   font-weight: normal;
@@ -1400,6 +1405,10 @@ html body.tc-body.tc-single-tiddler-window {
 ** Storyview Classes
 */
 
+.tc-viewswitcher .tc-image-button {
+	margin-right: .3em;
+}
+
 .tc-storyview-zoomin-tiddler {
 	position: absolute;
 	display: block;