diff --git a/ADApp/op/adl/NDOverlay.adl b/ADApp/op/adl/NDOverlay.adl
index 36d9587..a43cf8e 100644
--- a/ADApp/op/adl/NDOverlay.adl
+++ b/ADApp/op/adl/NDOverlay.adl
@@ -114,21 +114,132 @@ text {
 rectangle {
 	object {
 		x=5
-		y=495
+		y=525
 		width=380
-		height=115
+		height=85
 	}
 	"basic attribute" {
 		clr=14
 		fill="outline"
 	}
 }
+"related display" {
+	object {
+		x=172
+		y=555
+		width=160
+		height=20
+	}
+	display[0] {
+		label="Overlay 1"
+		name="NDOverlayN.adl"
+		args="P=$(P), R=$(R)1:"
+	}
+	display[1] {
+		label="Overlay 2"
+		name="NDOverlayN.adl"
+		args="P=$(P), R=$(R)2:"
+	}
+	display[2] {
+		label="Overlay 3"
+		name="NDOverlayN.adl"
+		args="P=$(P), R=$(R)3:"
+	}
+	display[3] {
+		label="Overlay 4"
+		name="NDOverlayN.adl"
+		args="P=$(P), R=$(R)4:"
+	}
+	display[4] {
+		label="Overlay 5"
+		name="NDOverlayN.adl"
+		args="P=$(P), R=$(R)5:"
+	}
+	display[5] {
+		label="Overlay 6"
+		name="NDOverlayN.adl"
+		args="P=$(P), R=$(R)6:"
+	}
+	display[6] {
+		label="Overlay 7"
+		name="NDOverlayN.adl"
+		args="P=$(P), R=$(R)7:"
+	}
+	display[7] {
+		label="Overlay 8"
+		name="NDOverlayN.adl"
+		args="P=$(P), R=$(R)8:"
+	}
+	clr=14
+	bclr=51
+	label="Individual Overlays"
+}
+text {
+	object {
+		x=22
+		y=555
+		width=140
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Individual 0-7"
+	align="horiz. right"
+}
+"related display" {
+	object {
+		x=172
+		y=582
+		width=160
+		height=20
+	}
+	display[0] {
+		label="Overlays 1-8"
+		name="NDOverlay8.adl"
+		args="P=$(P),R=$(R),O1=$(R)1:,O2=$(R)2:,O3=$(R)3:,O4=$(R)4:,O5=$(R)5:,O6=$(R)6:,O7=$(R)7:,O8=$(R)8:"
+	}
+	display[1] {
+		label="Overlays 9-16"
+		name="NDOverlay8.adl"
+		args="P=$(P),R=$(R),O1=$(R)9:,O2=$(R)10:,O3=$(R)11:,O4=$(R)12:,O5=$(R)13:,O6=$(R)14:,O7=$(R)15:,O8=$(R)16:"
+	}
+	clr=14
+	bclr=51
+	label="Combined Overlays"
+}
+text {
+	object {
+		x=138
+		y=530
+		width=150
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Overlay definitions"
+	align="horiz. right"
+}
+text {
+	object {
+		x=82
+		y=583
+		width=80
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Combined"
+	align="horiz. right"
+}
 composite {
 	object {
 		x=5
 		y=35
 		width=380
-		height=455
+		height=485
 	}
 	"composite name"=""
 	children {
@@ -137,7 +248,7 @@ composite {
 				x=5
 				y=35
 				width=380
-				height=455
+				height=485
 			}
 			"basic attribute" {
 				clr=14
@@ -617,35 +728,6 @@ composite {
 			limits {
 			}
 		}
-		text {
-			object {
-				x=62
-				y=439
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Time stamp"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=172
-				y=440
-				width=150
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)TimeStamp_RBV"
-				clr=54
-				bclr=4
-			}
-			format="string"
-			limits {
-			}
-		}
 		text {
 			object {
 				x=62
@@ -704,35 +786,6 @@ composite {
 			limits {
 			}
 		}
-		text {
-			object {
-				x=12
-				y=464
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Attributes file"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=172
-				y=464
-				width=210
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NDAttributesFile"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
 		"text update" {
 			object {
 				x=172
@@ -791,85 +844,10 @@ composite {
 			textix="Plugin type"
 			align="horiz. right"
 		}
-	}
-}
-composite {
-	object {
-		x=22
-		y=505
-		width=310
-		height=98
-	}
-	"composite name"=""
-	children {
-		"related display" {
-			object {
-				x=172
-				y=555
-				width=160
-				height=20
-			}
-			display[0] {
-				label="Overlay 0"
-				name="NDOverlayN.adl"
-				args="P=$(P), R=$(R)0:"
-			}
-			display[1] {
-				label="Overlay 1"
-				name="NDOverlayN.adl"
-				args="P=$(P), R=$(R)1:"
-			}
-			display[2] {
-				label="Overlay 2"
-				name="NDOverlayN.adl"
-				args="P=$(P), R=$(R)2:"
-			}
-			display[3] {
-				label="Overlay 3"
-				name="NDOverlayN.adl"
-				args="P=$(P), R=$(R)3:"
-			}
-			display[4] {
-				label="Overlay 4"
-				name="NDOverlayN.adl"
-				args="P=$(P), R=$(R)4:"
-			}
-			display[5] {
-				label="Overlay 5"
-				name="NDOverlayN.adl"
-				args="P=$(P), R=$(R)5:"
-			}
-			display[6] {
-				label="Overlay 6"
-				name="NDOverlayN.adl"
-				args="P=$(P), R=$(R)6:"
-			}
-			display[7] {
-				label="Overlay 7"
-				name="NDOverlayN.adl"
-				args="P=$(P), R=$(R)7:"
-			}
-			clr=14
-			bclr=51
-			label="Individual Overlays"
-		}
-		text {
-			object {
-				x=22
-				y=555
-				width=140
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Individual 0-7"
-			align="horiz. right"
-		}
 		text {
 			object {
 				x=52
-				y=505
+				y=489
 				width=110
 				height=20
 			}
@@ -882,7 +860,7 @@ composite {
 		"related display" {
 			object {
 				x=172
-				y=505
+				y=489
 				width=100
 				height=20
 			}
@@ -894,52 +872,74 @@ composite {
 			clr=14
 			bclr=51
 		}
-		"related display" {
-			object {
-				x=172
-				y=582
-				width=160
-				height=20
-			}
-			display[0] {
-				label="OverlayS 1-8"
-				name="NDOverlay8.adl"
-				args="P=$(P),Overlay1=$(R)0:,Overlay2=$(R)1:,Overlay3=$(R)2:,Overlay4=$(R)3:,Overlay5=$(R)4:,Overlay6=$(R)5:,Overlay7=$(R)6:,Overlay8=$(R)7:,"
-			}
-			display[1] {
-				label="OverlayS 9-16"
-				name="NDOverlay8.adl"
-				args="P=$(P),Overlay1=$(R)8:,Overlay2=$(R)9:,Overlay3=$(R)10:,Overlay4=$(R)11:,Overlay5=$(R)12:,Overlay6=$(R)13:,Overlay7=$(R)14:,Overlay8=$(R)15:,"
-			}
-			clr=14
-			bclr=51
-			label="Combined Overlays"
-		}
 		text {
 			object {
-				x=138
-				y=530
+				x=12
+				y=464
 				width=150
 				height=20
 			}
 			"basic attribute" {
 				clr=14
 			}
-			textix="Overlay definitions"
+			textix="Attributes file"
 			align="horiz. right"
 		}
-		text {
+		"text entry" {
 			object {
-				x=82
-				y=583
-				width=80
+				x=172
+				y=464
+				width=210
 				height=20
 			}
-			"basic attribute" {
+			control {
+				chan="$(P)$(R)NDAttributesFile"
 				clr=14
+				bclr=51
+			}
+			format="string"
+			limits {
+			}
+		}
+		composite {
+			object {
+				x=62
+				y=439
+				width=260
+				height=20
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=62
+						y=439
+						width=100
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Time stamp"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=172
+						y=440
+						width=150
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)TimeStamp_RBV"
+						clr=54
+						bclr=4
+					}
+					format="string"
+					limits {
+					}
+				}
 			}
-			textix="Combined"
-			align="horiz. right"
 		}
 	}
 }