diff --git a/apps/pdp11/tapes/README.md b/apps/pdp11/tapes/README.md
index 8bfb3b0be..37e4cfda0 100644
--- a/apps/pdp11/tapes/README.md
+++ b/apps/pdp11/tapes/README.md
@@ -15,7 +15,7 @@ We have archived the following DEC PDP-11 Tapes:
 To make it easy for PDPjs machines to load these tapes, we created the following High-Speed
 Paper Tape Reader (PC11) configurations:
 
-- [demo.xml](demo.xml)
+- [demo.xml](/devices/pdp11/pc11/demo.xml)
 
 These configuration files create UI controls that allow you to choose from a set of tapes that are automatically sent
 to the machine's PC11 device.
diff --git a/devices/pdp11/machine/1120/basic/debugger/machine.xml b/devices/pdp11/machine/1120/basic/debugger/machine.xml
index 58a05f14f..396332096 100644
--- a/devices/pdp11/machine/1120/basic/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/basic/debugger/machine.xml
@@ -9,5 +9,5 @@
 	<serial id="dl11" adapter="0" binding="print"/>
 	<panel ref="/devices/pdp11/panel/test/debugger/terminal.xml"/>
 	<debugger id="debugger" base="8" messages="" commands=""/>
-	<device ref="/apps/pdp11/tapes/demo.xml"/>
+	<device ref="/devices/pdp11/pc11/demo.xml"/>
 </machine>
diff --git a/devices/pdp11/machine/1120/basic/machine.xml b/devices/pdp11/machine/1120/basic/machine.xml
index 56f233220..f38ae8ca4 100644
--- a/devices/pdp11/machine/1120/basic/machine.xml
+++ b/devices/pdp11/machine/1120/basic/machine.xml
@@ -8,5 +8,5 @@
 	<device id="default" type="default"/>
 	<serial id="dl11" adapter="0" binding="print"/>
 	<panel ref="/devices/pdp11/panel/test/terminal.xml"/>
-	<device ref="/apps/pdp11/tapes/demo.xml"/>
+	<device ref="/devices/pdp11/pc11/demo.xml"/>
 </machine>
diff --git a/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml b/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
index ea2264f07..529ed5f5e 100644
--- a/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
@@ -9,5 +9,5 @@
 	<serial id="dl11" adapter="0" binding="print"/>
 	<panel ref="/devices/pdp11/panel/test/debugger/terminal.xml"/>
 	<debugger id="debugger" base="8" messages="" commands=""/>
-	<device ref="/apps/pdp11/tapes/demo.xml"/>
+	<device ref="/devices/pdp11/pc11/demo.xml"/>
 </machine>
diff --git a/devices/pdp11/machine/1120/bootstrap/machine.xml b/devices/pdp11/machine/1120/bootstrap/machine.xml
index 059aeceaf..3b5307081 100644
--- a/devices/pdp11/machine/1120/bootstrap/machine.xml
+++ b/devices/pdp11/machine/1120/bootstrap/machine.xml
@@ -8,5 +8,5 @@
 	<device id="default" type="default"/>
 	<serial id="dl11" adapter="0" binding="print"/>
 	<panel ref="/devices/pdp11/panel/test/terminal.xml"/>
-	<device ref="/apps/pdp11/tapes/demo.xml"/>
+	<device ref="/devices/pdp11/pc11/demo.xml"/>
 </machine>
diff --git a/devices/pdp11/panel/1170/debugger/front.xml b/devices/pdp11/panel/1170/debugger/front.xml
index 7061cdb47..55bcbb59b 100644
--- a/devices/pdp11/panel/1170/debugger/front.xml
+++ b/devices/pdp11/panel/1170/debugger/front.xml
@@ -86,7 +86,7 @@
 		</control>
 	</control>
 	<control type="container" class="pcjs-textarea" width="60%" padTop="8px" padBottom="8px">
-		<control type="textarea" binding="print" width="100%" height="252px" padRight="8px" pos="relative" style="resize:vertical;"/>
+		<control type="textarea" binding="print" width="100%" height="300px" padRight="8px" pos="relative" style="resize:vertical;"/>
 		<control type="container" width="100%">
 			<control type="text" binding="debugInput" width="auto"/>
 			<control type="button" binding="debugEnter">Enter</control>
@@ -94,6 +94,7 @@
 		</control>
 	</control>
 	<control type="container" class="pcjs-registers" width="35%" padTop="8px" padLeft="8px">
+		<name>Registers</name>
 		<control type="register" label="R0" binding="R0" pos="left" width="60px" padRight="8px" padBottom="8px">0000</control>
 		<control type="register" label="R1" binding="R1" pos="left" width="60px" padRight="8px" padBottom="8px">0000</control>
 		<control type="register" label="R2" binding="R2" pos="left" width="60px" padRight="8px" padBottom="8px">0000</control>
