diff --git a/core/ui/MoreSideBar.tid b/core/ui/MoreSideBar.tid
index 0c6aabe9b..5b35fb71e 100644
--- a/core/ui/MoreSideBar.tid
+++ b/core/ui/MoreSideBar.tid
@@ -22,7 +22,7 @@ title: $:/core/ui/MoreSideBar
 
 </div><div class="tw-tab-content">
 <$reveal type="match" state="$:/state/moreSideBarTabSet" text="allTab" qualifyTiddlerTitles="yes">
-<$list filter="[!is[system]sort[title]]" itemClass="tw-menu-list-item"/>
+<$list filter="[!is[system]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
 </$reveal>
 <$reveal type="match" state="$:/state/moreSideBarTabSet" text="recentTab" qualifyTiddlerTitles="yes">
 {{$:/snippets/recentchanges}}
@@ -38,23 +38,27 @@ title: $:/core/ui/MoreSideBar
 <$list filter="[is[missing]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/MissingTemplate"/>
 </$reveal>
 <$reveal type="match" state="$:/state/moreSideBarTabSet" text="draftsTab" qualifyTiddlerTitles="yes">
-<$list filter="[has[draft.of]sort[title]]" itemClass="tw-menu-list-item" />
+<$list filter="[has[draft.of]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
 </$reveal>
 <$reveal type="match" state="$:/state/moreSideBarTabSet" text="orphanTab" qualifyTiddlerTitles="yes">
-<$list filter="[is[orphan]sort[title]]" itemClass="tw-menu-list-item"/>
+<$list filter="[is[orphan]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
 </$reveal>
 <$reveal type="match" state="$:/state/moreSideBarTabSet" text="typeTab" qualifyTiddlerTitles="yes">
-<$list filter="[!is[system]has[type]each[type]sort[type]]" itemClass="tw-menu-list-item">
+<$list filter="[!is[system]has[type]each[type]sort[type]]">
+<div class="tw-menu-list-item">
 <$view field="type" default="untyped"/>
-<$list filter="[type{!!type}!is[system]sort[title]]" itemClass="tw-menu-list-subitem">
-<$view field="title" format="link"/>
+<$list filter="[type{!!type}!is[system]sort[title]]">
+<div class="tw-menu-list-subitem">
+<$link to={{!!title}}><$view field="title"/></$link>
+</div>
 </$list>
+</div>
 </$list>
 </$reveal>
 <$reveal type="match" state="$:/state/moreSideBarTabSet" text="systemTab" qualifyTiddlerTitles="yes">
-<$list filter="[is[system]sort[title]]" itemClass="tw-menu-list-item"/>
+<$list filter="[is[system]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
 </$reveal>
 <$reveal type="match" state="$:/state/moreSideBarTabSet" text="shadowsTab" qualifyTiddlerTitles="yes">
-<$list filter="[is[shadow]sort[title]]" itemClass="tw-menu-list-item"/>
+<$list filter="[is[shadow]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
 </$reveal>
 </div></div>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index 9adab010e..edd65f6c8 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/ViewTemplate/title
 tags: $:/tags/ViewTemplate
 
-<div class="tw-tiddler-title"><div class="title"><$setstyle name="fill" value={{!!color}}><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-title"><div class="title"><$setstyle name="fill" value={{!!color}}><span class="tw-tiddler-controls"><$button popup="$:/state/tiddlerInfo" qualifyTiddlerTitles="yes" class="btn-invisible" selectedClass="tw-selected">{{$:/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><$transclude title={{!!icon}}/> <$view field="title"/></$setstyle></div>
 
diff --git a/core/wiki/moreSideBarTabSet.tid b/core/wiki/moreSideBarTabSet.tid
index 57d4a0596..7d31013d6 100644
--- a/core/wiki/moreSideBarTabSet.tid
+++ b/core/wiki/moreSideBarTabSet.tid
@@ -1,3 +1,3 @@
-title: $:/state/moreSideBarTabSet--tiddlerTitle:$:/core/ui/MoreSideBar;--tiddlerTitle:$:/core/ui/SideBar;-tiddlerTitle:$:/core/ui/PageTemplate;-
+title: $:/state/moreSideBarTabSet-{$:/core/ui/MoreSideBar|$:/core/ui/MoreSideBar||}{$:/core/ui/SideBar|$:/core/ui/SideBar||}
 
 tagsTab
\ No newline at end of file