diff --git a/core/wiki/ControlPanel.tid b/core/wiki/ControlPanel.tid
index a46166500..f75f0af29 100644
--- a/core/wiki/ControlPanel.tid
+++ b/core/wiki/ControlPanel.tid
@@ -2,16 +2,14 @@ title: $:/ControlPanel
 
 ''Initial setup''
 
-:[[Title of this TiddlyWiki|SiteTitle]]: <$edit-text title="SiteTitle" default="" tag="input"/>
+| ![[Title of this TiddlyWiki|SiteTitle]]|<$edit-text title="SiteTitle" default="" tag="input"/> |
+| ![[Subtitle|SiteSubtitle]]|<$edit-text title="SiteSubtitle" default="" tag="input"/> |
+| ![[Username for signing edits|$:/status/UserName]]|<$edit-text title="$:/status/UserName" default="" tag="input"/> |
+| ![[Animation duration|$:/config/AnimationDuration]]|<$edit-text title="$:/config/AnimationDuration" default="" tag="input"/> |
 
-:[[Subtitle|SiteSubtitle]]: <$edit-text title="SiteSubtitle" default="" tag="input"/>
+Edit [[DefaultTiddlers|$:/DefaultTiddlers]] to choose which tiddlers are displayed at startup
 
-:[[Username for signing edits|$:/status/UserName]]: <$edit-text title="$:/status/UserName" default="" tag="input"/>
-
-:[[Animation duration|$:/config/AnimationDuration]]: <$edit-text title="$:/config/AnimationDuration" default="" tag="input"/><br><br>
-:Edit [[DefaultTiddlers|$:/DefaultTiddlers]] to choose which tiddlers are displayed at startup
-
-:{{$:/snippets/encryptionstatus}}
+{{$:/snippets/encryptionstatus}}
 
 ''Add plugins and tiddlers to your ~TiddlyWiki''