diff --git a/ADApp/op/adl/ADBase.adl b/ADApp/op/adl/ADBase.adl
index e453425..e66bcfd 100644
--- a/ADApp/op/adl/ADBase.adl
+++ b/ADApp/op/adl/ADBase.adl
@@ -1,14 +1,14 @@
 
 file {
-	name="/home/epics/devel/areaDetector/1-5beta/ADApp/op/adl/ADBase.adl"
+	name="/home/epics/devel/areaDetector/ADApp/op/adl/ADBase.adl"
 	version=030102
 }
 display {
 	object {
-		x=502
-		y=41
+		x=228
+		y=55
 		width=700
-		height=730
+		height=725
 	}
 	clr=14
 	bclr=4
@@ -122,1875 +122,35 @@ composite {
 		}
 	}
 }
-rectangle {
+composite {
 	object {
-		x=458
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
+		x=6
+		y=35
+		width=335
+		height=215
 	}
+	"composite name"=""
+	"composite file"="ADSetup.adl"
 }
-rectangle {
+composite {
 	object {
 		x=345
 		y=35
 		width=350
 		height=165
 	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=431
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Shutter"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=361
-		y=69
-		width=150
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Shutter mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=518
-		y=69
-		width=120
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterMode"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=411
-		y=118
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Open/Close"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=518
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Open"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=585
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Close"
-	press_msg="0"
-}
-text {
-	object {
-		x=351
-		y=93
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Status: Det."
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=477
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatus_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=477
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterOpenDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=360
-		y=143
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Delay: Open"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=143
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Close"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=617
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterCloseDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"related display" {
-	object {
-		x=550
-		y=171
-		width=70
-		height=20
-	}
-	display[0] {
-		name="ADEpicsShutter.adl"
-		args="P=$(P),R=$(R)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=351
-		y=171
-		width=190
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS shutter setup"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=93
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=617
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatusEPICS_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-rectangle {
-	object {
-		x=119
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=35
-		width=335
-		height=250
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Setup"
-	align="horiz. centered"
+	"composite name"=""
+	"composite file"="ADShutter.adl"
 }
 composite {
-	object {
-		x=63
-		y=94
-		width=268
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=171
-				y=95
-				width=160
-				height=18
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="$(P)$(R)"
-		}
-		text {
-			object {
-				x=63
-				y=94
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="EPICS name"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=43
-		y=119
-		width=288
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=43
-				y=119
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Manufacturer"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=171
-				y=120
-				width=160
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Manufacturer_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=73
-		y=241
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix=" More"
-	align="horiz. right"
-}
-"related display" {
-	object {
-		x=172
-		y=241
-		width=70
-		height=20
-	}
-	display[0] {
-		label="asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)AsynIO"
-	}
-	display[1] {
-		label="Save restore status"
-		name="save_restoreStatus_more.adl"
-		args="P=$(P)"
-	}
-	display[2] {
-		label="Image plugin #1"
-		name="NDStdArrays.adl"
-		args="P=$(P), R=$(I)"
-	}
-	display[3] {
-		label="ROI plugin #1"
-		name="NDROI.adl"
-		args="P=$(P), R=$(ROI)"
-	}
-	display[4] {
-		label="netCDF plugin #1"
-		name="NDFileNetCDF.adl"
-		args="P=$(P), R=$(NETCDF)"
-	}
-	display[5] {
-		label="TIFF plugin #1"
-		name="NDFileTIFF.adl"
-		args="P=$(P), R=$(TIFF)"
-	}
-	display[6] {
-		label="JPEG plugin #1"
-		name="NDFileJPEG.adl"
-		args="P=$(P), R=$(JPEG)"
-	}
-	display[7] {
-		label="Nexus plugin #1"
-		name="NDFileNexus.adl"
-		args="P=$(P), R=$(NEXUS)"
-	}
-	display[8] {
-		label="Color convert plugin #1"
-		name="NDColorConvert.adl"
-		args="P=$(P), R=$(CC)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=113
-		y=144
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Model"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=145
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Model_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=63
-		y=194
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Connection"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=171
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Connect"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=256
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Disconnect"
-	press_msg="0"
-}
-text {
-	object {
-		x=202
-		y=167
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=63
-	}
-	"dynamic attribute" {
-		vis="if not zero"
-		calc="0"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Connected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=187
-		y=167
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=20
-	}
-	"dynamic attribute" {
-		vis="if zero"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Disconnected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=63
-		y=69
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="asyn port"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=70
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PortName_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-rectangle {
-	object {
-		x=119
-		y=292
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=290
-		width=335
-		height=390
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=293
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Readout"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=173
-		y=320
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="X"
-	align="horiz. right"
-}
-text {
-	object {
-		x=266
-		y=320
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Y"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=148
-		y=390
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)BinX"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=241
-		y=390
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)BinY"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=148
-		y=370
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)BinX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=370
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)BinY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=67
-		y=390
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Binning"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=148
-		y=415
-		width=154
-		height=40
-	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=148
-				y=415
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MinX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=148
-				y=435
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=241
-				y=435
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=415
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MinY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=87
-		y=435
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Region start"
-	align="horiz. right"
-}
-text {
-	object {
-		x=97
-		y=480
-		width=40
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Region size"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=148
-		y=460
-		width=154
-		height=40
-	}
-	"composite name"=""
-	children {
-		"text entry" {
-			object {
-				x=148
-				y=480
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)SizeX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=241
-				y=480
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)SizeY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=148
-				y=460
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)SizeX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=460
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)SizeY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=27
-		y=345
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Sensor size"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=148
-		y=346
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)MaxSizeX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=346
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)MaxSizeY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=34
-		y=570
-		width=180
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image size (bytes)"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=241
-		y=571
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySize_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-composite {
-	object {
-		x=97
-		y=595
-		width=205
-		height=20
-	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=241
-				y=596
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Gain_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=148
-				y=595
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)Gain"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=97
-				y=595
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Gain"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=47
-		y=620
-		width=273
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=47
-				y=620
-				width=90
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Data type"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=143
-				y=620
-				width=80
-				height=20
-			}
-			control {
-				chan="$(P)$(R)DataType"
-				clr=14
-				bclr=51
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=621
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)DataType_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			format="string"
-			limits {
-			}
-		}
-	}
-}
-"text update" {
-	object {
-		x=148
-		y=505
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ReverseX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=505
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ReverseY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=67
-		y=525
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Reverse"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=148
-		y=525
-		width=60
-		height=18
-	}
-	control {
-		chan="$(P)$(R)ReverseX"
-		clr=14
-		bclr=51
-	}
-}
-menu {
-	object {
-		x=241
-		y=525
-		width=60
-		height=18
-	}
-	control {
-		chan="$(P)$(R)ReverseY"
-		clr=14
-		bclr=51
-	}
-}
-composite {
-	object {
-		x=472
-		y=207
-		width=105
-		height=21
-	}
-	"composite name"=""
-	children {
-		rectangle {
-			object {
-				x=472
-				y=207
-				width=105
-				height=21
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-	}
-}
-rectangle {
 	object {
 		x=345
-		y=205
+		y=595
 		width=350
-		height=385
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=452
-		y=208
-		width=157
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Collect"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=391
-		y=229
-		width=130
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Exposure time"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=530
-		y=229
-		width=59
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AcquireTime"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=596
-		y=230
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)AcquireTime_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=381
-		y=254
-		width=140
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Acquire period"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=530
-		y=254
-		width=59
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AcquirePeriod"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=596
-		y=255
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)AcquirePeriod_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=441
-		y=279
-		width=80
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="# Images"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=530
-		y=279
-		width=59
-		height=20
-	}
-	control {
-		chan="$(P)$(R)NumImages"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=596
-		y=280
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)NumImages_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=361
-		y=304
-		width=160
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="# Images complete"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=596
-		y=305
-		width=67
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)NumImagesCounter_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=393
-		y=329
-		width=128
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="# Exp./image"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=530
-		y=329
-		width=59
-		height=20
-	}
-	control {
-		chan="$(P)$(R)NumExposures"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=596
-		y=330
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)NumExposures_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-menu {
-	object {
-		x=479
-		y=354
-		width=120
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ImageMode"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=370
-		y=354
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image mode"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=606
-		y=356
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ImageMode_RBV"
-		clr=54
-		bclr=4
-	}
-	format="string"
-	limits {
-	}
-}
-text {
-	object {
-		x=349
-		y=379
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Trigger mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=478
-		y=379
-		width=120
-		height=20
-	}
-	control {
-		chan="$(P)$(R)TriggerMode"
-		clr=14
-		bclr=51
-	}
-}
-"text update" {
-	object {
-		x=605
-		y=381
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)TriggerMode_RBV"
-		clr=54
-		bclr=4
-	}
-	format="string"
-	limits {
-	}
-}
-composite {
-	object {
-		x=368
-		y=488
-		width=214
-		height=20
+		height=60
 	}
 	"composite name"=""
-	children {
-		text {
-			object {
-				x=368
-				y=488
-				width=140
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Time remaining"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=515
-				y=489
-				width=67
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)TimeRemaining_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=438
-		y=418
-		width=203
-		height=40
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=438
-				y=438
-				width=70
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Acquire"
-			align="horiz. right"
-		}
-		composite {
-			object {
-				x=515
-				y=418
-				width=126
-				height=40
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=558
-						y=418
-						width=40
-						height=20
-					}
-					"basic attribute" {
-						clr=63
-					}
-					"dynamic attribute" {
-						vis="if zero"
-						calc="A"
-						chan="$(P)$(R)Acquire"
-					}
-					textix="Done"
-					align="horiz. centered"
-				}
-				text {
-					object {
-						x=529
-						y=418
-						width=100
-						height=20
-					}
-					"basic attribute" {
-						clr=30
-					}
-					"dynamic attribute" {
-						vis="if not zero"
-						calc="A"
-						chan="$(P)$(R)Acquire"
-					}
-					textix="Collecting"
-					align="horiz. centered"
-				}
-				"message button" {
-					object {
-						x=515
-						y=438
-						width=59
-						height=20
-					}
-					control {
-						chan="$(P)$(R)Acquire"
-						clr=14
-						bclr=51
-					}
-					label="Start"
-					press_msg="1"
-				}
-				"message button" {
-					object {
-						x=582
-						y=438
-						width=59
-						height=20
-					}
-					control {
-						chan="$(P)$(R)Acquire"
-						clr=14
-						bclr=51
-					}
-					label="Stop"
-					press_msg="0"
-				}
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=368
-		y=463
-		width=305
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=368
-				y=463
-				width=140
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Detector state"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=515
-				y=463
-				width=158
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)DetectorState_RBV"
-				clr=54
-				bclr=2
-			}
-			clrmod="alarm"
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=378
-		y=513
-		width=303
-		height=20
-	}
-	"composite name"=""
-	children {
-		composite {
-			object {
-				x=515
-				y=513
-				width=166
-				height=20
-			}
-			"composite name"=""
-			children {
-				"text entry" {
-					object {
-						x=515
-						y=513
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)ArrayCounter"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=581
-						y=514
-						width=100
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)ArrayCounter_RBV"
-						clr=54
-						bclr=4
-					}
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=378
-				y=513
-				width=130
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image counter"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=408
-		y=538
-		width=207
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=408
-				y=538
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image rate"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=515
-				y=539
-				width=100
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ArrayRate_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=358
-		y=563
-		width=150
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Array callbacks"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=515
-		y=563
-		width=90
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ArrayCallbacks"
-		clr=14
-		bclr=51
-	}
-}
-"text update" {
-	object {
-		x=610
-		y=565
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArrayCallbacks_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	format="string"
-	limits {
-	}
-}
-text {
-	object {
-		x=47
-		y=645
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Color mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=143
-		y=645
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ColorMode"
-		clr=14
-		bclr=51
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=646
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ColorMode_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	format="string"
-	limits {
-	}
-}
-text {
-	object {
-		x=37
-		y=545
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image size"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=148
-		y=546
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySizeX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=546
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySizeY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
+	"composite file"="ADAttrFile.adl"
 }
 composite {
 	object {
@@ -2000,178 +160,35 @@ composite {
 		height=60
 	}
 	"composite name"=""
-	children {
-		composite {
-			object {
-				x=472
-				y=662
-				width=107
-				height=21
-			}
-			"composite name"=""
-			children {
-				composite {
-					object {
-						x=472
-						y=662
-						width=107
-						height=21
-					}
-					"composite name"=""
-					children {
-						rectangle {
-							object {
-								x=472
-								y=662
-								width=107
-								height=21
-							}
-							"basic attribute" {
-								clr=2
-							}
-						}
-					}
-				}
-				text {
-					object {
-						x=505
-						y=662
-						width=40
-						height=20
-					}
-					"basic attribute" {
-						clr=54
-					}
-					textix="File"
-					align="horiz. centered"
-				}
-			}
-		}
-		rectangle {
-			object {
-				x=345
-				y=660
-				width=350
-				height=60
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=358
-				y=689
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Driver file I/O"
-			align="horiz. right"
-		}
-		"related display" {
-			object {
-				x=515
-				y=689
-				width=70
-				height=20
-			}
-			display[0] {
-				name="NDFile.adl"
-				args="P=$(P),R=$(R)"
-			}
-			clr=14
-			bclr=51
-		}
+	"composite file"="ADDriverFile.adl"
+}
+composite {
+	object {
+		x=5
+		y=340
+		width=335
+		height=380
 	}
+	"composite name"=""
+	"composite file"="ADReadout.adl"
 }
 composite {
 	object {
 		x=345
-		y=595
+		y=205
 		width=350
-		height=60
+		height=385
 	}
 	"composite name"=""
-	children {
-		composite {
-			object {
-				x=472
-				y=597
-				width=107
-				height=21
-			}
-			"composite name"=""
-			children {
-				rectangle {
-					object {
-						x=472
-						y=597
-						width=107
-						height=21
-					}
-					"basic attribute" {
-						clr=2
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=505
-				y=597
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Attributes"
-			align="horiz. centered"
-		}
-		rectangle {
-			object {
-				x=345
-				y=595
-				width=350
-				height=60
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=358
-				y=624
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="File"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=403
-				y=625
-				width=280
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NDAttributesFile"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
+	"composite file"="ADCollect.adl"
+}
+composite {
+	object {
+		x=5
+		y=255
+		width=335
+		height=80
 	}
+	"composite name"=""
+	"composite file"="ADPlugins.adl"
 }
diff --git a/ADApp/op/adl/PerkinElmer.adl b/ADApp/op/adl/PerkinElmer.adl
index a906da2..cf7c4d9 100755
--- a/ADApp/op/adl/PerkinElmer.adl
+++ b/ADApp/op/adl/PerkinElmer.adl
@@ -1,184 +1,194 @@
-
-file {
-	name="C:\epics\synApps_5_4_1\support\areaDetector\1-5beta\ADApp\op\adl\PerkinElmer.adl"
-	version=030102
-}
-display {
-	object {
-		x=75
-		y=24
-		width=700
-		height=820
-	}
-	clr=14
-	bclr=4
-	cmap=""
-	gridSpacing=5
-	gridOn=0
-	snapToGrid=0
-}
-"color map" {
-	ncolors=65
-	colors {
-		ffffff,
-		ececec,
-		dadada,
-		c8c8c8,
-		bbbbbb,
-		aeaeae,
-		9e9e9e,
-		919191,
-		858585,
-		787878,
-		696969,
-		5a5a5a,
-		464646,
-		2d2d2d,
-		000000,
-		00d800,
-		1ebb00,
-		339900,
-		2d7f00,
-		216c00,
-		fd0000,
-		de1309,
-		be190b,
-		a01207,
-		820400,
-		5893ff,
-		597ee1,
-		4b6ec7,
-		3a5eab,
-		27548d,
-		fbf34a,
-		f9da3c,
-		eeb62b,
-		e19015,
-		cd6100,
-		ffb0ff,
-		d67fe2,
-		ae4ebc,
-		8b1a96,
-		610a75,
-		a4aaff,
-		8793e2,
-		6a73c1,
-		4d52a4,
-		343386,
-		c7bb6d,
-		b79d5c,
-		a47e3c,
-		7d5627,
-		58340f,
-		99ffff,
-		73dfff,
-		4ea5f9,
-		2a63e4,
-		0a00b8,
-		ebf1b5,
-		d4db9d,
-		bbc187,
-		a6a462,
-		8b8239,
-		73ff6b,
-		52da3b,
-		3cb420,
-		289315,
-		1a7309,
-	}
-}
-composite {
-	object {
-		x=100
-		y=3
-		width=500
-		height=26
-	}
-	"composite name"=""
-	children {
-		rectangle {
-			object {
-				x=100
-				y=3
-				width=500
-				height=25
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		text {
-			object {
-				x=158
-				y=4
-				width=384
-				height=25
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Area Detector Control - $(P)$(R)"
-			align="horiz. centered"
-		}
-	}
-}
-composite {
-	object {
-		x=5
-		y=38
-		width=335
-		height=250
-	}
-	"composite name"=""
-	"composite file"="ADSetup.adl;P=$(P),R=$(R)"
-}
-composite {
-	object {
-		x=345
-		y=37
-		width=350
-		height=165
-	}
-	"composite name"=""
-	"composite file"="ADShutter.adl;P=$(P),R=$(R)"
-}
-composite {
-	object {
-		x=345
-		y=208
-		width=350
-		height=385
-	}
-	"composite name"=""
-	"composite file"="PerkinElmerCollect.adl;P=$(P),R=$(R)"
-}
-composite {
-	object {
-		x=345
-		y=598
-		width=350
-		height=150
-	}
-	"composite name"=""
-	"composite file"="PerkinElmerInit.adl; P=$(P),R=$(R)"
-}
-composite {
-	object {
-		x=4
-		y=297
-		width=335
-		height=440
-	}
-	"composite name"=""
-	"composite file"="PerkinElmerCorrections.adl; P=$(P),R=$(R)"
-}
-composite {
-	object {
-		x=345
-		y=755
-		width=350
-		height=60
-	}
-	"composite name"=""
-	"composite file"="ADAttrFile.adl"
-}
+
+file {
+	name="/home/epics/devel/areaDetector/ADApp/op/adl/PerkinElmer.adl"
+	version=030102
+}
+display {
+	object {
+		x=716
+		y=119
+		width=700
+		height=820
+	}
+	clr=14
+	bclr=4
+	cmap=""
+	gridSpacing=5
+	gridOn=0
+	snapToGrid=0
+}
+"color map" {
+	ncolors=65
+	colors {
+		ffffff,
+		ececec,
+		dadada,
+		c8c8c8,
+		bbbbbb,
+		aeaeae,
+		9e9e9e,
+		919191,
+		858585,
+		787878,
+		696969,
+		5a5a5a,
+		464646,
+		2d2d2d,
+		000000,
+		00d800,
+		1ebb00,
+		339900,
+		2d7f00,
+		216c00,
+		fd0000,
+		de1309,
+		be190b,
+		a01207,
+		820400,
+		5893ff,
+		597ee1,
+		4b6ec7,
+		3a5eab,
+		27548d,
+		fbf34a,
+		f9da3c,
+		eeb62b,
+		e19015,
+		cd6100,
+		ffb0ff,
+		d67fe2,
+		ae4ebc,
+		8b1a96,
+		610a75,
+		a4aaff,
+		8793e2,
+		6a73c1,
+		4d52a4,
+		343386,
+		c7bb6d,
+		b79d5c,
+		a47e3c,
+		7d5627,
+		58340f,
+		99ffff,
+		73dfff,
+		4ea5f9,
+		2a63e4,
+		0a00b8,
+		ebf1b5,
+		d4db9d,
+		bbc187,
+		a6a462,
+		8b8239,
+		73ff6b,
+		52da3b,
+		3cb420,
+		289315,
+		1a7309,
+	}
+}
+composite {
+	object {
+		x=100
+		y=3
+		width=500
+		height=26
+	}
+	"composite name"=""
+	children {
+		rectangle {
+			object {
+				x=100
+				y=3
+				width=500
+				height=25
+			}
+			"basic attribute" {
+				clr=2
+			}
+		}
+		text {
+			object {
+				x=158
+				y=4
+				width=384
+				height=25
+			}
+			"basic attribute" {
+				clr=54
+			}
+			textix="Area Detector Control - $(P)$(R)"
+			align="horiz. centered"
+		}
+	}
+}
+composite {
+	object {
+		x=345
+		y=208
+		width=350
+		height=385
+	}
+	"composite name"=""
+	"composite file"="PerkinElmerCollect.adl;P=$(P),R=$(R)"
+}
+composite {
+	object {
+		x=345
+		y=598
+		width=350
+		height=150
+	}
+	"composite name"=""
+	"composite file"="PerkinElmerInit.adl; P=$(P),R=$(R)"
+}
+composite {
+	object {
+		x=5
+		y=340
+		width=335
+		height=440
+	}
+	"composite name"=""
+	"composite file"="PerkinElmerCorrections.adl; P=$(P),R=$(R)"
+}
+composite {
+	object {
+		x=345
+		y=755
+		width=350
+		height=60
+	}
+	"composite name"=""
+	"composite file"="ADAttrFile.adl"
+}
+composite {
+	object {
+		x=5
+		y=35
+		width=335
+		height=215
+	}
+	"composite name"=""
+	"composite file"="ADSetup.adl"
+}
+composite {
+	object {
+		x=5
+		y=255
+		width=335
+		height=80
+	}
+	"composite name"=""
+	"composite file"="ADPlugins.adl"
+}
+composite {
+	object {
+		x=345
+		y=35
+		width=350
+		height=165
+	}
+	"composite name"=""
+	"composite file"="ADShutter.adl"
+}
diff --git a/ADApp/op/adl/Roper.adl b/ADApp/op/adl/Roper.adl
index 122b5bd..f9dd5bd 100644
--- a/ADApp/op/adl/Roper.adl
+++ b/ADApp/op/adl/Roper.adl
@@ -1,14 +1,14 @@
 
 file {
-	name="/home/epics/devel/areaDetector/1-5beta/ADApp/op/adl/Roper.adl"
+	name="/home/epics/devel/areaDetector/ADApp/op/adl/Roper.adl"
 	version=030102
 }
 display {
 	object {
-		x=497
-		y=98
+		x=175
+		y=80
 		width=700
-		height=755
+		height=820
 	}
 	clr=14
 	bclr=4
@@ -149,7 +149,7 @@ rectangle {
 		x=345
 		y=230
 		width=350
-		height=475
+		height=450
 	}
 	"basic attribute" {
 		clr=14
@@ -693,6 +693,213 @@ text {
 	textix="# Acquisitions Complete"
 	align="horiz. right"
 }
+text {
+	object {
+		x=441
+		y=354
+		width=80
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# Images/Acquis."
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=530
+		y=354
+		width=59
+		height=20
+	}
+	control {
+		chan="$(P)$(R)NumImages"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=596
+		y=355
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)NumImages_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=596
+		y=380
+		width=67
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)NumImagesCounter_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=429
+		y=379
+		width=160
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# Images Complete"
+	align="horiz. right"
+}
+composite {
+	object {
+		x=393
+		y=304
+		width=282
+		height=45
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=393
+				y=304
+				width=128
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="# Exposures/Image"
+			align="horiz. right"
+		}
+		"text entry" {
+			object {
+				x=530
+				y=304
+				width=59
+				height=20
+			}
+			control {
+				chan="$(P)$(R)NumExposures"
+				clr=14
+				bclr=51
+			}
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=596
+				y=305
+				width=79
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)NumExposures_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=596
+				y=330
+				width=67
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)NumExposuresCounter_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		text {
+			object {
+				x=429
+				y=329
+				width=160
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="# Exposures Complete"
+			align="horiz. right"
+		}
+	}
+}
+"text update" {
+	object {
+		x=241
+		y=726
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)Temperature_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=148
+		y=725
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)Temperature"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=27
+		y=725
+		width=110
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Temperature"
+	align="horiz. right"
+}
+composite {
+	object {
+		x=5
+		y=35
+		width=335
+		height=215
+	}
+	"composite name"=""
+	"composite file"="ADSetup.adl"
+}
 composite {
 	object {
 		x=345
@@ -992,7 +1199,7 @@ composite {
 rectangle {
 	object {
 		x=119
-		y=292
+		y=342
 		width=107
 		height=21
 	}
@@ -1003,9 +1210,9 @@ rectangle {
 rectangle {
 	object {
 		x=5
-		y=290
+		y=340
 		width=335
-		height=390
+		height=410
 	}
 	"basic attribute" {
 		clr=14
@@ -1015,7 +1222,7 @@ rectangle {
 text {
 	object {
 		x=93
-		y=293
+		y=343
 		width=159
 		height=20
 	}
@@ -1028,7 +1235,7 @@ text {
 text {
 	object {
 		x=173
-		y=320
+		y=370
 		width=10
 		height=20
 	}
@@ -1041,7 +1248,7 @@ text {
 text {
 	object {
 		x=266
-		y=320
+		y=370
 		width=10
 		height=20
 	}
@@ -1054,7 +1261,7 @@ text {
 composite {
 	object {
 		x=34
-		y=575
+		y=625
 		width=268
 		height=20
 	}
@@ -1063,7 +1270,7 @@ composite {
 		text {
 			object {
 				x=34
-				y=575
+				y=625
 				width=180
 				height=20
 			}
@@ -1076,7 +1283,7 @@ composite {
 		"text update" {
 			object {
 				x=241
-				y=576
+				y=626
 				width=61
 				height=18
 			}
@@ -1091,108 +1298,54 @@ composite {
 		}
 	}
 }
-composite {
+"text update" {
 	object {
-		x=97
-		y=600
-		width=205
+		x=241
+		y=651
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)Gain_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=148
+		y=650
+		width=60
 		height=20
 	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=241
-				y=601
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Gain_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=148
-				y=600
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)Gain"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=97
-				y=600
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Gain"
-			align="horiz. right"
-		}
+	control {
+		chan="$(P)$(R)Gain"
+		clr=14
+		bclr=51
+	}
+	limits {
 	}
 }
 text {
 	object {
-		x=47
-		y=625
-		width=90
+		x=97
+		y=650
+		width=40
 		height=20
 	}
 	"basic attribute" {
 		clr=14
 	}
-	textix="Auto type"
+	textix="Gain"
 	align="horiz. right"
 }
-menu {
-	object {
-		x=143
-		y=625
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AutoDataType"
-		clr=14
-		bclr=51
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=626
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)AutoDataType_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	format="string"
-	limits {
-	}
-}
 composite {
 	object {
 		x=37
-		y=550
+		y=600
 		width=265
 		height=20
 	}
@@ -1201,7 +1354,7 @@ composite {
 		text {
 			object {
 				x=37
-				y=550
+				y=600
 				width=100
 				height=20
 			}
@@ -1214,7 +1367,7 @@ composite {
 		"text update" {
 			object {
 				x=148
-				y=551
+				y=601
 				width=61
 				height=18
 			}
@@ -1230,7 +1383,7 @@ composite {
 		"text update" {
 			object {
 				x=241
-				y=551
+				y=601
 				width=61
 				height=18
 			}
@@ -1248,7 +1401,7 @@ composite {
 composite {
 	object {
 		x=67
-		y=505
+		y=555
 		width=235
 		height=40
 	}
@@ -1257,7 +1410,7 @@ composite {
 		"text update" {
 			object {
 				x=148
-				y=505
+				y=555
 				width=61
 				height=18
 			}
@@ -1273,7 +1426,7 @@ composite {
 		"text update" {
 			object {
 				x=241
-				y=505
+				y=555
 				width=61
 				height=18
 			}
@@ -1289,7 +1442,7 @@ composite {
 		text {
 			object {
 				x=67
-				y=525
+				y=575
 				width=70
 				height=20
 			}
@@ -1302,7 +1455,7 @@ composite {
 		menu {
 			object {
 				x=148
-				y=525
+				y=575
 				width=60
 				height=18
 			}
@@ -1315,7 +1468,7 @@ composite {
 		menu {
 			object {
 				x=241
-				y=525
+				y=575
 				width=60
 				height=18
 			}
@@ -1330,7 +1483,7 @@ composite {
 text {
 	object {
 		x=97
-		y=480
+		y=530
 		width=40
 		height=20
 	}
@@ -1343,7 +1496,7 @@ text {
 composite {
 	object {
 		x=148
-		y=460
+		y=510
 		width=154
 		height=40
 	}
@@ -1352,7 +1505,7 @@ composite {
 		"text entry" {
 			object {
 				x=148
-				y=480
+				y=530
 				width=60
 				height=20
 			}
@@ -1367,7 +1520,7 @@ composite {
 		"text entry" {
 			object {
 				x=241
-				y=480
+				y=530
 				width=60
 				height=20
 			}
@@ -1382,7 +1535,7 @@ composite {
 		"text update" {
 			object {
 				x=148
-				y=460
+				y=510
 				width=61
 				height=18
 			}
@@ -1398,7 +1551,7 @@ composite {
 		"text update" {
 			object {
 				x=241
-				y=460
+				y=510
 				width=61
 				height=18
 			}
@@ -1416,7 +1569,7 @@ composite {
 composite {
 	object {
 		x=148
-		y=415
+		y=465
 		width=154
 		height=40
 	}
@@ -1425,7 +1578,7 @@ composite {
 		"text update" {
 			object {
 				x=148
-				y=415
+				y=465
 				width=61
 				height=18
 			}
@@ -1441,7 +1594,7 @@ composite {
 		"text entry" {
 			object {
 				x=148
-				y=435
+				y=485
 				width=60
 				height=20
 			}
@@ -1456,7 +1609,7 @@ composite {
 		"text entry" {
 			object {
 				x=241
-				y=435
+				y=485
 				width=60
 				height=20
 			}
@@ -1471,7 +1624,7 @@ composite {
 		"text update" {
 			object {
 				x=241
-				y=415
+				y=465
 				width=61
 				height=18
 			}
@@ -1489,7 +1642,7 @@ composite {
 text {
 	object {
 		x=87
-		y=435
+		y=485
 		width=50
 		height=20
 	}
@@ -1502,7 +1655,7 @@ text {
 composite {
 	object {
 		x=67
-		y=370
+		y=420
 		width=235
 		height=40
 	}
@@ -1511,7 +1664,7 @@ composite {
 		"text entry" {
 			object {
 				x=148
-				y=390
+				y=440
 				width=60
 				height=20
 			}
@@ -1526,7 +1679,7 @@ composite {
 		"text entry" {
 			object {
 				x=241
-				y=390
+				y=440
 				width=60
 				height=20
 			}
@@ -1541,7 +1694,7 @@ composite {
 		"text update" {
 			object {
 				x=148
-				y=370
+				y=420
 				width=61
 				height=18
 			}
@@ -1557,7 +1710,7 @@ composite {
 		"text update" {
 			object {
 				x=241
-				y=370
+				y=420
 				width=61
 				height=18
 			}
@@ -1573,7 +1726,7 @@ composite {
 		text {
 			object {
 				x=67
-				y=390
+				y=440
 				width=70
 				height=20
 			}
@@ -1588,7 +1741,7 @@ composite {
 composite {
 	object {
 		x=27
-		y=345
+		y=395
 		width=275
 		height=20
 	}
@@ -1597,7 +1750,7 @@ composite {
 		text {
 			object {
 				x=27
-				y=345
+				y=395
 				width=110
 				height=20
 			}
@@ -1610,7 +1763,7 @@ composite {
 		"text update" {
 			object {
 				x=148
-				y=346
+				y=396
 				width=61
 				height=18
 			}
@@ -1626,7 +1779,7 @@ composite {
 		"text update" {
 			object {
 				x=241
-				y=346
+				y=396
 				width=61
 				height=18
 			}
@@ -1641,561 +1794,20 @@ composite {
 		}
 	}
 }
-rectangle {
-	object {
-		x=119
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=35
-		width=335
-		height=250
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Setup"
-	align="horiz. centered"
-}
-composite {
-	object {
-		x=63
-		y=94
-		width=268
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=171
-				y=95
-				width=160
-				height=18
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="$(P)$(R)"
-		}
-		text {
-			object {
-				x=63
-				y=94
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="EPICS name"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=43
-		y=119
-		width=288
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=43
-				y=119
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Manufacturer"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=171
-				y=120
-				width=160
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Manufacturer_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=73
-		y=258
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix=" More"
-	align="horiz. right"
-}
-text {
-	object {
-		x=113
-		y=144
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Model"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=145
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Model_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=63
-		y=194
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Connection"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=171
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Connect"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=256
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Disconnect"
-	press_msg="0"
-}
-text {
-	object {
-		x=202
-		y=167
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=63
-	}
-	"dynamic attribute" {
-		vis="if not zero"
-		calc="0"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Connected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=187
-		y=167
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=20
-	}
-	"dynamic attribute" {
-		vis="if zero"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Disconnected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=63
-		y=69
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="asyn port"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=70
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PortName_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=242
-		y=228
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Temperature_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=171
-		y=227
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)Temperature"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=53
-		y=227
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Temperature"
-	align="horiz. right"
-}
-text {
-	object {
-		x=441
-		y=354
-		width=80
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="# Images/Acquis."
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=530
-		y=354
-		width=59
-		height=20
-	}
-	control {
-		chan="$(P)$(R)NumImages"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=596
-		y=355
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)NumImages_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=596
-		y=380
-		width=67
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)NumImagesCounter_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=429
-		y=379
-		width=160
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="# Images Complete"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=393
-		y=304
-		width=282
-		height=45
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=393
-				y=304
-				width=128
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="# Exposures/Image"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=530
-				y=304
-				width=59
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NumExposures"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=596
-				y=305
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)NumExposures_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=596
-				y=330
-				width=67
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)NumExposuresCounter_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=429
-				y=329
-				width=160
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="# Exposures Complete"
-			align="horiz. right"
-		}
-	}
-}
 composite {
 	object {
 		x=5
-		y=685
+		y=255
 		width=335
-		height=60
+		height=80
 	}
 	"composite name"=""
-	children {
-		composite {
-			object {
-				x=132
-				y=687
-				width=107
-				height=21
-			}
-			"composite name"=""
-			children {
-				composite {
-					object {
-						x=132
-						y=687
-						width=107
-						height=21
-					}
-					"composite name"=""
-					children {
-						rectangle {
-							object {
-								x=132
-								y=687
-								width=107
-								height=21
-							}
-							"basic attribute" {
-								clr=2
-							}
-						}
-					}
-				}
-				text {
-					object {
-						x=165
-						y=687
-						width=40
-						height=20
-					}
-					"basic attribute" {
-						clr=54
-					}
-					textix="File"
-					align="horiz. centered"
-				}
-			}
-		}
-		rectangle {
-			object {
-				x=5
-				y=685
-				width=335
-				height=60
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=18
-				y=714
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Driver File I/O"
-			align="horiz. right"
-		}
-		"related display" {
-			object {
-				x=175
-				y=714
-				width=70
-				height=20
-			}
-			display[0] {
-				name="RoperFile.adl"
-				args="P=$(P),R=$(R)"
-			}
-			clr=14
-			bclr=51
-		}
-	}
+	"composite file"="ADPlugins.adl"
 }
 text {
 	object {
 		x=47
-		y=651
+		y=700
 		width=90
 		height=20
 	}
@@ -2208,7 +1820,7 @@ text {
 "text update" {
 	object {
 		x=241
-		y=652
+		y=701
 		width=79
 		height=18
 	}
@@ -2225,7 +1837,7 @@ text {
 composite {
 	object {
 		x=143
-		y=651
+		y=700
 		width=80
 		height=20
 	}
@@ -2234,7 +1846,7 @@ composite {
 		menu {
 			object {
 				x=143
-				y=651
+				y=700
 				width=80
 				height=20
 			}
@@ -2250,93 +1862,163 @@ composite {
 		chan="$(P)$(R)AutoDataType_RBV"
 	}
 }
-"related display" {
-	object {
-		x=172
-		y=258
-		width=70
-		height=20
-	}
-	display[0] {
-		label="asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)AsynIO"
-	}
-	display[1] {
-		label="Save restore status"
-		name="save_restoreStatus_more.adl"
-		args="P=$(P)"
-	}
-	display[2] {
-		label="Image plugin #1"
-		name="NDStdArrays.adl"
-		args="P=$(P), R=$(I)"
-	}
-	display[3] {
-		label="ROI plugin #1"
-		name="NDROI.adl"
-		args="P=$(P), R=$(ROI)"
-	}
-	display[4] {
-		label="netCDF plugin #1"
-		name="NDFileNetCDF.adl"
-		args="P=$(P), R=$(NETCDF)"
-	}
-	display[5] {
-		label="TIFF plugin #1"
-		name="NDFileTIFF.adl"
-		args="P=$(P), R=$(TIFF)"
-	}
-	display[6] {
-		label="JPEG plugin #1"
-		name="NDFileJPEG.adl"
-		args="P=$(P), R=$(JPEG)"
-	}
-	display[7] {
-		label="Nexus plugin #1"
-		name="NDFileNexus.adl"
-		args="P=$(P), R=$(NEXUS)"
-	}
-	clr=14
-	bclr=51
-}
 composite {
 	object {
-		x=358
+		x=47
 		y=675
-		width=330
+		width=273
 		height=20
 	}
 	"composite name"=""
 	children {
-		"text entry" {
+		text {
 			object {
-				x=518
+				x=47
 				y=675
-				width=170
+				width=90
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Auto type"
+			align="horiz. right"
+		}
+		menu {
+			object {
+				x=143
+				y=675
+				width=80
 				height=20
 			}
 			control {
-				chan="$(P)$(R)NDAttributesFile"
+				chan="$(P)$(R)AutoDataType"
 				clr=14
 				bclr=51
 			}
+		}
+		"text update" {
+			object {
+				x=241
+				y=676
+				width=79
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)AutoDataType_RBV"
+				clr=54
+				bclr=4
+			}
+			align="horiz. centered"
 			format="string"
 			limits {
 			}
 		}
+	}
+}
+composite {
+	object {
+		x=345
+		y=750
+		width=350
+		height=60
+	}
+	"composite name"=""
+	children {
+		composite {
+			object {
+				x=472
+				y=752
+				width=107
+				height=21
+			}
+			"composite name"=""
+			children {
+				composite {
+					object {
+						x=472
+						y=752
+						width=107
+						height=21
+					}
+					"composite name"=""
+					children {
+						rectangle {
+							object {
+								x=472
+								y=752
+								width=107
+								height=21
+							}
+							"basic attribute" {
+								clr=2
+							}
+						}
+					}
+				}
+				text {
+					object {
+						x=505
+						y=752
+						width=40
+						height=20
+					}
+					"basic attribute" {
+						clr=54
+					}
+					textix="File"
+					align="horiz. centered"
+				}
+			}
+		}
+		rectangle {
+			object {
+				x=345
+				y=750
+				width=350
+				height=60
+			}
+			"basic attribute" {
+				clr=14
+				fill="outline"
+			}
+		}
 		text {
 			object {
 				x=358
-				y=675
+				y=779
 				width=150
 				height=20
 			}
 			"basic attribute" {
 				clr=14
 			}
-			textix="Attributes file"
+			textix="Driver File I/O"
 			align="horiz. right"
 		}
+		"related display" {
+			object {
+				x=515
+				y=779
+				width=70
+				height=20
+			}
+			display[0] {
+				name="RoperFile.adl"
+				args="P=$(P),R=$(R)"
+			}
+			clr=14
+			bclr=51
+		}
 	}
 }
+composite {
+	object {
+		x=345
+		y=685
+		width=350
+		height=60
+	}
+	"composite name"=""
+	"composite file"="ADAttrFile.adl"
+}
diff --git a/ADApp/op/adl/firewire.adl b/ADApp/op/adl/firewire.adl
index 005758f..dfca28f 100644
--- a/ADApp/op/adl/firewire.adl
+++ b/ADApp/op/adl/firewire.adl
@@ -5,10 +5,10 @@ file {
 }
 display {
 	object {
-		x=585
-		y=174
+		x=718
+		y=159
 		width=700
-		height=665
+		height=670
 	}
 	clr=14
 	bclr=4
@@ -87,629 +87,6 @@ display {
 		1a7309,
 	}
 }
-rectangle {
-	object {
-		x=458
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=345
-		y=35
-		width=350
-		height=165
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=431
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Shutter"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=361
-		y=69
-		width=150
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Shutter mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=518
-		y=69
-		width=120
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterMode"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=411
-		y=118
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Open/Close"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=518
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Open"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=585
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Close"
-	press_msg="0"
-}
-text {
-	object {
-		x=351
-		y=93
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Status: Det."
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=477
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatus_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=477
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterOpenDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=360
-		y=143
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Delay: Open"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=143
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Close"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=617
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterCloseDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"related display" {
-	object {
-		x=550
-		y=171
-		width=70
-		height=20
-	}
-	display[0] {
-		name="ADEpicsShutter.adl"
-		args="P=$(P),R=$(R)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=351
-		y=171
-		width=190
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS shutter setup"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=93
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=617
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatusEPICS_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-rectangle {
-	object {
-		x=119
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=35
-		width=335
-		height=250
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Setup"
-	align="horiz. centered"
-}
-composite {
-	object {
-		x=63
-		y=94
-		width=268
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=171
-				y=95
-				width=160
-				height=18
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="$(P)$(R)"
-		}
-		text {
-			object {
-				x=63
-				y=94
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="EPICS name"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=43
-		y=119
-		width=288
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=43
-				y=119
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Manufacturer"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=171
-				y=120
-				width=160
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Manufacturer_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=73
-		y=241
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix=" More"
-	align="horiz. right"
-}
-"related display" {
-	object {
-		x=172
-		y=241
-		width=70
-		height=20
-	}
-	display[0] {
-		label="asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)AsynIO"
-	}
-	display[1] {
-		label="Save restore status"
-		name="save_restoreStatus_more.adl"
-		args="P=$(P)"
-	}
-	display[2] {
-		label="Image plugin #1"
-		name="NDStdArrays.adl"
-		args="P=$(P), R=$(I)"
-	}
-	display[3] {
-		label="ROI plugin #1"
-		name="NDROI.adl"
-		args="P=$(P), R=$(ROI)"
-	}
-	display[4] {
-		label="netCDF plugin #1"
-		name="NDFileNetCDF.adl"
-		args="P=$(P), R=$(NETCDF)"
-	}
-	display[5] {
-		label="TIFF plugin #1"
-		name="NDFileTIFF.adl"
-		args="P=$(P), R=$(TIFF)"
-	}
-	display[6] {
-		label="JPEG plugin #1"
-		name="NDFileJPEG.adl"
-		args="P=$(P), R=$(JPEG)"
-	}
-	display[7] {
-		label="Nexus plugin #1"
-		name="NDFileNexus.adl"
-		args="P=$(P), R=$(NEXUS)"
-	}
-	display[8] {
-		label="Color convert plugin #1"
-		name="NDColorConvert.adl"
-		args="P=$(P), R=$(CC)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=113
-		y=144
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Model"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=145
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Model_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=63
-		y=194
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Connection"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=171
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Connect"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=256
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Disconnect"
-	press_msg="0"
-}
-text {
-	object {
-		x=202
-		y=167
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=63
-	}
-	"dynamic attribute" {
-		vis="if not zero"
-		calc="0"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Connected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=187
-		y=167
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=20
-	}
-	"dynamic attribute" {
-		vis="if zero"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Disconnected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=63
-		y=69
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="asyn port"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=70
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PortName_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-rectangle {
-	object {
-		x=119
-		y=292
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=290
-		width=335
-		height=295
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=293
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Readout"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=173
-		y=320
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="X"
-	align="horiz. right"
-}
-text {
-	object {
-		x=266
-		y=320
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Y"
-	align="horiz. right"
-}
 composite {
 	object {
 		x=472
@@ -886,93 +263,6 @@ text {
 	limits {
 	}
 }
-composite {
-	object {
-		x=345
-		y=595
-		width=350
-		height=60
-	}
-	"composite name"=""
-	children {
-		composite {
-			object {
-				x=472
-				y=597
-				width=107
-				height=21
-			}
-			"composite name"=""
-			children {
-				rectangle {
-					object {
-						x=472
-						y=597
-						width=107
-						height=21
-					}
-					"basic attribute" {
-						clr=2
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=505
-				y=597
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Attributes"
-			align="horiz. centered"
-		}
-		rectangle {
-			object {
-				x=345
-				y=595
-				width=350
-				height=60
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=358
-				y=624
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="File"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=403
-				y=625
-				width=280
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NDAttributesFile"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
-	}
-}
 composite {
 	object {
 		x=100
@@ -1008,398 +298,6 @@ composite {
 		}
 	}
 }
-"text entry" {
-	object {
-		x=148
-		y=365
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)BinX"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=241
-		y=365
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)BinY"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=148
-		y=345
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)BinX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=345
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)BinY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=67
-		y=365
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Binning"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=148
-		y=390
-		width=154
-		height=40
-	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=148
-				y=390
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MinX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=148
-				y=410
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=241
-				y=410
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=390
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MinY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=87
-		y=410
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Region start"
-	align="horiz. right"
-}
-text {
-	object {
-		x=97
-		y=455
-		width=40
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Region size"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=148
-		y=435
-		width=154
-		height=40
-	}
-	"composite name"=""
-	children {
-		"text entry" {
-			object {
-				x=148
-				y=455
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)SizeX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=241
-				y=455
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)SizeY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=148
-				y=435
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)SizeX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=435
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)SizeY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=34
-		y=505
-		width=180
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image size (bytes)"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=241
-		y=506
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySize_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=37
-		y=480
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image size"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=148
-		y=481
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySizeX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=481
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySizeY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-composite {
-	object {
-		x=47
-		y=530
-		width=273
-		height=45
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=47
-				y=530
-				width=90
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Data type"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=241
-				y=531
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)DataType_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			format="string"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=47
-				y=555
-				width=90
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Color mode"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=241
-				y=556
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ColorMode_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			format="string"
-			limits {
-			}
-		}
-	}
-}
 menu {
 	object {
 		x=479
@@ -1732,7 +630,7 @@ composite {
 composite {
 	object {
 		x=76
-		y=615
+		y=645
 		width=218
 		height=20
 	}
@@ -1741,7 +639,7 @@ composite {
 		"related display" {
 			object {
 				x=224
-				y=615
+				y=645
 				width=70
 				height=20
 			}
@@ -1761,7 +659,7 @@ composite {
 		text {
 			object {
 				x=76
-				y=615
+				y=645
 				width=140
 				height=20
 			}
@@ -1948,3 +846,508 @@ text {
 	textix="# Dropped frames"
 	align="horiz. right"
 }
+composite {
+	object {
+		x=5
+		y=35
+		width=335
+		height=215
+	}
+	"composite name"=""
+	"composite file"="ADSetup.adl"
+}
+composite {
+	object {
+		x=5
+		y=340
+		width=335
+		height=295
+	}
+	"composite name"=""
+	children {
+		rectangle {
+			object {
+				x=119
+				y=342
+				width=107
+				height=21
+			}
+			"basic attribute" {
+				clr=2
+			}
+		}
+		rectangle {
+			object {
+				x=5
+				y=340
+				width=335
+				height=295
+			}
+			"basic attribute" {
+				clr=14
+				fill="outline"
+			}
+		}
+		text {
+			object {
+				x=93
+				y=343
+				width=159
+				height=20
+			}
+			"basic attribute" {
+				clr=54
+			}
+			textix="Readout"
+			align="horiz. centered"
+		}
+		text {
+			object {
+				x=173
+				y=370
+				width=10
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="X"
+			align="horiz. right"
+		}
+		text {
+			object {
+				x=266
+				y=370
+				width=10
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Y"
+			align="horiz. right"
+		}
+		"text entry" {
+			object {
+				x=148
+				y=415
+				width=60
+				height=20
+			}
+			control {
+				chan="$(P)$(R)BinX"
+				clr=14
+				bclr=51
+			}
+			limits {
+			}
+		}
+		"text entry" {
+			object {
+				x=241
+				y=415
+				width=60
+				height=20
+			}
+			control {
+				chan="$(P)$(R)BinY"
+				clr=14
+				bclr=51
+			}
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=148
+				y=395
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)BinX_RBV"
+				clr=54
+				bclr=4
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=241
+				y=395
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)BinY_RBV"
+				clr=54
+				bclr=4
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+		text {
+			object {
+				x=67
+				y=415
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Binning"
+			align="horiz. right"
+		}
+		composite {
+			object {
+				x=148
+				y=440
+				width=154
+				height=40
+			}
+			"composite name"=""
+			children {
+				"text update" {
+					object {
+						x=148
+						y=440
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)MinX_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				"text entry" {
+					object {
+						x=148
+						y=460
+						width=60
+						height=20
+					}
+					control {
+						chan="$(P)$(R)MinX"
+						clr=14
+						bclr=51
+					}
+					limits {
+					}
+				}
+				"text entry" {
+					object {
+						x=241
+						y=460
+						width=60
+						height=20
+					}
+					control {
+						chan="$(P)$(R)MinY"
+						clr=14
+						bclr=51
+					}
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=241
+						y=440
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)MinY_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+			}
+		}
+		text {
+			object {
+				x=87
+				y=460
+				width=50
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Region start"
+			align="horiz. right"
+		}
+		text {
+			object {
+				x=97
+				y=505
+				width=40
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Region size"
+			align="horiz. right"
+		}
+		composite {
+			object {
+				x=148
+				y=485
+				width=154
+				height=40
+			}
+			"composite name"=""
+			children {
+				"text entry" {
+					object {
+						x=148
+						y=505
+						width=60
+						height=20
+					}
+					control {
+						chan="$(P)$(R)SizeX"
+						clr=14
+						bclr=51
+					}
+					limits {
+					}
+				}
+				"text entry" {
+					object {
+						x=241
+						y=505
+						width=60
+						height=20
+					}
+					control {
+						chan="$(P)$(R)SizeY"
+						clr=14
+						bclr=51
+					}
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=148
+						y=485
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)SizeX_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=241
+						y=485
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)SizeY_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+			}
+		}
+		text {
+			object {
+				x=34
+				y=555
+				width=180
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Image size (bytes)"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=241
+				y=556
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)ArraySize_RBV"
+				clr=54
+				bclr=4
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+		text {
+			object {
+				x=37
+				y=530
+				width=100
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Image size"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=148
+				y=531
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)ArraySizeX_RBV"
+				clr=54
+				bclr=4
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=241
+				y=531
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)ArraySizeY_RBV"
+				clr=54
+				bclr=4
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+		composite {
+			object {
+				x=47
+				y=580
+				width=273
+				height=45
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=47
+						y=580
+						width=90
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Data type"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=241
+						y=581
+						width=79
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)DataType_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					format="string"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=47
+						y=605
+						width=90
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Color mode"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=241
+						y=606
+						width=79
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)ColorMode_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					format="string"
+					limits {
+					}
+				}
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=5
+		y=255
+		width=335
+		height=80
+	}
+	"composite name"=""
+	"composite file"="ADPlugins.adl"
+}
+composite {
+	object {
+		x=345
+		y=35
+		width=350
+		height=165
+	}
+	"composite name"=""
+	"composite file"="ADShutter.adl"
+}
+composite {
+	object {
+		x=345
+		y=595
+		width=350
+		height=60
+	}
+	"composite name"=""
+	"composite file"="ADAttrFile.adl"
+}
diff --git a/ADApp/op/adl/mar345.adl b/ADApp/op/adl/mar345.adl
index f7f77a4..7b3b37f 100644
--- a/ADApp/op/adl/mar345.adl
+++ b/ADApp/op/adl/mar345.adl
@@ -1,14 +1,14 @@
 
 file {
-	name="/home/epics/devel/areaDetector/1-5beta/ADApp/op/adl/mar345.adl"
+	name="/home/epics/devel/areaDetector/ADApp/op/adl/mar345.adl"
 	version=030102
 }
 display {
 	object {
-		x=228
-		y=48
+		x=193
+		y=34
 		width=700
-		height=920
+		height=995
 	}
 	clr=14
 	bclr=4
@@ -111,492 +111,9 @@ text {
 	textix="mar345 Detector Control - $(P)$(R)"
 	align="horiz. centered"
 }
-rectangle {
-	object {
-		x=116
-		y=262
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=260
-		width=335
-		height=220
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=90
-		y=263
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Readout"
-	align="horiz. centered"
-}
-rectangle {
-	object {
-		x=119
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=35
-		width=335
-		height=220
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Setup"
-	align="horiz. centered"
-}
 composite {
 	object {
-		x=63
-		y=94
-		width=268
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=171
-				y=95
-				width=160
-				height=18
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="$(P)$(R)"
-		}
-		text {
-			object {
-				x=63
-				y=94
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="EPICS name"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=43
-		y=119
-		width=288
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=43
-				y=119
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Manufacturer"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=171
-				y=120
-				width=160
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Manufacturer_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=113
-		y=144
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Model"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=145
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Model_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=63
-		y=194
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Connection"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=171
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Connect"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=256
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Disconnect"
-	press_msg="0"
-}
-text {
-	object {
-		x=202
-		y=167
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=63
-	}
-	"dynamic attribute" {
-		vis="if not zero"
-		calc="0"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Connected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=187
-		y=167
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=20
-	}
-	"dynamic attribute" {
-		vis="if zero"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Disconnected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=63
-		y=69
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="asyn port"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=70
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PortName_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=73
-		y=225
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix=" More"
-	align="horiz. right"
-}
-"related display" {
-	object {
-		x=172
-		y=225
-		width=70
-		height=20
-	}
-	display[0] {
-		label="areaDetector asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)AsynIO"
-	}
-	display[1] {
-		label="Save restore status"
-		name="save_restoreStatus_more.adl"
-		args="P=$(P)"
-	}
-	display[2] {
-		label="Image plugin #1"
-		name="NDStdArrays.adl"
-		args="P=$(P), R=$(I)"
-	}
-	display[3] {
-		label="ROI plugin #1"
-		name="NDROI.adl"
-		args="P=$(P), R=$(ROI)"
-	}
-	display[4] {
-		label="netCDF plugin #1"
-		name="NDFileNetCDF.adl"
-		args="P=$(P), R=$(NETCDF)"
-	}
-	display[5] {
-		label="TIFF plugin #1"
-		name="NDFileTIFF.adl"
-		args="P=$(P), R=$(TIFF)"
-	}
-	display[6] {
-		label="JPEG plugin #1"
-		name="NDFileJPEG.adl"
-		args="P=$(P), R=$(JPEG)"
-	}
-	display[7] {
-		label="Nexus plugin #1"
-		name="NDFileNexus.adl"
-		args="P=$(P), R=$(NEXUS)"
-	}
-	display[8] {
-		label="marServer asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)marServerAsyn"
-	}
-	bclr=51
-}
-rectangle {
-	object {
-		x=458
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=345
-		y=35
-		width=350
-		height=165
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=431
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Shutter"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=361
-		y=69
-		width=150
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Shutter Mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=518
-		y=69
-		width=120
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterMode"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=411
-		y=118
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Open/Close"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=518
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Open"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=585
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Close"
-	press_msg="0"
-}
-text {
-	object {
-		x=351
-		y=93
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Status: Det."
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=477
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatus_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-composite {
-	object {
-		x=472
+		x=468
 		y=207
 		width=105
 		height=21
@@ -605,7 +122,7 @@ composite {
 	children {
 		rectangle {
 			object {
-				x=472
+				x=468
 				y=207
 				width=105
 				height=21
@@ -621,7 +138,7 @@ rectangle {
 		x=345
 		y=205
 		width=350
-		height=275
+		height=250
 	}
 	"basic attribute" {
 		clr=14
@@ -641,396 +158,6 @@ text {
 	textix="Collect"
 	align="horiz. centered"
 }
-"text entry" {
-	object {
-		x=477
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterOpenDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=360
-		y=143
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Delay: Open"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=143
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Close"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=617
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterCloseDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"related display" {
-	object {
-		x=550
-		y=171
-		width=70
-		height=20
-	}
-	display[0] {
-		name="ADEpicsShutter.adl"
-		args="P=$(P),R=$(R)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=351
-		y=171
-		width=190
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS shutter setup"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=93
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=617
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatusEPICS_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=14
-		y=315
-		width=130
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Detector Size"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=166
-		y=316
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)MaxSizeX_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=250
-		y=316
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)MaxSizeY_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-menu {
-	object {
-		x=151
-		y=340
-		width=90
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ScanSize"
-		clr=14
-		bclr=51
-	}
-}
-"text update" {
-	object {
-		x=250
-		y=341
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ScanSize_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=74
-		y=340
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Scan diameter"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=151
-		y=365
-		width=90
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ScanResolution"
-		clr=14
-		bclr=51
-	}
-}
-"text update" {
-	object {
-		x=250
-		y=366
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ScanResolution_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=74
-		y=365
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Pixel size"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=191
-		y=290
-		width=94
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=191
-				y=290
-				width=10
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="X"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=275
-				y=290
-				width=10
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Y"
-			align="horiz. right"
-		}
-	}
-}
-text {
-	object {
-		x=44
-		y=415
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image Size"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=166
-		y=416
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySizeX_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=250
-		y=416
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySizeY_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=41
-		y=440
-		width=180
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image Size (bytes)"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=250
-		y=441
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySize_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-"message button" {
-	object {
-		x=151
-		y=390
-		width=90
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ChangeMode"
-		clr=14
-		bclr=51
-	}
-	label="Change mode"
-	press_msg="1"
-}
-text {
-	object {
-		x=74
-		y=390
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Change mode"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=250
-		y=390
-		width=84
-		height=20
-	}
-	monitor {
-		chan="$(P)$(R)ChangeMode_RBV"
-		clr=63
-		bclr=4
-	}
-	clrmod="alarm"
-	limits {
-	}
-}
 text {
 	object {
 		x=355
@@ -1416,7 +543,7 @@ composite {
 composite {
 	object {
 		x=5
-		y=485
+		y=565
 		width=690
 		height=425
 	}
@@ -1425,7 +552,7 @@ composite {
 		rectangle {
 			object {
 				x=297
-				y=487
+				y=567
 				width=107
 				height=21
 			}
@@ -1436,7 +563,7 @@ composite {
 		"message button" {
 			object {
 				x=369
-				y=600
+				y=680
 				width=120
 				height=20
 			}
@@ -1451,7 +578,7 @@ composite {
 		text {
 			object {
 				x=271
-				y=488
+				y=568
 				width=159
 				height=20
 			}
@@ -1464,7 +591,7 @@ composite {
 		rectangle {
 			object {
 				x=5
-				y=485
+				y=565
 				width=690
 				height=80
 			}
@@ -1476,7 +603,7 @@ composite {
 		rectangle {
 			object {
 				x=299
-				y=571
+				y=651
 				width=105
 				height=21
 			}
@@ -1487,7 +614,7 @@ composite {
 		rectangle {
 			object {
 				x=5
-				y=570
+				y=650
 				width=690
 				height=105
 			}
@@ -1499,7 +626,7 @@ composite {
 		text {
 			object {
 				x=272
-				y=571
+				y=651
 				width=157
 				height=20
 			}
@@ -1512,7 +639,7 @@ composite {
 		text {
 			object {
 				x=17
-				y=600
+				y=680
 				width=140
 				height=20
 			}
@@ -1525,7 +652,7 @@ composite {
 		"text update" {
 			object {
 				x=164
-				y=600
+				y=680
 				width=158
 				height=18
 			}
@@ -1541,7 +668,7 @@ composite {
 		composite {
 			object {
 				x=36
-				y=625
+				y=705
 				width=653
 				height=20
 			}
@@ -1550,7 +677,7 @@ composite {
 				text {
 					object {
 						x=36
-						y=625
+						y=705
 						width=100
 						height=20
 					}
@@ -1563,7 +690,7 @@ composite {
 				"text update" {
 					object {
 						x=139
-						y=627
+						y=707
 						width=550
 						height=14
 					}
@@ -1581,7 +708,7 @@ composite {
 		composite {
 			object {
 				x=16
-				y=650
+				y=730
 				width=673
 				height=20
 			}
@@ -1590,7 +717,7 @@ composite {
 				"text update" {
 					object {
 						x=139
-						y=652
+						y=732
 						width=550
 						height=14
 					}
@@ -1606,7 +733,7 @@ composite {
 				text {
 					object {
 						x=16
-						y=650
+						y=730
 						width=120
 						height=20
 					}
@@ -1621,7 +748,7 @@ composite {
 		composite {
 			object {
 				x=20
-				y=687
+				y=767
 				width=109
 				height=21
 			}
@@ -1630,7 +757,7 @@ composite {
 				composite {
 					object {
 						x=20
-						y=687
+						y=767
 						width=109
 						height=21
 					}
@@ -1639,7 +766,7 @@ composite {
 						rectangle {
 							object {
 								x=20
-								y=687
+								y=767
 								width=109
 								height=21
 							}
@@ -1652,7 +779,7 @@ composite {
 				text {
 					object {
 						x=54
-						y=687
+						y=767
 						width=41
 						height=20
 					}
@@ -1667,7 +794,7 @@ composite {
 		composite {
 			object {
 				x=33
-				y=886
+				y=966
 				width=653
 				height=20
 			}
@@ -1676,7 +803,7 @@ composite {
 				text {
 					object {
 						x=33
-						y=886
+						y=966
 						width=133
 						height=20
 					}
@@ -1689,7 +816,7 @@ composite {
 				"text update" {
 					object {
 						x=175
-						y=887
+						y=967
 						width=511
 						height=18
 					}
@@ -1707,7 +834,7 @@ composite {
 		text {
 			object {
 				x=12
-				y=861
+				y=941
 				width=153
 				height=20
 			}
@@ -1720,7 +847,7 @@ composite {
 		composite {
 			object {
 				x=175
-				y=838
+				y=918
 				width=164
 				height=43
 			}
@@ -1729,7 +856,7 @@ composite {
 				"text update" {
 					object {
 						x=175
-						y=838
+						y=918
 						width=164
 						height=18
 					}
@@ -1745,7 +872,7 @@ composite {
 				"text entry" {
 					object {
 						x=175
-						y=861
+						y=941
 						width=164
 						height=20
 					}
@@ -1763,7 +890,7 @@ composite {
 		composite {
 			object {
 				x=22
-				y=813
+				y=893
 				width=305
 				height=20
 			}
@@ -1772,7 +899,7 @@ composite {
 				text {
 					object {
 						x=22
-						y=813
+						y=893
 						width=143
 						height=20
 					}
@@ -1785,7 +912,7 @@ composite {
 				menu {
 					object {
 						x=175
-						y=813
+						y=893
 						width=66
 						height=20
 					}
@@ -1798,7 +925,7 @@ composite {
 				"text update" {
 					object {
 						x=245
-						y=814
+						y=894
 						width=82
 						height=18
 					}
@@ -1815,7 +942,7 @@ composite {
 		composite {
 			object {
 				x=53
-				y=786
+				y=866
 				width=270
 				height=22
 			}
@@ -1824,7 +951,7 @@ composite {
 				text {
 					object {
 						x=53
-						y=787
+						y=867
 						width=112
 						height=20
 					}
@@ -1837,7 +964,7 @@ composite {
 				"text entry" {
 					object {
 						x=175
-						y=786
+						y=866
 						width=61
 						height=22
 					}
@@ -1852,7 +979,7 @@ composite {
 				"text update" {
 					object {
 						x=241
-						y=788
+						y=868
 						width=82
 						height=18
 					}
@@ -1869,7 +996,7 @@ composite {
 		composite {
 			object {
 				x=73
-				y=738
+				y=818
 				width=612
 				height=43
 			}
@@ -1878,7 +1005,7 @@ composite {
 				text {
 					object {
 						x=73
-						y=761
+						y=841
 						width=92
 						height=20
 					}
@@ -1891,7 +1018,7 @@ composite {
 				composite {
 					object {
 						x=174
-						y=738
+						y=818
 						width=511
 						height=43
 					}
@@ -1900,7 +1027,7 @@ composite {
 						"text entry" {
 							object {
 								x=174
-								y=761
+								y=841
 								width=511
 								height=20
 							}
@@ -1916,7 +1043,7 @@ composite {
 						"text update" {
 							object {
 								x=174
-								y=738
+								y=818
 								width=511
 								height=18
 							}
@@ -1936,7 +1063,7 @@ composite {
 		composite {
 			object {
 				x=73
-				y=690
+				y=770
 				width=612
 				height=43
 			}
@@ -1945,7 +1072,7 @@ composite {
 				composite {
 					object {
 						x=174
-						y=690
+						y=770
 						width=511
 						height=43
 					}
@@ -1954,7 +1081,7 @@ composite {
 						"text entry" {
 							object {
 								x=174
-								y=713
+								y=793
 								width=511
 								height=20
 							}
@@ -1970,7 +1097,7 @@ composite {
 						"text update" {
 							object {
 								x=174
-								y=690
+								y=770
 								width=511
 								height=18
 							}
@@ -1988,7 +1115,7 @@ composite {
 				text {
 					object {
 						x=73
-						y=713
+						y=793
 						width=92
 						height=20
 					}
@@ -2003,7 +1130,7 @@ composite {
 		rectangle {
 			object {
 				x=5
-				y=680
+				y=760
 				width=690
 				height=230
 			}
@@ -2015,7 +1142,7 @@ composite {
 		composite {
 			object {
 				x=387
-				y=861
+				y=941
 				width=286
 				height=20
 			}
@@ -2024,7 +1151,7 @@ composite {
 				text {
 					object {
 						x=387
-						y=861
+						y=941
 						width=112
 						height=20
 					}
@@ -2037,7 +1164,7 @@ composite {
 				"text update" {
 					object {
 						x=591
-						y=862
+						y=942
 						width=82
 						height=18
 					}
@@ -2052,7 +1179,7 @@ composite {
 				menu {
 					object {
 						x=504
-						y=861
+						y=941
 						width=82
 						height=20
 					}
@@ -2067,7 +1194,7 @@ composite {
 		composite {
 			object {
 				x=425
-				y=515
+				y=595
 				width=229
 				height=20
 			}
@@ -2076,7 +1203,7 @@ composite {
 				text {
 					object {
 						x=425
-						y=515
+						y=595
 						width=80
 						height=20
 					}
@@ -2089,7 +1216,7 @@ composite {
 				"text entry" {
 					object {
 						x=510
-						y=515
+						y=595
 						width=59
 						height=20
 					}
@@ -2104,7 +1231,7 @@ composite {
 				"text update" {
 					object {
 						x=575
-						y=516
+						y=596
 						width=79
 						height=18
 					}
@@ -2122,7 +1249,7 @@ composite {
 		"message button" {
 			object {
 				x=175
-				y=540
+				y=620
 				width=120
 				height=20
 			}
@@ -2137,7 +1264,7 @@ composite {
 		text {
 			object {
 				x=120
-				y=540
+				y=620
 				width=50
 				height=20
 			}
@@ -2150,7 +1277,7 @@ composite {
 		"text update" {
 			object {
 				x=305
-				y=540
+				y=620
 				width=84
 				height=20
 			}
@@ -2166,7 +1293,7 @@ composite {
 		text {
 			object {
 				x=20
-				y=515
+				y=595
 				width=150
 				height=20
 			}
@@ -2179,7 +1306,7 @@ composite {
 		menu {
 			object {
 				x=175
-				y=515
+				y=595
 				width=120
 				height=20
 			}
@@ -2192,7 +1319,7 @@ composite {
 		"text update" {
 			object {
 				x=305
-				y=516
+				y=596
 				width=80
 				height=18
 			}
@@ -2207,7 +1334,7 @@ composite {
 		text {
 			object {
 				x=425
-				y=540
+				y=620
 				width=80
 				height=20
 			}
@@ -2219,7 +1346,7 @@ composite {
 		"text update" {
 			object {
 				x=575
-				y=541
+				y=621
 				width=79
 				height=18
 			}
@@ -2236,41 +1363,365 @@ composite {
 }
 composite {
 	object {
-		x=355
-		y=455
-		width=330
-		height=20
+		x=5
+		y=35
+		width=335
+		height=215
+	}
+	"composite name"=""
+	"composite file"="ADSetup.adl"
+}
+composite {
+	object {
+		x=345
+		y=35
+		width=350
+		height=165
+	}
+	"composite name"=""
+	"composite file"="ADShutter.adl"
+}
+composite {
+	object {
+		x=5
+		y=340
+		width=335
+		height=220
 	}
 	"composite name"=""
 	children {
-		"text entry" {
+		rectangle {
 			object {
-				x=515
-				y=455
-				width=170
-				height=20
+				x=116
+				y=342
+				width=107
+				height=21
 			}
-			control {
-				chan="$(P)$(R)NDAttributesFile"
+			"basic attribute" {
+				clr=2
+			}
+		}
+		rectangle {
+			object {
+				x=5
+				y=340
+				width=335
+				height=220
+			}
+			"basic attribute" {
 				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
+				fill="outline"
 			}
 		}
 		text {
 			object {
-				x=355
-				y=455
-				width=150
+				x=90
+				y=343
+				width=159
+				height=20
+			}
+			"basic attribute" {
+				clr=54
+			}
+			textix="Readout"
+			align="horiz. centered"
+		}
+		text {
+			object {
+				x=14
+				y=395
+				width=130
 				height=20
 			}
 			"basic attribute" {
 				clr=14
 			}
-			textix="Attributes file"
+			textix="Detector Size"
 			align="horiz. right"
 		}
+		"text update" {
+			object {
+				x=166
+				y=396
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)MaxSizeX_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=250
+				y=396
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)MaxSizeY_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		menu {
+			object {
+				x=151
+				y=420
+				width=90
+				height=20
+			}
+			control {
+				chan="$(P)$(R)ScanSize"
+				clr=14
+				bclr=51
+			}
+		}
+		"text update" {
+			object {
+				x=250
+				y=421
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)ScanSize_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		text {
+			object {
+				x=74
+				y=420
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Scan diameter"
+			align="horiz. right"
+		}
+		menu {
+			object {
+				x=151
+				y=445
+				width=90
+				height=20
+			}
+			control {
+				chan="$(P)$(R)ScanResolution"
+				clr=14
+				bclr=51
+			}
+		}
+		"text update" {
+			object {
+				x=250
+				y=446
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)ScanResolution_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		text {
+			object {
+				x=74
+				y=445
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Pixel size"
+			align="horiz. right"
+		}
+		composite {
+			object {
+				x=191
+				y=370
+				width=94
+				height=20
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=191
+						y=370
+						width=10
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="X"
+					align="horiz. right"
+				}
+				text {
+					object {
+						x=275
+						y=370
+						width=10
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Y"
+					align="horiz. right"
+				}
+			}
+		}
+		text {
+			object {
+				x=44
+				y=495
+				width=100
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Image Size"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=166
+				y=496
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)ArraySizeX_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=250
+				y=496
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)ArraySizeY_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		text {
+			object {
+				x=41
+				y=520
+				width=180
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Image Size (bytes)"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=250
+				y=521
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)ArraySize_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		"message button" {
+			object {
+				x=151
+				y=470
+				width=90
+				height=20
+			}
+			control {
+				chan="$(P)$(R)ChangeMode"
+				clr=14
+				bclr=51
+			}
+			label="Change mode"
+			press_msg="1"
+		}
+		text {
+			object {
+				x=74
+				y=470
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Change mode"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=250
+				y=470
+				width=84
+				height=20
+			}
+			monitor {
+				chan="$(P)$(R)ChangeMode_RBV"
+				clr=63
+				bclr=4
+			}
+			clrmod="alarm"
+			limits {
+			}
+		}
 	}
 }
+composite {
+	object {
+		x=5
+		y=255
+		width=335
+		height=80
+	}
+	"composite name"=""
+	"composite file"="ADPlugins.adl"
+}
+composite {
+	object {
+		x=345
+		y=460
+		width=350
+		height=60
+	}
+	"composite name"=""
+	"composite file"="ADAttrFile.adl"
+}
diff --git a/ADApp/op/adl/marCCD.adl b/ADApp/op/adl/marCCD.adl
index d7f94d5..2f3049a 100644
--- a/ADApp/op/adl/marCCD.adl
+++ b/ADApp/op/adl/marCCD.adl
@@ -1,12 +1,12 @@
 
 file {
-	name="/home/epics/devel/areaDetector/1-5beta/ADApp/op/adl/marCCD.adl"
+	name="/home/epics/devel/areaDetector/ADApp/op/adl/marCCD.adl"
 	version=030102
 }
 display {
 	object {
-		x=373
-		y=35
+		x=849
+		y=53
 		width=700
 		height=1055
 	}
@@ -111,516 +111,6 @@ text {
 	textix="marCCD Detector Control - $(P)$(R)"
 	align="horiz. centered"
 }
-rectangle {
-	object {
-		x=116
-		y=262
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=260
-		width=335
-		height=265
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=90
-		y=263
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Readout"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=179
-		y=290
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="X"
-	align="horiz. right"
-}
-text {
-	object {
-		x=272
-		y=290
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Y"
-	align="horiz. right"
-}
-rectangle {
-	object {
-		x=119
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=35
-		width=335
-		height=220
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Setup"
-	align="horiz. centered"
-}
-composite {
-	object {
-		x=63
-		y=94
-		width=268
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=171
-				y=95
-				width=160
-				height=18
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="$(P)$(R)"
-		}
-		text {
-			object {
-				x=63
-				y=94
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="EPICS name"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=43
-		y=119
-		width=288
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=43
-				y=119
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Manufacturer"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=171
-				y=120
-				width=160
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Manufacturer_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=113
-		y=144
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Model"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=145
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Model_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=63
-		y=194
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Connection"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=171
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Connect"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=256
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Disconnect"
-	press_msg="0"
-}
-text {
-	object {
-		x=202
-		y=167
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=63
-	}
-	"dynamic attribute" {
-		vis="if not zero"
-		calc="0"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Connected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=187
-		y=167
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=20
-	}
-	"dynamic attribute" {
-		vis="if zero"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Disconnected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=63
-		y=69
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="asyn port"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=70
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PortName_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=73
-		y=225
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix=" More"
-	align="horiz. right"
-}
-"related display" {
-	object {
-		x=172
-		y=225
-		width=70
-		height=20
-	}
-	display[0] {
-		label="areaDetector asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)AsynIO"
-	}
-	display[1] {
-		label="Save restore status"
-		name="save_restoreStatus_more.adl"
-		args="P=$(P)"
-	}
-	display[2] {
-		label="Image plugin #1"
-		name="NDStdArrays.adl"
-		args="P=$(P), R=$(I)"
-	}
-	display[3] {
-		label="ROI plugin #1"
-		name="NDROI.adl"
-		args="P=$(P), R=$(ROI)"
-	}
-	display[4] {
-		label="netCDF plugin #1"
-		name="NDFileNetCDF.adl"
-		args="P=$(P), R=$(NETCDF)"
-	}
-	display[5] {
-		label="TIFF plugin #1"
-		name="NDFileTIFF.adl"
-		args="P=$(P), R=$(TIFF)"
-	}
-	display[6] {
-		label="JPEG plugin #1"
-		name="NDFileJPEG.adl"
-		args="P=$(P), R=$(JPEG)"
-	}
-	display[7] {
-		label="Nexus plugin #1"
-		name="NDFileNexus.adl"
-		args="P=$(P), R=$(NEXUS)"
-	}
-	display[8] {
-		label="marServer asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)marServerAsyn"
-	}
-	clr=14
-	bclr=51
-}
-rectangle {
-	object {
-		x=458
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=345
-		y=35
-		width=350
-		height=165
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=431
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Shutter"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=361
-		y=69
-		width=150
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Shutter Mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=518
-		y=69
-		width=120
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterMode"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=411
-		y=118
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Open/Close"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=518
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Open"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=585
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Close"
-	press_msg="0"
-}
-text {
-	object {
-		x=351
-		y=93
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Status: Det."
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=477
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatus_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
 composite {
 	object {
 		x=472
@@ -881,119 +371,6 @@ text {
 	limits {
 	}
 }
-"text entry" {
-	object {
-		x=477
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterOpenDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=360
-		y=143
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Delay: Open"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=143
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Close"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=617
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterCloseDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"related display" {
-	object {
-		x=550
-		y=171
-		width=70
-		height=20
-	}
-	display[0] {
-		name="ADEpicsShutter.adl"
-		args="P=$(P),R=$(R)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=351
-		y=171
-		width=190
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS shutter setup"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=93
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=617
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatusEPICS_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
 "text update" {
 	object {
 		x=601
@@ -1026,310 +403,6 @@ text {
 	limits {
 	}
 }
-composite {
-	object {
-		x=34
-		y=438
-		width=274
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=34
-				y=438
-				width=110
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Frame shift"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=154
-				y=438
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)FrameShift"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=247
-				y=439
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)FrameShift_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=41
-		y=413
-		width=268
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=41
-				y=413
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image Size (bytes)"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=248
-				y=414
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ArraySize_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=44
-		y=388
-		width=265
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=44
-				y=388
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image Size"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=155
-				y=389
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ArraySizeX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=248
-				y=389
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ArraySizeY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=74
-		y=363
-		width=233
-		height=20
-	}
-	"composite name"=""
-	children {
-		"text entry" {
-			object {
-				x=154
-				y=363
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)BinX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=247
-				y=363
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)BinY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=74
-				y=363
-				width=70
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Binning"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=154
-		y=340
-		width=154
-		height=18
-	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=154
-				y=340
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)BinX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=247
-				y=340
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)BinY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=14
-		y=315
-		width=294
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=14
-				y=315
-				width=130
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Detector Size"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=154
-				y=316
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MaxSizeX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=247
-				y=316
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MaxSizeY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
 composite {
 	object {
 		x=5
@@ -2713,3 +1786,410 @@ menu {
 	limits {
 	}
 }
+composite {
+	object {
+		x=5
+		y=35
+		width=335
+		height=215
+	}
+	"composite name"=""
+	"composite file"="ADSetup.adl"
+}
+composite {
+	object {
+		x=345
+		y=35
+		width=350
+		height=165
+	}
+	"composite name"=""
+	"composite file"="ADShutter.adl"
+}
+composite {
+	object {
+		x=5
+		y=340
+		width=335
+		height=205
+	}
+	"composite name"=""
+	children {
+		rectangle {
+			object {
+				x=116
+				y=342
+				width=107
+				height=21
+			}
+			"basic attribute" {
+				clr=2
+			}
+		}
+		rectangle {
+			object {
+				x=5
+				y=340
+				width=335
+				height=205
+			}
+			"basic attribute" {
+				clr=14
+				fill="outline"
+			}
+		}
+		text {
+			object {
+				x=90
+				y=343
+				width=159
+				height=20
+			}
+			"basic attribute" {
+				clr=54
+			}
+			textix="Readout"
+			align="horiz. centered"
+		}
+		text {
+			object {
+				x=179
+				y=370
+				width=10
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="X"
+			align="horiz. right"
+		}
+		text {
+			object {
+				x=272
+				y=370
+				width=10
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Y"
+			align="horiz. right"
+		}
+		composite {
+			object {
+				x=34
+				y=518
+				width=274
+				height=20
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=34
+						y=518
+						width=110
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Frame shift"
+					align="horiz. right"
+				}
+				"text entry" {
+					object {
+						x=154
+						y=518
+						width=60
+						height=20
+					}
+					control {
+						chan="$(P)$(R)FrameShift"
+						clr=14
+						bclr=51
+					}
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=247
+						y=519
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)FrameShift_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+			}
+		}
+		composite {
+			object {
+				x=41
+				y=493
+				width=268
+				height=20
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=41
+						y=493
+						width=180
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Image Size (bytes)"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=248
+						y=494
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)ArraySize_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+			}
+		}
+		composite {
+			object {
+				x=44
+				y=468
+				width=265
+				height=20
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=44
+						y=468
+						width=100
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Image Size"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=155
+						y=469
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)ArraySizeX_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=248
+						y=469
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)ArraySizeY_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+			}
+		}
+		composite {
+			object {
+				x=74
+				y=443
+				width=233
+				height=20
+			}
+			"composite name"=""
+			children {
+				"text entry" {
+					object {
+						x=154
+						y=443
+						width=60
+						height=20
+					}
+					control {
+						chan="$(P)$(R)BinX"
+						clr=14
+						bclr=51
+					}
+					limits {
+					}
+				}
+				"text entry" {
+					object {
+						x=247
+						y=443
+						width=60
+						height=20
+					}
+					control {
+						chan="$(P)$(R)BinY"
+						clr=14
+						bclr=51
+					}
+					limits {
+					}
+				}
+				text {
+					object {
+						x=74
+						y=443
+						width=70
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Binning"
+					align="horiz. right"
+				}
+			}
+		}
+		composite {
+			object {
+				x=154
+				y=420
+				width=154
+				height=18
+			}
+			"composite name"=""
+			children {
+				"text update" {
+					object {
+						x=154
+						y=420
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)BinX_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=247
+						y=420
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)BinY_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+			}
+		}
+		composite {
+			object {
+				x=14
+				y=395
+				width=294
+				height=20
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=14
+						y=395
+						width=130
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Detector Size"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=154
+						y=396
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)MaxSizeX_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=247
+						y=396
+						width=61
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)MaxSizeY_RBV"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=5
+		y=255
+		width=335
+		height=80
+	}
+	"composite name"=""
+	"composite file"="ADPlugins.adl"
+}
diff --git a/ADApp/op/adl/pilatusDetector.adl b/ADApp/op/adl/pilatusDetector.adl
index 6800cf9..418ab88 100644
--- a/ADApp/op/adl/pilatusDetector.adl
+++ b/ADApp/op/adl/pilatusDetector.adl
@@ -1,6 +1,6 @@
 
 file {
-	name="/home/epics/devel/areaDetector/1-5beta/ADApp/op/adl/pilatusDetector.adl"
+	name="/home/epics/devel/areaDetector/ADApp/op/adl/pilatusDetector.adl"
 	version=030102
 }
 display {
@@ -502,859 +502,197 @@ composite {
 		}
 	}
 }
-composite {
+rectangle {
+	object {
+		x=206
+		y=715
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=2
+	}
+}
+rectangle {
+	object {
+		x=206
+		y=580
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=2
+	}
+}
+rectangle {
+	object {
+		x=206
+		y=465
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=2
+	}
+}
+rectangle {
+	object {
+		x=206
+		y=405
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=2
+	}
+}
+text {
+	object {
+		x=256
+		y=405
+		width=80
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Detector"
+	align="horiz. centered"
+}
+rectangle {
 	object {
 		x=5
 		y=400
 		width=580
-		height=630
+		height=55
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+text {
+	object {
+		x=278
+		y=431
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Shaping time/Gain:"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=461
+		y=431
+		width=120
+		height=20
+	}
+	control {
+		chan="$(P)$(R)GainMenu"
+		clr=14
+		bclr=51
+	}
+}
+"text entry" {
+	object {
+		x=172
+		y=431
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ThresholdEnergy"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=9
+		y=431
+		width=160
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Threshold (keV):"
+	align="horiz. right"
+}
+rectangle {
+	object {
+		x=5
+		y=710
+		width=580
+		height=130
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+text {
+	object {
+		x=239
+		y=715
+		width=110
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="ROIs/Images"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=214
+		y=580
+		width=160
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Data corrections"
+	align="horiz. centered"
+}
+rectangle {
+	object {
+		x=5
+		y=575
+		width=580
+		height=130
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+composite {
+	object {
+		x=9
+		y=603
+		width=573
+		height=20
 	}
 	"composite name"=""
 	children {
-		rectangle {
-			object {
-				x=206
-				y=715
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		rectangle {
-			object {
-				x=206
-				y=580
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		rectangle {
-			object {
-				x=206
-				y=465
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		rectangle {
-			object {
-				x=206
-				y=405
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		text {
-			object {
-				x=256
-				y=405
-				width=80
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Detector"
-			align="horiz. centered"
-		}
-		rectangle {
-			object {
-				x=5
-				y=400
-				width=580
-				height=55
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=278
-				y=431
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Shaping time/Gain:"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=461
-				y=431
-				width=120
-				height=20
-			}
-			control {
-				chan="$(P)$(R)GainMenu"
-				clr=14
-				bclr=51
-			}
-		}
 		"text entry" {
 			object {
-				x=172
-				y=431
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ThresholdEnergy"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=9
-				y=431
-				width=160
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Threshold (keV):"
-			align="horiz. right"
-		}
-		rectangle {
-			object {
-				x=5
-				y=710
-				width=580
-				height=130
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=239
-				y=715
-				width=110
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="ROIs/Images"
-			align="horiz. centered"
-		}
-		text {
-			object {
-				x=214
-				y=580
-				width=160
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Data corrections"
-			align="horiz. centered"
-		}
-		rectangle {
-			object {
-				x=5
-				y=575
-				width=580
-				height=130
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		composite {
-			object {
-				x=9
+				x=182
 				y=603
-				width=573
-				height=20
-			}
-			"composite name"=""
-			children {
-				"text entry" {
-					object {
-						x=182
-						y=603
-						width=400
-						height=20
-					}
-					control {
-						chan="$(P)$(R)BadPixelFile"
-						clr=14
-						bclr=51
-					}
-					format="string"
-					limits {
-					}
-				}
-				text {
-					object {
-						x=9
-						y=603
-						width=170
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Bad pixel file:"
-					align="horiz. right"
-				}
-			}
-		}
-		composite {
-			object {
-				x=9
-				y=653
-				width=573
-				height=20
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=9
-						y=653
-						width=170
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Flat field file:"
-					align="horiz. right"
-				}
-				"text entry" {
-					object {
-						x=182
-						y=653
-						width=400
-						height=20
-					}
-					control {
-						chan="$(P)$(R)FlatFieldFile"
-						clr=14
-						bclr=51
-					}
-					format="string"
-					limits {
-					}
-				}
-			}
-		}
-		"text update" {
-			object {
-				x=182
-				y=629
-				width=80
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)NumBadPixels"
-				clr=14
-				bclr=51
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=9
-				y=628
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="# Bad pixels:"
-			align="horiz. right"
-		}
-		composite {
-			object {
-				x=9
-				y=678
-				width=253
-				height=20
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=9
-						y=678
-						width=170
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Flat field valid:"
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=182
-						y=679
-						width=80
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)FlatFieldValid"
-						clr=14
-						bclr=51
-					}
-					align="horiz. centered"
-					format="string"
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=296
-				y=678
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Min. flat field:"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=479
-				y=678
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinFlatField"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		rectangle {
-			object {
-				x=5
-				y=460
-				width=580
-				height=110
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=261
-				y=465
-				width=70
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Shutter"
-			align="horiz. centered"
-		}
-		text {
-			object {
-				x=415
-				y=491
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Open/Close"
-			align="horiz. right"
-		}
-		"message button" {
-			object {
-				x=395
-				y=515
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ShutterControl"
-				clr=14
-				bclr=51
-			}
-			label="Open"
-			press_msg="1"
-		}
-		"message button" {
-			object {
-				x=462
-				y=515
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ShutterControl"
-				clr=14
-				bclr=51
-			}
-			label="Close"
-			press_msg="0"
-		}
-		"text entry" {
-			object {
-				x=128
-				y=543
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ShutterOpenDelay"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=11
-				y=543
-				width=110
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Delay: Open"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=197
-				y=543
-				width=50
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Close"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=254
-				y=543
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ShutterCloseDelay"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"related display" {
-			object {
-				x=492
-				y=543
-				width=70
-				height=20
-			}
-			display[0] {
-				name="ADEpicsShutter.adl"
-				args="P=$(P),R=$(R)"
-			}
-			clr=14
-			bclr=51
-		}
-		text {
-			object {
-				x=344
-				y=543
-				width=130
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Shutter setup"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=24
-				y=491
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Shutter Mode"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=181
-				y=491
-				width=120
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ShutterMode"
-				clr=14
-				bclr=51
-			}
-		}
-		text {
-			object {
-				x=14
-				y=515
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Status: Det."
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=140
-				y=516
-				width=60
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ShutterStatus_RBV"
-				clr=54
-				bclr=2
-			}
-			clrmod="alarm"
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=223
-				y=515
-				width=50
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="EPICS"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=280
-				y=516
-				width=60
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ShutterStatusEPICS_RBV"
-				clr=54
-				bclr=2
-			}
-			clrmod="alarm"
-			align="horiz. centered"
-			limits {
-			}
-		}
-		rectangle {
-			object {
-				x=206
-				y=850
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		text {
-			object {
-				x=356
-				y=1003
-				width=90
-				height=20
-			}
-			"basic attribute" {
-				clr=20
-			}
-			"dynamic attribute" {
-				vis="if not zero"
-				chan="$(P)$(R)Armed"
-			}
-			textix="Armed"
-			align="horiz. centered"
-		}
-		text {
-			object {
-				x=244
-				y=850
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Collection"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=182
-				y=900
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)AcquireTime"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=9
-				y=900
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Exposure time:"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=182
-				y=925
-				width=50
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NumImages"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=9
-				y=925
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Number of images:"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=9
-				y=875
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Acquire mode:"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=182
-				y=875
-				width=120
-				height=20
-			}
-			control {
-				chan="$(P)$(R)TriggerMode"
-				clr=14
-				bclr=4
-			}
-		}
-		"text entry" {
-			object {
-				x=480
-				y=900
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)DelayTime"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=307
-				y=900
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Delay time:"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=480
-				y=875
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)AcquirePeriod"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=307
-				y=875
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Exposure period:"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=480
-				y=925
-				width=50
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NumExposures"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=307
-				y=925
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Exposures/image:"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=297
-				y=950
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Read TIFF timeout:"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=480
-				y=950
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ReadTiffTimeout"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		rectangle {
-			object {
-				x=5
-				y=845
-				width=580
-				height=185
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		"text update" {
-			object {
-				x=182
-				y=976
 				width=400
-				height=12
+				height=20
 			}
-			monitor {
-				chan="$(P)$(R)StatusMessage_RBV"
+			control {
+				chan="$(P)$(R)BadPixelFile"
 				clr=14
 				bclr=51
 			}
@@ -1365,94 +703,713 @@ composite {
 		text {
 			object {
 				x=9
-				y=975
+				y=603
 				width=170
 				height=20
 			}
 			"basic attribute" {
 				clr=14
 			}
-			textix="Status:"
+			textix="Bad pixel file:"
 			align="horiz. right"
 		}
-		"message button" {
+	}
+}
+composite {
+	object {
+		x=9
+		y=653
+		width=573
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
 			object {
-				x=51
-				y=1001
-				width=100
-				height=25
+				x=9
+				y=653
+				width=170
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Flat field file:"
+			align="horiz. right"
+		}
+		"text entry" {
+			object {
+				x=182
+				y=653
+				width=400
+				height=20
 			}
 			control {
-				chan="$(P)$(R)Acquire"
+				chan="$(P)$(R)FlatFieldFile"
 				clr=14
 				bclr=51
 			}
-			label="Acquire"
-			press_msg="1"
+			format="string"
+			limits {
+			}
 		}
-		composite {
+	}
+}
+"text update" {
+	object {
+		x=182
+		y=629
+		width=80
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)NumBadPixels"
+		clr=14
+		bclr=51
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=9
+		y=628
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# Bad pixels:"
+	align="horiz. right"
+}
+composite {
+	object {
+		x=9
+		y=678
+		width=253
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=9
+				y=678
+				width=170
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Flat field valid:"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=182
+				y=679
+				width=80
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)FlatFieldValid"
+				clr=14
+				bclr=51
+			}
+			align="horiz. centered"
+			format="string"
+			limits {
+			}
+		}
+	}
+}
+text {
+	object {
+		x=296
+		y=678
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Min. flat field:"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=479
+		y=678
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)MinFlatField"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+rectangle {
+	object {
+		x=5
+		y=460
+		width=580
+		height=110
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+text {
+	object {
+		x=261
+		y=465
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Shutter"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=415
+		y=491
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Open/Close"
+	align="horiz. right"
+}
+"message button" {
+	object {
+		x=395
+		y=515
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterControl"
+		clr=14
+		bclr=51
+	}
+	label="Open"
+	press_msg="1"
+}
+"message button" {
+	object {
+		x=462
+		y=515
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterControl"
+		clr=14
+		bclr=51
+	}
+	label="Close"
+	press_msg="0"
+}
+"text entry" {
+	object {
+		x=128
+		y=543
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterOpenDelay"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=11
+		y=543
+		width=110
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Delay: Open"
+	align="horiz. right"
+}
+text {
+	object {
+		x=197
+		y=543
+		width=50
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Close"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=254
+		y=543
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterCloseDelay"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"related display" {
+	object {
+		x=492
+		y=543
+		width=70
+		height=20
+	}
+	display[0] {
+		name="ADEpicsShutter.adl"
+		args="P=$(P),R=$(R)"
+	}
+	clr=14
+	bclr=51
+}
+text {
+	object {
+		x=344
+		y=543
+		width=130
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Shutter setup"
+	align="horiz. right"
+}
+text {
+	object {
+		x=24
+		y=491
+		width=150
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Shutter Mode"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=181
+		y=491
+		width=120
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterMode"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=14
+		y=515
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Status: Det."
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=140
+		y=516
+		width=60
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ShutterStatus_RBV"
+		clr=54
+		bclr=2
+	}
+	clrmod="alarm"
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=223
+		y=515
+		width=50
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="EPICS"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=280
+		y=516
+		width=60
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ShutterStatusEPICS_RBV"
+		clr=54
+		bclr=2
+	}
+	clrmod="alarm"
+	align="horiz. centered"
+	limits {
+	}
+}
+rectangle {
+	object {
+		x=206
+		y=850
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=2
+	}
+}
+text {
+	object {
+		x=356
+		y=1003
+		width=90
+		height=20
+	}
+	"basic attribute" {
+		clr=20
+	}
+	"dynamic attribute" {
+		vis="if not zero"
+		chan="$(P)$(R)Armed"
+	}
+	textix="Armed"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=244
+		y=850
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Collection"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=182
+		y=900
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AcquireTime"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=9
+		y=900
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Exposure time:"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=182
+		y=925
+		width=50
+		height=20
+	}
+	control {
+		chan="$(P)$(R)NumImages"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=9
+		y=925
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Number of images:"
+	align="horiz. right"
+}
+text {
+	object {
+		x=9
+		y=875
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Acquire mode:"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=182
+		y=875
+		width=120
+		height=20
+	}
+	control {
+		chan="$(P)$(R)TriggerMode"
+		clr=14
+		bclr=4
+	}
+}
+"text entry" {
+	object {
+		x=480
+		y=900
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)DelayTime"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=307
+		y=900
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Delay time:"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=480
+		y=875
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AcquirePeriod"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=307
+		y=875
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Exposure period:"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=480
+		y=925
+		width=50
+		height=20
+	}
+	control {
+		chan="$(P)$(R)NumExposures"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=307
+		y=925
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Exposures/image:"
+	align="horiz. right"
+}
+text {
+	object {
+		x=297
+		y=950
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Read TIFF timeout:"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=480
+		y=950
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ReadTiffTimeout"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+rectangle {
+	object {
+		x=5
+		y=845
+		width=580
+		height=185
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+"text update" {
+	object {
+		x=182
+		y=976
+		width=400
+		height=12
+	}
+	monitor {
+		chan="$(P)$(R)StatusMessage_RBV"
+		clr=14
+		bclr=51
+	}
+	format="string"
+	limits {
+	}
+}
+text {
+	object {
+		x=9
+		y=975
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Status:"
+	align="horiz. right"
+}
+"message button" {
+	object {
+		x=51
+		y=1001
+		width=100
+		height=25
+	}
+	control {
+		chan="$(P)$(R)Acquire"
+		clr=14
+		bclr=51
+	}
+	label="Acquire"
+	press_msg="1"
+}
+composite {
+	object {
+		x=261
+		y=1003
+		width=90
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
 			object {
 				x=261
 				y=1003
 				width=90
 				height=20
 			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=261
-						y=1003
-						width=90
-						height=20
-					}
-					"basic attribute" {
-						clr=20
-					}
-					"dynamic attribute" {
-						vis="if not zero"
-						chan="$(P)$(R)Acquire"
-					}
-					textix="Acquiring"
-					align="horiz. centered"
-				}
-				text {
-					object {
-						x=261
-						y=1003
-						width=90
-						height=20
-					}
-					"basic attribute" {
-						clr=63
-					}
-					"dynamic attribute" {
-						vis="if zero"
-						chan="$(P)$(R)Acquire"
-					}
-					textix="Done"
-					align="horiz. centered"
-				}
+			"basic attribute" {
+				clr=20
 			}
-		}
-		"message button" {
-			object {
-				x=156
-				y=1001
-				width=100
-				height=25
-			}
-			control {
+			"dynamic attribute" {
+				vis="if not zero"
 				chan="$(P)$(R)Acquire"
-				clr=14
-				bclr=51
 			}
-			label="Abort"
-			press_msg="0"
+			textix="Acquiring"
+			align="horiz. centered"
 		}
 		text {
 			object {
-				x=356
+				x=261
 				y=1003
 				width=90
 				height=20
@@ -1462,289 +1419,321 @@ composite {
 			}
 			"dynamic attribute" {
 				vis="if zero"
-				chan="$(P)$(R)Armed"
+				chan="$(P)$(R)Acquire"
 			}
-			textix="Unarmed"
+			textix="Done"
 			align="horiz. centered"
 		}
-		"related display" {
-			object {
-				x=451
-				y=1001
-				width=90
-				height=25
-			}
-			display[0] {
-				label="Scan 1"
-				name="scan_more.adl"
-				args="P=$(P), S=scan1, N=1"
-			}
-			display[1] {
-				label="Scan 2"
-				name="scan_more.adl"
-				args="P=$(P), S=scan2, N=2"
-			}
-			display[2] {
-				label="Scan 3"
-				name="scan_more.adl"
-				args="P=$(P), S=scan3, N=3"
-			}
-			display[3] {
-				label="Scan 4"
-				name="scan_more.adl"
-				args="P=$(P), S=scan4, N=4"
-			}
-			display[4] {
-				label="ScanH"
-				name="scan_more.adl"
-				args="P=$(P), S=scanH, N=H"
-			}
-			clr=14
-			bclr=51
-			label="Scan"
-		}
-		text {
-			object {
-				x=297
-				y=815
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Min. image update:"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=480
-				y=815
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(I)MinCallbackTime"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=9
-				y=765
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="ROI definitions:"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=296
-				y=790
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Highlight ROIs:"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=479
-				y=790
-				width=90
-				height=20
-			}
-			control {
-				chan="$(P)$(ROI)Highlight"
-				clr=14
-				bclr=51
-			}
-		}
-		"related display" {
-			object {
-				x=182
-				y=765
-				width=90
-				height=20
-			}
-			display[0] {
-				label="ROIS 1-8"
-				name="NDROI8.adl"
-				args="P=$(P),ROI1=$(ROI)0:,ROI2=$(ROI)1:,ROI3=$(ROI)2:,ROI4=$(ROI)3:,ROI5=$(ROI)4:,ROI6=$(ROI)5:,ROI7=$(ROI)6:,ROI8=$(ROI)7:,"
-			}
-			display[1] {
-				label="ROIS 9-16"
-				name="NDROI8.adl"
-				args="P=$(P),ROI1=$(ROI)8:,ROI2=$(ROI)9:,ROI3=$(ROI)10:,ROI4=$(ROI)11:,ROI5=$(ROI)12:,ROI6=$(ROI)13:,ROI7=$(ROI)14:,ROI8=$(ROI)15:,"
-			}
-			display[2] {
-				label="ROIS 17-24"
-				name="NDROI8.adl"
-				args="P=$(P),ROI1=$(ROI)16:,ROI2=$(ROI)17:,ROI3=$(ROI)18:,ROI4=$(ROI)19:,ROI5=$(ROI)20:,ROI6=$(ROI)21:,ROI7=$(ROI)22:,ROI8=$(ROI)23:,"
-			}
-			display[3] {
-				label="ROIS 25-32"
-				name="NDROI8.adl"
-				args="P=$(P),ROI1=$(ROI)24:,ROI2=$(ROI)25:,ROI3=$(ROI)26:,ROI4=$(ROI)27:,ROI5=$(ROI)28:,ROI6=$(ROI)29:,ROI7=$(ROI)30:,ROI8=$(ROI)31:,"
-			}
-			clr=14
-			bclr=51
-			label="ROIs"
-		}
-		text {
-			object {
-				x=29
-				y=790
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Enable ROIs:"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=182
-				y=790
-				width=90
-				height=20
-			}
-			control {
-				chan="$(P)$(ROI)EnableCallbacks"
-				clr=14
-				bclr=51
-			}
-		}
-		text {
-			object {
-				x=326
-				y=765
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="More:"
-			align="horiz. right"
-		}
-		"related display" {
-			object {
-				x=479
-				y=765
-				width=90
-				height=20
-			}
-	        display[0] {
-		        label="asyn record"
-		        name="asynRecord.adl"
-		        args="P=$(P),R=$(R)AsynIO"
-	        }
-	        display[1] {
-		        label="Save restore status"
-		        name="save_restoreStatus_more.adl"
-		        args="P=$(P)"
-	        }
-	        display[2] {
-		        label="Image plugin #1"
-		        name="NDStdArrays.adl"
-		        args="P=$(P), R=$(I)"
-	        }
-	        display[3] {
-		        label="ROI plugin #1"
-		        name="NDROI.adl"
-		        args="P=$(P), R=$(ROI)"
-	        }
-	        display[4] {
-		        label="netCDF plugin #1"
-		        name="NDFileNetCDF.adl"
-		        args="P=$(P), R=$(NETCDF)"
-	        }
-	        display[5] {
-		        label="TIFF plugin #1"
-		        name="NDFileTIFF.adl"
-		        args="P=$(P), R=$(TIFF)"
-	        }
-	        display[6] {
-		        label="JPEG plugin #1"
-		        name="NDFileJPEG.adl"
-		        args="P=$(P), R=$(JPEG)"
-	        }
-	        display[7] {
-		        label="Nexus plugin #1"
-		        name="NDFileNexus.adl"
-		        args="P=$(P), R=$(NEXUS)"
-	        }
-            clr=14
-			bclr=51
-			label="Setup"
-		}
-		menu {
-			object {
-				x=182
-				y=815
-				width=90
-				height=20
-			}
-			control {
-				chan="$(P)$(I)EnableCallbacks"
-				clr=14
-				bclr=51
-			}
-		}
-		text {
-			object {
-				x=9
-				y=815
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Post images:"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=182
-				y=740
-				width=90
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ArrayCallbacks"
-				clr=14
-				bclr=51
-			}
-		}
-		text {
-			object {
-				x=9
-				y=740
-				width=170
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Read TIFF files:"
-			align="horiz. right"
-		}
 	}
 }
+"message button" {
+	object {
+		x=156
+		y=1001
+		width=100
+		height=25
+	}
+	control {
+		chan="$(P)$(R)Acquire"
+		clr=14
+		bclr=51
+	}
+	label="Abort"
+	press_msg="0"
+}
+text {
+	object {
+		x=356
+		y=1003
+		width=90
+		height=20
+	}
+	"basic attribute" {
+		clr=63
+	}
+	"dynamic attribute" {
+		vis="if zero"
+		chan="$(P)$(R)Armed"
+	}
+	textix="Unarmed"
+	align="horiz. centered"
+}
+"related display" {
+	object {
+		x=451
+		y=1001
+		width=90
+		height=25
+	}
+	display[0] {
+		label="Scan 1"
+		name="scan_more.adl"
+		args="P=$(P), S=scan1, N=1"
+	}
+	display[1] {
+		label="Scan 2"
+		name="scan_more.adl"
+		args="P=$(P), S=scan2, N=2"
+	}
+	display[2] {
+		label="Scan 3"
+		name="scan_more.adl"
+		args="P=$(P), S=scan3, N=3"
+	}
+	display[3] {
+		label="Scan 4"
+		name="scan_more.adl"
+		args="P=$(P), S=scan4, N=4"
+	}
+	display[4] {
+		label="ScanH"
+		name="scan_more.adl"
+		args="P=$(P), S=scanH, N=H"
+	}
+	clr=14
+	bclr=51
+	label="Scan"
+}
+text {
+	object {
+		x=297
+		y=815
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Min. image update:"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=480
+		y=815
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(I)MinCallbackTime"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=9
+		y=765
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="ROI definitions:"
+	align="horiz. right"
+}
+text {
+	object {
+		x=296
+		y=790
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Highlight ROIs:"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=479
+		y=790
+		width=90
+		height=20
+	}
+	control {
+		chan="$(P)$(ROI)Highlight"
+		clr=14
+		bclr=51
+	}
+}
+"related display" {
+	object {
+		x=182
+		y=765
+		width=90
+		height=20
+	}
+	display[0] {
+		label="ROIS 1-8"
+		name="NDROI8.adl"
+		args="P=$(P),ROI1=$(ROI)0:,ROI2=$(ROI)1:,ROI3=$(ROI)2:,ROI4=$(ROI)3:,ROI5=$(ROI)4:,ROI6=$(ROI)5:,ROI7=$(ROI)6:,ROI8=$(ROI)7:,"
+	}
+	display[1] {
+		label="ROIS 9-16"
+		name="NDROI8.adl"
+		args="P=$(P),ROI1=$(ROI)8:,ROI2=$(ROI)9:,ROI3=$(ROI)10:,ROI4=$(ROI)11:,ROI5=$(ROI)12:,ROI6=$(ROI)13:,ROI7=$(ROI)14:,ROI8=$(ROI)15:,"
+	}
+	display[2] {
+		label="ROIS 17-24"
+		name="NDROI8.adl"
+		args="P=$(P),ROI1=$(ROI)16:,ROI2=$(ROI)17:,ROI3=$(ROI)18:,ROI4=$(ROI)19:,ROI5=$(ROI)20:,ROI6=$(ROI)21:,ROI7=$(ROI)22:,ROI8=$(ROI)23:,"
+	}
+	display[3] {
+		label="ROIS 25-32"
+		name="NDROI8.adl"
+		args="P=$(P),ROI1=$(ROI)24:,ROI2=$(ROI)25:,ROI3=$(ROI)26:,ROI4=$(ROI)27:,ROI5=$(ROI)28:,ROI6=$(ROI)29:,ROI7=$(ROI)30:,ROI8=$(ROI)31:,"
+	}
+	clr=14
+	bclr=51
+	label="ROIs"
+}
+text {
+	object {
+		x=29
+		y=790
+		width=150
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Enable ROIs:"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=182
+		y=790
+		width=90
+		height=20
+	}
+	control {
+		chan="$(P)$(ROI)EnableCallbacks"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=326
+		y=765
+		width=150
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="More:"
+	align="horiz. right"
+}
+"related display" {
+	object {
+		x=479
+		y=765
+		width=90
+		height=20
+	}
+	display[0] {
+		label="asyn record"
+		name="asynRecord.adl"
+		args="P=$(P),R=$(R)AsynIO"
+	}
+	display[1] {
+		label="Save restore status"
+		name="save_restoreStatus_more.adl"
+		args="P=$(P)"
+	}
+	display[2] {
+		label="Image plugin #1"
+		name="NDStdArrays.adl"
+		args="P=$(P), R=$(I)"
+	}
+	display[3] {
+		label="ROI plugin #1"
+		name="NDROI.adl"
+		args="P=$(P), R=$(ROI)"
+	}
+	display[4] {
+		label="netCDF plugin #1"
+		name="NDFileNetCDF.adl"
+		args="P=$(P), R=$(NETCDF)"
+	}
+	display[5] {
+		label="TIFF plugin #1"
+		name="NDFileTIFF.adl"
+		args="P=$(P), R=$(TIFF)"
+	}
+	display[6] {
+		label="JPEG plugin #1"
+		name="NDFileJPEG.adl"
+		args="P=$(P), R=$(JPEG)"
+	}
+	display[7] {
+		label="Nexus plugin #1"
+		name="NDFileNexus.adl"
+		args="P=$(P), R=$(NEXUS)"
+	}
+	clr=14
+	bclr=51
+	label="Setup"
+}
+menu {
+	object {
+		x=182
+		y=815
+		width=90
+		height=20
+	}
+	control {
+		chan="$(P)$(I)EnableCallbacks"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=9
+		y=815
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Post images:"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=182
+		y=740
+		width=90
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ArrayCallbacks"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=9
+		y=740
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Read TIFF files:"
+	align="horiz. right"
+}
 text {
 	object {
 		x=14
diff --git a/ADApp/op/adl/prosilica.adl b/ADApp/op/adl/prosilica.adl
index 8359bfa..45fd76f 100644
--- a/ADApp/op/adl/prosilica.adl
+++ b/ADApp/op/adl/prosilica.adl
@@ -5,8 +5,8 @@ file {
 }
 display {
 	object {
-		x=629
-		y=180
+		x=149
+		y=55
 		width=700
 		height=750
 	}
@@ -87,532 +87,6 @@ display {
 		1a7309,
 	}
 }
-rectangle {
-	object {
-		x=458
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=345
-		y=35
-		width=350
-		height=165
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=431
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Shutter"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=361
-		y=69
-		width=150
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Shutter mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=518
-		y=69
-		width=120
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterMode"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=411
-		y=118
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Open/Close"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=518
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Open"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=585
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Close"
-	press_msg="0"
-}
-text {
-	object {
-		x=351
-		y=93
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Status: Det."
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=477
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatus_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=477
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterOpenDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=360
-		y=143
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Delay: Open"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=143
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Close"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=617
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterCloseDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"related display" {
-	object {
-		x=550
-		y=171
-		width=70
-		height=20
-	}
-	display[0] {
-		name="ADEpicsShutter.adl"
-		args="P=$(P),R=$(R)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=351
-		y=171
-		width=190
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS shutter setup"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=93
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=617
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatusEPICS_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-rectangle {
-	object {
-		x=119
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=35
-		width=335
-		height=215
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Setup"
-	align="horiz. centered"
-}
-composite {
-	object {
-		x=63
-		y=94
-		width=268
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=171
-				y=95
-				width=160
-				height=18
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="$(P)$(R)"
-		}
-		text {
-			object {
-				x=63
-				y=94
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="EPICS name"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=43
-		y=119
-		width=288
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=43
-				y=119
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Manufacturer"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=171
-				y=120
-				width=160
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Manufacturer_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=73
-		y=223
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Debugging"
-	align="horiz. right"
-}
-"related display" {
-	object {
-		x=172
-		y=223
-		width=70
-		height=20
-	}
-	display[0] {
-		label="asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)AsynIO"
-	}
-	display[1] {
-		label="Save restore status"
-		name="save_restoreStatus_more.adl"
-		args="P=$(P)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=113
-		y=144
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Model"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=145
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Model_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=63
-		y=194
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Connection"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=171
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Connect"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=256
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Disconnect"
-	press_msg="0"
-}
-text {
-	object {
-		x=202
-		y=167
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=63
-	}
-	"dynamic attribute" {
-		vis="if not zero"
-		calc="0"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Connected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=187
-		y=167
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=20
-	}
-	"dynamic attribute" {
-		vis="if zero"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Disconnected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=63
-		y=69
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="asyn port"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=70
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PortName_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
 composite {
 	object {
 		x=472
@@ -817,189 +291,6 @@ text {
 	limits {
 	}
 }
-composite {
-	object {
-		x=345
-		y=635
-		width=350
-		height=60
-	}
-	"composite name"=""
-	children {
-		composite {
-			object {
-				x=472
-				y=637
-				width=107
-				height=21
-			}
-			"composite name"=""
-			children {
-				composite {
-					object {
-						x=472
-						y=637
-						width=107
-						height=21
-					}
-					"composite name"=""
-					children {
-						rectangle {
-							object {
-								x=472
-								y=637
-								width=107
-								height=21
-							}
-							"basic attribute" {
-								clr=2
-							}
-						}
-					}
-				}
-				text {
-					object {
-						x=505
-						y=637
-						width=40
-						height=20
-					}
-					"basic attribute" {
-						clr=54
-					}
-					textix="File"
-					align="horiz. centered"
-				}
-			}
-		}
-		rectangle {
-			object {
-				x=345
-				y=635
-				width=350
-				height=60
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=358
-				y=664
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Driver file I/O"
-			align="horiz. right"
-		}
-		"related display" {
-			object {
-				x=515
-				y=664
-				width=70
-				height=20
-			}
-			display[0] {
-				name="NDFile.adl"
-				args="P=$(P),R=$(R)"
-			}
-			clr=14
-			bclr=51
-		}
-	}
-}
-composite {
-	object {
-		x=345
-		y=570
-		width=350
-		height=60
-	}
-	"composite name"=""
-	children {
-		composite {
-			object {
-				x=472
-				y=572
-				width=107
-				height=21
-			}
-			"composite name"=""
-			children {
-				rectangle {
-					object {
-						x=472
-						y=572
-						width=107
-						height=21
-					}
-					"basic attribute" {
-						clr=2
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=505
-				y=572
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Attributes"
-			align="horiz. centered"
-		}
-		rectangle {
-			object {
-				x=345
-				y=570
-				width=350
-				height=60
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=358
-				y=599
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="File"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=403
-				y=600
-				width=280
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NDAttributesFile"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
-	}
-}
 composite {
 	object {
 		x=100
@@ -2098,6 +1389,16 @@ composite {
 		}
 	}
 }
+composite {
+	object {
+		x=5
+		y=35
+		width=335
+		height=215
+	}
+	"composite name"=""
+	"composite file"="ADSetup.adl"
+}
 composite {
 	object {
 		x=5
@@ -2106,241 +1407,35 @@ composite {
 		height=80
 	}
 	"composite name"=""
-	children {
-		text {
-			object {
-				x=127
-				y=265
-				width=1
-				height=40
-			}
-			"basic attribute" {
-				clr=14
-			}
-		}
-		"related display" {
-			object {
-				x=114
-				y=285
-				width=64
-				height=20
-			}
-			display[0] {
-				label="netCDF file #1"
-				name="NDFileNetCDF.adl"
-				args="P=13SIM1:, R=netCDF1:"
-			}
-			display[1] {
-				label="TIFF file #1"
-				name="NDFileTIFF.adl"
-				args="P=13SIM1:, R=TIFF1:"
-			}
-			display[2] {
-				label="JPEG file #1"
-				name="NDFileJPEG.adl"
-				args="P=13SIM1:, R=JPEG1:"
-			}
-			display[3] {
-				label="NeXus file #1"
-				name="NDFileNexus.adl"
-				args="P=13SIM1:, R=Nexus1:"
-			}
-			clr=14
-			bclr=51
-		}
-		text {
-			object {
-				x=69
-				y=285
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="File"
-		}
-		"related display" {
-			object {
-				x=244
-				y=285
-				width=64
-				height=20
-			}
-			display[0] {
-				label="ROI #1"
-				name="NDROI.adl"
-				args="P=13SIM1:, R=ROI1:"
-			}
-			display[1] {
-				label="ROI #2"
-				name="NDROI.adl"
-				args="P=13SIM1:, R=ROI2:"
-			}
-			display[2] {
-				label="ROI #3"
-				name="NDROI.adl"
-				args="P=13SIM1:, R=ROI3:"
-			}
-			display[3] {
-				label="ROI #4"
-				name="NDROI.adl"
-				args="P=13SIM1:, R=ROI4:"
-			}
-			display[4] {
-				label="ROI #5"
-				name="NDROI.adl"
-				args="P=13SIM1:, R=ROI5:"
-			}
-			clr=14
-			bclr=51
-		}
-		text {
-			object {
-				x=209
-				y=285
-				width=30
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="ROI"
-		}
-		"related display" {
-			object {
-				x=114
-				y=310
-				width=64
-				height=20
-			}
-			display[0] {
-				label="Statistics #1"
-				name="NDStats.adl"
-				args="P=13SIM1:, R=Stats1:"
-			}
-			display[1] {
-				label="Statistics #2"
-				name="NDStats.adl"
-				args="P=13SIM1:, R=Stats2:"
-			}
-			display[2] {
-				label="Statistics #3"
-				name="NDStats.adl"
-				args="P=13SIM1:, R=Stats3:"
-			}
-			display[3] {
-				label="Statistics #4"
-				name="NDStats.adl"
-				args="P=13SIM1:, R=Stats4:"
-			}
-			clr=14
-			bclr=51
-		}
-		text {
-			object {
-				x=9
-				y=310
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Statistics"
-		}
-		"related display" {
-			object {
-				x=244
-				y=310
-				width=64
-				height=20
-			}
-			display[0] {
-				label="Image #1"
-				name="NDStdArrays.adl"
-				args="P=13SIM1:, R=image1:"
-			}
-			display[1] {
-				label="Process #1"
-				name="NDProcess.adl"
-				args="P=13SIM1:, R=Proc1:"
-			}
-			display[2] {
-				label="Overlay #1"
-				name="NDOverlay.adl"
-				args="P=13SIM1:, R=Over1:"
-			}
-			display[3] {
-				label="Transform #1"
-				name="NDTransform.adl"
-				args="P=13SIM1:, R=Trans1:"
-			}
-			display[4] {
-				label="Color convert #1"
-				name="NDColorConvert.adl"
-				args="P=13SIM1:, R=CC1:"
-			}
-			display[5] {
-				label="Image #2"
-				name="NDStdArrays.adl"
-				args="P=13SIM1:, R=image2:"
-			}
-			display[6] {
-				label="Scan #1"
-				name="scan_more.adl"
-				args="P=13SIM1:, S=scan1, N=1"
-			}
-			clr=14
-			bclr=51
-		}
-		text {
-			object {
-				x=189
-				y=310
-				width=50
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Other"
-		}
-		rectangle {
-			object {
-				x=5
-				y=255
-				width=335
-				height=80
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		rectangle {
-			object {
-				x=118
-				y=257
-				width=107
-				height=21
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		text {
-			object {
-				x=92
-				y=258
-				width=159
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Plugins"
-			align="horiz. centered"
-		}
+	"composite file"="ADPlugins.adl"
+}
+composite {
+	object {
+		x=344
+		y=35
+		width=350
+		height=165
 	}
+	"composite name"=""
+	"composite file"="ADShutter.adl"
+}
+composite {
+	object {
+		x=345
+		y=570
+		width=350
+		height=60
+	}
+	"composite name"=""
+	"composite file"="ADAttrFile.adl"
+}
+composite {
+	object {
+		x=345
+		y=635
+		width=350
+		height=60
+	}
+	"composite name"=""
+	"composite file"="ADDriverFile.adl"
 }
diff --git a/ADApp/op/adl/simDetector.adl b/ADApp/op/adl/simDetector.adl
index 02ac58f..600a3ac 100644
--- a/ADApp/op/adl/simDetector.adl
+++ b/ADApp/op/adl/simDetector.adl
@@ -1,14 +1,14 @@
 
 file {
-	name="/home/epics/devel/areaDetector/1-5/ADApp/op/adl/simDetector.adl"
+	name="/home/epics/devel/areaDetector/ADApp/op/adl/simDetector.adl"
 	version=030102
 }
 display {
 	object {
-		x=502
-		y=41
+		x=144
+		y=119
 		width=700
-		height=690
+		height=735
 	}
 	clr=14
 	bclr=4
@@ -87,1130 +87,6 @@ display {
 		1a7309,
 	}
 }
-rectangle {
-	object {
-		x=458
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=345
-		y=35
-		width=350
-		height=165
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=431
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Shutter"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=361
-		y=69
-		width=150
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Shutter mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=518
-		y=69
-		width=120
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterMode"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=411
-		y=118
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Open/Close"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=518
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Open"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=585
-		y=118
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterControl"
-		clr=14
-		bclr=51
-	}
-	label="Close"
-	press_msg="0"
-}
-text {
-	object {
-		x=351
-		y=93
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Status: Det."
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=477
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatus_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=477
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterOpenDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=360
-		y=143
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Delay: Open"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=143
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Close"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=617
-		y=143
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ShutterCloseDelay"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"related display" {
-	object {
-		x=550
-		y=171
-		width=70
-		height=20
-	}
-	display[0] {
-		name="ADEpicsShutter.adl"
-		args="P=$(P),R=$(R)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=351
-		y=171
-		width=190
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS shutter setup"
-	align="horiz. right"
-}
-text {
-	object {
-		x=560
-		y=93
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="EPICS"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=617
-		y=94
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ShutterStatusEPICS_RBV"
-		clr=54
-		bclr=2
-	}
-	clrmod="alarm"
-	align="horiz. centered"
-	limits {
-	}
-}
-rectangle {
-	object {
-		x=119
-		y=37
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=35
-		width=335
-		height=250
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=38
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Setup"
-	align="horiz. centered"
-}
-composite {
-	object {
-		x=63
-		y=94
-		width=268
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=171
-				y=95
-				width=160
-				height=18
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="$(P)$(R)"
-		}
-		text {
-			object {
-				x=63
-				y=94
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="EPICS name"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=43
-		y=119
-		width=288
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=43
-				y=119
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Manufacturer"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=171
-				y=120
-				width=160
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Manufacturer_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=73
-		y=241
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix=" More"
-	align="horiz. right"
-}
-"related display" {
-	object {
-		x=172
-		y=241
-		width=70
-		height=20
-	}
-	display[0] {
-		label="asyn record"
-		name="asynRecord.adl"
-		args="P=$(P),R=$(R)AsynIO"
-	}
-	display[1] {
-		label="Save restore status"
-		name="save_restoreStatus_more.adl"
-		args="P=$(P)"
-	}
-	display[2] {
-		label="Image plugin #1"
-		name="NDStdArrays.adl"
-		args="P=$(P), R=$(I)"
-	}
-	display[3] {
-		label="ROI plugin #1"
-		name="NDROI.adl"
-		args="P=$(P), R=$(ROI)"
-	}
-	display[4] {
-		label="netCDF plugin #1"
-		name="NDFileNetCDF.adl"
-		args="P=$(P), R=$(NETCDF)"
-	}
-	display[5] {
-		label="TIFF plugin #1"
-		name="NDFileTIFF.adl"
-		args="P=$(P), R=$(TIFF)"
-	}
-	display[6] {
-		label="JPEG plugin #1"
-		name="NDFileJPEG.adl"
-		args="P=$(P), R=$(JPEG)"
-	}
-	display[7] {
-		label="Nexus plugin #1"
-		name="NDFileNexus.adl"
-		args="P=$(P), R=$(NEXUS)"
-	}
-	display[8] {
-		label="Color convert plugin #1"
-		name="NDColorConvert.adl"
-		args="P=$(P), R=$(CC)"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=113
-		y=144
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Model"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=145
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Model_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-text {
-	object {
-		x=63
-		y=194
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Connection"
-	align="horiz. right"
-}
-"message button" {
-	object {
-		x=171
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Connect"
-	press_msg="1"
-}
-"message button" {
-	object {
-		x=256
-		y=194
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)AsynIO.CNCT"
-		clr=14
-		bclr=51
-	}
-	label="Disconnect"
-	press_msg="0"
-}
-text {
-	object {
-		x=202
-		y=167
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=63
-	}
-	"dynamic attribute" {
-		vis="if not zero"
-		calc="0"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Connected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=187
-		y=167
-		width=120
-		height=20
-	}
-	"basic attribute" {
-		clr=20
-	}
-	"dynamic attribute" {
-		vis="if zero"
-		chan="$(P)$(R)AsynIO.CNCT"
-	}
-	textix="Disconnected"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=63
-		y=69
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="asyn port"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=171
-		y=70
-		width=160
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PortName_RBV"
-		clr=54
-		bclr=4
-	}
-	limits {
-	}
-}
-rectangle {
-	object {
-		x=119
-		y=292
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=290
-		width=335
-		height=390
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-text {
-	object {
-		x=93
-		y=293
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Readout"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=173
-		y=320
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="X"
-	align="horiz. right"
-}
-text {
-	object {
-		x=266
-		y=320
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Y"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=148
-		y=390
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)BinX"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=241
-		y=390
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)BinY"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=148
-		y=370
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)BinX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=370
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)BinY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=67
-		y=390
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Binning"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=148
-		y=415
-		width=154
-		height=40
-	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=148
-				y=415
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MinX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=148
-				y=435
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=241
-				y=435
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=415
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MinY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=87
-		y=435
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Region start"
-	align="horiz. right"
-}
-text {
-	object {
-		x=97
-		y=480
-		width=40
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Region size"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=148
-		y=460
-		width=154
-		height=40
-	}
-	"composite name"=""
-	children {
-		"text entry" {
-			object {
-				x=148
-				y=480
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)SizeX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=241
-				y=480
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)SizeY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=148
-				y=460
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)SizeX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=460
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)SizeY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=27
-		y=345
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Sensor size"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=148
-		y=346
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)MaxSizeX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=346
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)MaxSizeY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=34
-		y=570
-		width=180
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image size (bytes)"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=241
-		y=571
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySize_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-composite {
-	object {
-		x=97
-		y=595
-		width=205
-		height=20
-	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=241
-				y=596
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)Gain_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=148
-				y=595
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)Gain"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=97
-				y=595
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Gain"
-			align="horiz. right"
-		}
-	}
-}
-composite {
-	object {
-		x=47
-		y=620
-		width=273
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=47
-				y=620
-				width=90
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Data type"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=143
-				y=620
-				width=80
-				height=20
-			}
-			control {
-				chan="$(P)$(R)DataType"
-				clr=14
-				bclr=51
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=621
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)DataType_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			format="string"
-			limits {
-			}
-		}
-	}
-}
-"text update" {
-	object {
-		x=148
-		y=505
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ReverseX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=505
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ReverseY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=67
-		y=525
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Reverse"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=148
-		y=525
-		width=60
-		height=18
-	}
-	control {
-		chan="$(P)$(R)ReverseX"
-		clr=14
-		bclr=51
-	}
-}
-menu {
-	object {
-		x=241
-		y=525
-		width=60
-		height=18
-	}
-	control {
-		chan="$(P)$(R)ReverseY"
-		clr=14
-		bclr=51
-	}
-}
 composite {
 	object {
 		x=472
@@ -1415,181 +291,6 @@ text {
 	limits {
 	}
 }
-text {
-	object {
-		x=47
-		y=645
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Color mode"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=143
-		y=645
-		width=80
-		height=20
-	}
-	control {
-		chan="$(P)$(R)ColorMode"
-		clr=14
-		bclr=51
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=646
-		width=79
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ColorMode_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	format="string"
-	limits {
-	}
-}
-text {
-	object {
-		x=37
-		y=545
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Image size"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=148
-		y=546
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySizeX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=241
-		y=546
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ArraySizeY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-composite {
-	object {
-		x=345
-		y=570
-		width=350
-		height=60
-	}
-	"composite name"=""
-	children {
-		composite {
-			object {
-				x=472
-				y=572
-				width=107
-				height=21
-			}
-			"composite name"=""
-			children {
-				rectangle {
-					object {
-						x=472
-						y=572
-						width=107
-						height=21
-					}
-					"basic attribute" {
-						clr=2
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=505
-				y=572
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Attributes"
-			align="horiz. centered"
-		}
-		rectangle {
-			object {
-				x=345
-				y=570
-				width=350
-				height=60
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=358
-				y=599
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="File"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=403
-				y=600
-				width=280
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NDAttributesFile"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
-	}
-}
 composite {
 	object {
 		x=349
@@ -2075,3 +776,53 @@ composite {
 		}
 	}
 }
+composite {
+	object {
+		x=5
+		y=35
+		width=335
+		height=215
+	}
+	"composite name"=""
+	"composite file"="ADSetup.adl"
+}
+composite {
+	object {
+		x=5
+		y=340
+		width=335
+		height=390
+	}
+	"composite name"=""
+	"composite file"="ADReadout.adl"
+}
+composite {
+	object {
+		x=345
+		y=570
+		width=350
+		height=60
+	}
+	"composite name"=""
+	"composite file"="ADAttrFile.adl"
+}
+composite {
+	object {
+		x=345
+		y=35
+		width=350
+		height=165
+	}
+	"composite name"=""
+	"composite file"="ADShutter.adl"
+}
+composite {
+	object {
+		x=5
+		y=255
+		width=335
+		height=80
+	}
+	"composite name"=""
+	"composite file"="ADPlugins.adl"
+}