diff --git a/core/ui/PageControls.tid b/core/ui/PageControls.tid
index 2b579050c..833b4cbcb 100644
--- a/core/ui/PageControls.tid
+++ b/core/ui/PageControls.tid
@@ -1,16 +1,14 @@
 title: $:/core/ui/PageTemplate/pagecontrols
 
 \whitespace trim
-\define config-title() $:/config/PageControlButtons/Visibility/$(listItem)$
+\function config-title() [[$:/config/PageControlButtons/Visibility/$(listItem)$]substitute[]]
 
 <div class="tc-page-controls">
 	<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-		<$set name="hidden" value=<<config-title>>>
-			<$list filter="[<hidden>!text[hide]]" storyview="pop" variable="ignore">
-				<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
-					<$transclude tiddler=<<listItem>> mode="inline"/>
-				</$set>
-			</$list>
-		</$set>
+		<$list filter="[<config-title>!text[hide]]" storyview="pop" variable="ignore">
+			<$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]] }}}>
+				<$transclude $tiddler=<<listItem>> $mode="inline"/>
+			</$let>
+		</$list>
 	</$list>
-</div>
+</div>
\ No newline at end of file
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 5b19dd61f..69ba8e680 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -931,6 +931,7 @@ button.tc-btn-invisible.tc-remove-tag-button {
 
 .tc-page-controls {
 	margin-top: 14px;
+	margin-bottom: 14px;
 	font-size: 1.5em;
 }