diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index dcfac3c97..1995a5842 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -1,7 +1,7 @@
 title: $:/templates/PageTemplate
 
 <div class="container-fluid">
-<<story story:"$:/StoryTiddlers" storyview:scroller><
+<<story story:"$:/StoryTiddlers" storyview:scroller ><
 {{navigation-panel{
 <<chooser><<<list all>>>>
 }}}
@@ -10,10 +10,30 @@ title: $:/templates/PageTemplate
 <div class="navbar-inner">
 <div class="container">
 {{nav{
+
 * HelloThere
 * [[Introduction]]
 * [[Docs]]
+*{{divider-vertical}}
+
+{{pull-right btn btn-info{
+<<button popup:ViewDropDownState><View<span class="caret"></span>>>
 }}}
+
+}}}
+
+<<linkcatcher store:[[$:/CurrentView]]><
+<<reveal state:ViewDropDownState type:popup><
+<div class="open">
+{{dropdown-menu tw-suppress-missing-tiddlylink{
+* <<link to:scroller>< <<hide tiddler:[[$:/CurrentView]] notequal:scroller>< <span class="tw-ticked-menu-item"></span> >> Classic>>
+* <<link to:zoomin>< <<hide tiddler:[[$:/CurrentView]] notequal:zoomin>< <span class="tw-ticked-menu-item"></span> >> Zoomin>>
+* <<link to:pasteboard>< <<hide tiddler:[[$:/CurrentView]] notequal:pasteboard>< <span class="tw-ticked-menu-item"></span> >> Pasteboard>>
+}}}
+</div>
+>>
+>>
+
 </div>
 </div>
 </div>
diff --git a/tw5.com/wiki/styles.css.tid b/tw5.com/wiki/styles.css.tid
index fa9567f0e..39b9d3850 100644
--- a/tw5.com/wiki/styles.css.tid
+++ b/tw5.com/wiki/styles.css.tid
@@ -38,10 +38,20 @@ body {
 	font-weight: normal;
 }
 
+.tw-ticked-menu-item::before {
+	position: absolute;
+	content: "\2022";
+	left: 4px;
+}
+
 .dropdown-menu {
 	position: static;
 }
 
+.dropdown-menu a {
+	position: relative;
+}
+
 button.tw-tag-popup {
 	border: none;
 	background: none;
@@ -86,6 +96,18 @@ a.tw-tiddlylink-missing {
 	font-style: italic;
 }
 
+.tw-suppress-missing-tiddlylink a.tw-tiddlylink-missing {
+	font-style: inherit;
+}
+
+/* This is needed to make the dropdown arrows abutt to the dropdown itself */
+.navbar .dropdown-menu::before {
+top: -5px;
+}
+.navbar .dropdown-menu::after {
+top: -4px;
+}
+
 .splitLabel {
 	font-size: 9.5px;
 	margin-right: 5px;