@@ -115,6 +116,6 @@
 		<control type="button" binding="step">Step</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Fast</control>
-		<control type="description" binding="speed" padLeft="8px">Stopped</control>
+		<control type="description" binding="speed" pos="default">Stopped</control>
 	</control>
 </panel>
diff --git a/devices/pdp11/panel/1170/front.xml b/devices/pdp11/panel/1170/front.xml
index d62926aa6..a4e4ef721 100644
--- a/devices/pdp11/panel/1170/front.xml
+++ b/devices/pdp11/panel/1170/front.xml
@@ -92,6 +92,6 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Fast</control>
-		<control type="description" binding="speed" padLeft="8px">Stopped</control>
+		<control type="description" binding="speed" pos="default">Stopped</control>
 	</control>
 </panel>
diff --git a/devices/pdp11/panel/test/debugger/terminal.xml b/devices/pdp11/panel/test/debugger/terminal.xml
index 250783894..c5aebff43 100644
--- a/devices/pdp11/panel/test/debugger/terminal.xml
+++ b/devices/pdp11/panel/test/debugger/terminal.xml
@@ -2,7 +2,7 @@
 <panel id="panel" width="100%" padding="8px">
 	<name>Control Panel</name>
 	<control type="container" class="pcjs-textarea" width="60%" padBottom="8px">
-		<control type="textarea" binding="print" width="100%" height="252px" padRight="8px" pos="relative" style="resize:vertical;"/>
+		<control type="textarea" binding="print" width="100%" height="300px" padRight="8px" pos="relative" style="resize:vertical;"/>
 		<control type="container" width="100%">
 			<control type="text" binding="debugInput" width="auto"/>
 			<control type="button" binding="debugEnter">Enter</control>
@@ -10,6 +10,7 @@
 		</control>
 	</control>
 	<control type="container" class="pcjs-registers" width="35%" padLeft="8px">
+		<name>Registers</name>
 		<control type="register" label="R0" binding="R0" pos="left" width="60px" padRight="8px" padBottom="8px">0000</control>
 		<control type="register" label="R1" binding="R1" pos="left" width="60px" padRight="8px" padBottom="8px">0000</control>
 		<control type="register" label="R2" binding="R2" pos="left" width="60px" padRight="8px" padBottom="8px">0000</control>
diff --git a/devices/pdp11/panel/test/terminal.xml b/devices/pdp11/panel/test/terminal.xml
index a4dd30e99..ed78193c5 100644
--- a/devices/pdp11/panel/test/terminal.xml
+++ b/devices/pdp11/panel/test/terminal.xml
@@ -2,12 +2,12 @@
 <panel id="panel" width="100%" padding="8px">
 	<name>Control Panel</name>
 	<control type="container" class="pcjs-textarea" width="60%" padBottom="8px">
-		<control type="textarea" binding="print" width="100%" height="252px" padRight="8px" pos="relative" style="resize:vertical;"/>
+		<control type="textarea" binding="print" width="100%" height="300px" padRight="8px" pos="relative" style="resize:vertical;"/>
 	</control>
-	<control type="container" padBottom="8px">
+	<control type="container" padLeft="8px" padBottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Fast</control>
-		<control type="description" binding="speed" padLeft="8px">Stopped</control>
+		<control type="description" binding="speed" pos="default">Stopped</control>
 	</control>
 </panel>
diff --git a/apps/pdp11/tapes/demo.xml b/devices/pdp11/pc11/demo.xml
similarity index 86%
rename from apps/pdp11/tapes/demo.xml
rename to devices/pdp11/pc11/demo.xml
index 88c8af93f..cf5b1ad48 100644
--- a/apps/pdp11/tapes/demo.xml
+++ b/devices/pdp11/pc11/demo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <device id="pc11" type="pc11" autoMount='{path:"/apps/pdp11/tapes/DEC-11-L2PC-PO.json"}' pos="left" padLeft="8px" padBottom="8px">
-	<control type="container" width="300px">
+	<name>Paper Tape Controls</name>
+	<control type="container" width="300px" name="Paper Tape Controls">
 		<control type="list" binding="listTapes">
 			<tape id="tape00" name="Bootstrap Loader (16Kb)" path="/apps/pdp11/boot/bootstrap/BOOTSTRAP-16KB.json"/>
 			<tape id="tape01" name="Absolute Loader" path="/apps/pdp11/tapes/DEC-11-L2PC-PO.json"/>
@@ -10,6 +11,6 @@
 		<control type="button" binding="loadTape">Load</control>
 		<control type="description" binding="descTape" padRight="8px"/>
 		<control type="file" binding="mountTape"/>
-		<control type="progress" binding="readProgress" width="250px">Tape Reader Progress</control>
+		<control type="progress" binding="readProgress" width="250px">Tape Progress</control>
 	</control>
 </device>