diff --git a/andorApp/op/adl/Andor.adl b/andorApp/op/adl/Andor.adl
index c9aecd2..f697b25 100644
--- a/andorApp/op/adl/Andor.adl
+++ b/andorApp/op/adl/Andor.adl
@@ -5,10 +5,10 @@ file {
 }
 display {
 	object {
-		x=359
-		y=39
+		x=540
+		y=40
 		width=715
-		height=965
+		height=1000
 	}
 	clr=14
 	bclr=4
@@ -131,6 +131,1480 @@ composite {
 	"composite name"=""
 	"composite file"="ADPlugins.adl"
 }
+rectangle {
+	object {
+		x=360
+		y=255
+		width=350
+		height=475
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+rectangle {
+	object {
+		x=487
+		y=257
+		width=105
+		height=21
+	}
+	"basic attribute" {
+		clr=2
+	}
+}
+text {
+	object {
+		x=467
+		y=258
+		width=157
+		height=20
+	}
+	"basic attribute" {
+		clr=54
+	}
+	textix="Collect"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=406
+		y=279
+		width=130
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Exposure Time"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=545
+		y=279
+		width=59
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AcquireTime"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=611
+		y=280
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AcquireTime_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=376
+		y=405
+		width=160
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# Images/Acquis."
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=545
+		y=405
+		width=59
+		height=20
+	}
+	control {
+		chan="$(P)$(R)NumImages"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=611
+		y=406
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)NumImages_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=611
+		y=431
+		width=67
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)NumImagesCounter_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=434
+		y=430
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# Images Complete"
+	align="horiz. right"
+}
+text {
+	object {
+		x=396
+		y=355
+		width=140
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# Accums/Image"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=545
+		y=355
+		width=59
+		height=20
+	}
+	control {
+		chan="$(P)$(R)NumExposures"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=611
+		y=356
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)NumExposures_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=611
+		y=381
+		width=67
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)NumExposuresCounter_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=404
+		y=380
+		width=200
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# Exposures Complete"
+	align="horiz. right"
+}
+text {
+	object {
+		x=364
+		y=480
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Trigger Mode"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=493
+		y=480
+		width=140
+		height=20
+	}
+	control {
+		chan="$(P)$(R)TriggerMode"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=366
+		y=304
+		width=170
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Accumulate Period"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=545
+		y=304
+		width=59
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AndorAccumulatePeriod"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=611
+		y=305
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AndorAccumulatePeriod_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=396
+		y=329
+		width=140
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Acquire Period"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=545
+		y=329
+		width=59
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AcquirePeriod"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=611
+		y=330
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AcquirePeriod_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+rectangle {
+	object {
+		x=473
+		y=37
+		width=107
+		height=21
+	}
+	"basic attribute" {
+		clr=2
+	}
+}
+rectangle {
+	object {
+		x=360
+		y=35
+		width=350
+		height=215
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+text {
+	object {
+		x=490
+		y=38
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=54
+	}
+	textix="Shutter"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=426
+		y=170
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Open/Close"
+	align="horiz. right"
+}
+"message button" {
+	object {
+		x=533
+		y=170
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterControl"
+		clr=14
+		bclr=51
+	}
+	label="Open"
+	press_msg="1"
+}
+"message button" {
+	object {
+		x=600
+		y=170
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterControl"
+		clr=14
+		bclr=51
+	}
+	label="Close"
+	press_msg="0"
+}
+text {
+	object {
+		x=366
+		y=145
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Status: Det."
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=492
+		y=146
+		width=60
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ShutterStatus_RBV"
+		clr=54
+		bclr=2
+	}
+	clrmod="alarm"
+	align="horiz. centered"
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=492
+		y=195
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterOpenDelay"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=375
+		y=195
+		width=110
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Delay: Open"
+	align="horiz. right"
+}
+text {
+	object {
+		x=575
+		y=195
+		width=50
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Close"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=632
+		y=195
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterCloseDelay"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"related display" {
+	object {
+		x=565
+		y=223
+		width=70
+		height=20
+	}
+	display[0] {
+		name="ADEpicsShutter.adl"
+		args="P=$(P),R=$(R)"
+	}
+	clr=14
+	bclr=51
+}
+text {
+	object {
+		x=366
+		y=223
+		width=190
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="EPICS shutter setup"
+	align="horiz. right"
+}
+text {
+	object {
+		x=575
+		y=145
+		width=50
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="EPICS"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=632
+		y=146
+		width=60
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ShutterStatusEPICS_RBV"
+		clr=54
+		bclr=2
+	}
+	clrmod="alarm"
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=379
+		y=95
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Andor Shutter Mode"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=565
+		y=95
+		width=120
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AndorShutterMode"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=399
+		y=120
+		width=160
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="External shutter"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=565
+		y=120
+		width=120
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AndorShutterExTTL"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=439
+		y=70
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Shutter Type"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=565
+		y=70
+		width=120
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ShutterMode"
+		clr=14
+		bclr=51
+	}
+}
+rectangle {
+	object {
+		x=127
+		y=467
+		width=107
+		height=21
+	}
+	"basic attribute" {
+		clr=2
+	}
+}
+rectangle {
+	object {
+		x=5
+		y=465
+		width=350
+		height=465
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+text {
+	object {
+		x=145
+		y=468
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=54
+	}
+	textix="Readout"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=173
+		y=495
+		width=10
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="X"
+	align="horiz. right"
+}
+text {
+	object {
+		x=266
+		y=495
+		width=10
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Y"
+	align="horiz. right"
+}
+text {
+	object {
+		x=34
+		y=750
+		width=180
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image Size (bytes)"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=241
+		y=751
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ArraySize_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=37
+		y=725
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image Size"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=148
+		y=726
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ArraySizeX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=241
+		y=726
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ArraySizeY_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=148
+		y=680
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ReverseX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=241
+		y=680
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ReverseY_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=67
+		y=700
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Reverse"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=148
+		y=700
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ReverseX"
+		clr=14
+		bclr=51
+	}
+}
+menu {
+	object {
+		x=241
+		y=700
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ReverseY"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=27
+		y=655
+		width=110
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Region Size"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=148
+		y=655
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)SizeX"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=241
+		y=655
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)SizeY"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=148
+		y=635
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)SizeX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=241
+		y=635
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)SizeY_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=148
+		y=590
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)MinX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=148
+		y=610
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)MinX"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=241
+		y=610
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)MinY"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=241
+		y=590
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)MinY_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=17
+		y=610
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Region Start"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=148
+		y=565
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)BinX"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=241
+		y=565
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)BinY"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=148
+		y=545
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)BinX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=241
+		y=545
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)BinY_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=67
+		y=565
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Binning"
+	align="horiz. right"
+}
+text {
+	object {
+		x=27
+		y=520
+		width=110
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Sensor Size"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=148
+		y=521
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)MaxSizeX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=241
+		y=521
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)MaxSizeY_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=453
+		y=551
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Acquire"
+	align="horiz. right"
+}
+text {
+	object {
+		x=573
+		y=531
+		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=544
+		y=531
+		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=530
+		y=551
+		width=59
+		height=20
+	}
+	control {
+		chan="$(P)$(R)Acquire"
+		clr=14
+		bclr=51
+	}
+	label="Start"
+	press_msg="1"
+}
+"message button" {
+	object {
+		x=597
+		y=551
+		width=59
+		height=20
+	}
+	control {
+		chan="$(P)$(R)Acquire"
+		clr=14
+		bclr=51
+	}
+	label="Stop"
+	press_msg="0"
+}
+"text update" {
+	object {
+		x=530
+		y=576
+		width=158
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)DetectorState_RBV"
+		clr=54
+		bclr=2
+	}
+	clrmod="alarm"
+	limits {
+	}
+}
+text {
+	object {
+		x=383
+		y=576
+		width=140
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Detector State"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=530
+		y=604
+		width=170
+		height=12
+	}
+	monitor {
+		chan="$(P)$(R)StatusMessage_RBV"
+		clr=54
+		bclr=2
+	}
+	clrmod="alarm"
+	format="string"
+	limits {
+	}
+}
+text {
+	object {
+		x=373
+		y=601
+		width=150
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Detector Status"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=530
+		y=629
+		width=170
+		height=12
+	}
+	monitor {
+		chan="$(P)$(R)AndorMessage_RBV"
+		clr=54
+		bclr=2
+	}
+	clrmod="alarm"
+	format="string"
+	limits {
+	}
+}
+text {
+	object {
+		x=393
+		y=626
+		width=130
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Andor Message"
+	align="horiz. right"
+}
+text {
+	object {
+		x=385
+		y=455
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image Mode"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=494
+		y=455
+		width=115
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ImageMode"
+		clr=14
+		bclr=51
+	}
+}
+"text update" {
+	object {
+		x=615
+		y=457
+		width=90
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ImageMode_RBV"
+		clr=54
+		bclr=4
+	}
+	format="string"
+	limits {
+	}
+}
+text {
+	object {
+		x=365
+		y=505
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Readout Mode"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=494
+		y=505
+		width=115
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AndorReadOutMode"
+		clr=14
+		bclr=51
+	}
+}
+"text update" {
+	object {
+		x=615
+		y=507
+		width=90
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AndorReadOutMode_RBV"
+		clr=54
+		bclr=4
+	}
+	format="string"
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=530
+		y=651
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ArrayCounter"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=596
+		y=652
+		width=100
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ArrayCounter_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=393
+		y=651
+		width=130
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image Counter"
+	align="horiz. right"
+}
+text {
+	object {
+		x=423
+		y=676
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image Rate"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=530
+		y=677
+		width=100
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ArrayRate_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=373
+		y=701
+		width=150
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Array Callbacks"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=530
+		y=701
+		width=90
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ArrayCallbacks"
+		clr=14
+		bclr=51
+	}
+}
+"text update" {
+	object {
+		x=625
+		y=703
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ArrayCallbacks_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	format="string"
+	limits {
+	}
+}
 composite {
 	object {
 		x=360
@@ -143,759 +1617,8 @@ composite {
 }
 composite {
 	object {
-		x=360
-		y=255
-		width=350
-		height=475
-	}
-	"composite name"=""
-	children {
-		rectangle {
-			object {
-				x=360
-				y=255
-				width=350
-				height=475
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		composite {
-			object {
-				x=487
-				y=257
-				width=105
-				height=21
-			}
-			"composite name"=""
-			children {
-				rectangle {
-					object {
-						x=487
-						y=257
-						width=105
-						height=21
-					}
-					"basic attribute" {
-						clr=2
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=467
-				y=258
-				width=157
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Collect"
-			align="horiz. centered"
-		}
-		text {
-			object {
-				x=406
-				y=279
-				width=130
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Exposure Time"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=545
-				y=279
-				width=59
-				height=20
-			}
-			control {
-				chan="$(P)$(R)AcquireTime"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=611
-				y=280
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)AcquireTime_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		composite {
-			object {
-				x=373
-				y=626
-				width=331
-				height=95
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=383
-						y=626
-						width=140
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Time Remaining"
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=530
-						y=627
-						width=67
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)TimeRemaining_RBV"
-						clr=54
-						bclr=4
-					}
-					limits {
-					}
-				}
-				composite {
-					object {
-						x=530
-						y=651
-						width=166
-						height=20
-					}
-					"composite name"=""
-					children {
-						"text entry" {
-							object {
-								x=530
-								y=651
-								width=60
-								height=20
-							}
-							control {
-								chan="$(P)$(R)ArrayCounter"
-								clr=14
-								bclr=51
-							}
-							limits {
-							}
-						}
-						"text update" {
-							object {
-								x=596
-								y=652
-								width=100
-								height=18
-							}
-							monitor {
-								chan="$(P)$(R)ArrayCounter_RBV"
-								clr=54
-								bclr=4
-							}
-							limits {
-							}
-						}
-					}
-				}
-				text {
-					object {
-						x=393
-						y=651
-						width=130
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Image Counter"
-					align="horiz. right"
-				}
-				text {
-					object {
-						x=423
-						y=676
-						width=100
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Image Rate"
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=530
-						y=677
-						width=100
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)ArrayRate_RBV"
-						clr=54
-						bclr=4
-					}
-					limits {
-					}
-				}
-				text {
-					object {
-						x=373
-						y=701
-						width=150
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Array Callbacks"
-					align="horiz. right"
-				}
-				menu {
-					object {
-						x=530
-						y=701
-						width=90
-						height=20
-					}
-					control {
-						chan="$(P)$(R)ArrayCallbacks"
-						clr=14
-						bclr=51
-					}
-				}
-				"text update" {
-					object {
-						x=625
-						y=703
-						width=79
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)ArrayCallbacks_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					format="string"
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=456
-				y=405
-				width=80
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="# Images/Acquis."
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=545
-				y=405
-				width=59
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NumImages"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=611
-				y=406
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)NumImages_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=611
-				y=431
-				width=67
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)NumImagesCounter_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=444
-				y=430
-				width=160
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="# Images Complete"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=408
-				y=355
-				width=128
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="# Accums/Image"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=545
-				y=355
-				width=59
-				height=20
-			}
-			control {
-				chan="$(P)$(R)NumExposures"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=611
-				y=356
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)NumExposures_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=611
-				y=381
-				width=67
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)NumExposuresCounter_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=444
-				y=380
-				width=160
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="# Exposures Complete"
-			align="horiz. right"
-		}
-		composite {
-			object {
-				x=453
-				y=506
-				width=203
-				height=40
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=453
-						y=526
-						width=70
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Acquire"
-					align="horiz. right"
-				}
-				composite {
-					object {
-						x=530
-						y=506
-						width=126
-						height=40
-					}
-					"composite name"=""
-					children {
-						text {
-							object {
-								x=573
-								y=506
-								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=544
-								y=506
-								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=530
-								y=526
-								width=59
-								height=20
-							}
-							control {
-								chan="$(P)$(R)Acquire"
-								clr=14
-								bclr=51
-							}
-							label="Start"
-							press_msg="1"
-						}
-						"message button" {
-							object {
-								x=597
-								y=526
-								width=59
-								height=20
-							}
-							control {
-								chan="$(P)$(R)Acquire"
-								clr=14
-								bclr=51
-							}
-							label="Stop"
-							press_msg="0"
-						}
-					}
-				}
-			}
-		}
-		menu {
-			object {
-				x=494
-				y=455
-				width=115
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ImageMode"
-				clr=14
-				bclr=51
-			}
-		}
-		text {
-			object {
-				x=385
-				y=455
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image Mode"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=615
-				y=457
-				width=90
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ImageMode_RBV"
-				clr=54
-				bclr=4
-			}
-			format="string"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=364
-				y=480
-				width=120
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Trigger Mode"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=493
-				y=480
-				width=140
-				height=20
-			}
-			control {
-				chan="$(P)$(R)TriggerMode"
-				clr=14
-				bclr=51
-			}
-		}
-		"text update" {
-			object {
-				x=530
-				y=551
-				width=158
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)DetectorState_RBV"
-				clr=54
-				bclr=2
-			}
-			clrmod="alarm"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=383
-				y=551
-				width=140
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Detector State"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=530
-				y=579
-				width=170
-				height=12
-			}
-			monitor {
-				chan="$(P)$(R)StatusMessage_RBV"
-				clr=54
-				bclr=2
-			}
-			clrmod="alarm"
-			format="string"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=383
-				y=576
-				width=140
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Detector Status"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=530
-				y=604
-				width=170
-				height=12
-			}
-			monitor {
-				chan="$(P)$(R)AndorMessage_RBV"
-				clr=54
-				bclr=2
-			}
-			clrmod="alarm"
-			format="string"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=383
-				y=601
-				width=140
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Andor Message"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=396
-				y=304
-				width=140
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Accumulate Period"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=545
-				y=304
-				width=59
-				height=20
-			}
-			control {
-				chan="$(P)$(R)AndorAccumulatePeriod"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=611
-				y=305
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)AndorAccumulatePeriod_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=396
-				y=329
-				width=140
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Acquire Period"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=545
-				y=329
-				width=59
-				height=20
-			}
-			control {
-				chan="$(P)$(R)AcquirePeriod"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=611
-				y=330
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)AcquirePeriod_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=360
-		y=800
+		x=5
+		y=935
 		width=350
 		height=60
 	}
@@ -903,8 +1626,8 @@ composite {
 	children {
 		rectangle {
 			object {
-				x=490
-				y=802
+				x=135
+				y=937
 				width=90
 				height=21
 			}
@@ -914,8 +1637,8 @@ composite {
 		}
 		text {
 			object {
-				x=495
-				y=802
+				x=140
+				y=937
 				width=80
 				height=20
 			}
@@ -927,8 +1650,8 @@ composite {
 		}
 		rectangle {
 			object {
-				x=360
-				y=800
+				x=5
+				y=935
 				width=350
 				height=60
 			}
@@ -939,8 +1662,8 @@ composite {
 		}
 		"text entry" {
 			object {
-				x=420
-				y=830
+				x=65
+				y=965
 				width=280
 				height=20
 			}
@@ -955,8 +1678,8 @@ composite {
 		}
 		text {
 			object {
-				x=373
-				y=829
+				x=18
+				y=964
 				width=40
 				height=20
 			}
@@ -971,351 +1694,7 @@ composite {
 composite {
 	object {
 		x=360
-		y=35
-		width=350
-		height=215
-	}
-	"composite name"=""
-	children {
-		rectangle {
-			object {
-				x=473
-				y=37
-				width=107
-				height=21
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		rectangle {
-			object {
-				x=360
-				y=35
-				width=350
-				height=215
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=446
-				y=38
-				width=159
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Shutter"
-			align="horiz. centered"
-		}
-		composite {
-			object {
-				x=366
-				y=145
-				width=326
-				height=98
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=426
-						y=170
-						width=100
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Open/Close"
-					align="horiz. right"
-				}
-				"message button" {
-					object {
-						x=533
-						y=170
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)ShutterControl"
-						clr=14
-						bclr=51
-					}
-					label="Open"
-					press_msg="1"
-				}
-				"message button" {
-					object {
-						x=600
-						y=170
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)ShutterControl"
-						clr=14
-						bclr=51
-					}
-					label="Close"
-					press_msg="0"
-				}
-				text {
-					object {
-						x=366
-						y=145
-						width=120
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Status: Det."
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=492
-						y=146
-						width=60
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)ShutterStatus_RBV"
-						clr=54
-						bclr=2
-					}
-					clrmod="alarm"
-					align="horiz. centered"
-					limits {
-					}
-				}
-				"text entry" {
-					object {
-						x=492
-						y=195
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)ShutterOpenDelay"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				text {
-					object {
-						x=375
-						y=195
-						width=110
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Delay: Open"
-					align="horiz. right"
-				}
-				text {
-					object {
-						x=575
-						y=195
-						width=50
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Close"
-					align="horiz. right"
-				}
-				"text entry" {
-					object {
-						x=632
-						y=195
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)ShutterCloseDelay"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"related display" {
-					object {
-						x=565
-						y=223
-						width=70
-						height=20
-					}
-					display[0] {
-						name="ADEpicsShutter.adl"
-						args="P=$(P),R=$(R)"
-					}
-					clr=14
-					bclr=51
-				}
-				text {
-					object {
-						x=366
-						y=223
-						width=190
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="EPICS shutter setup"
-					align="horiz. right"
-				}
-				text {
-					object {
-						x=575
-						y=145
-						width=50
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="EPICS"
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=632
-						y=146
-						width=60
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)ShutterStatusEPICS_RBV"
-						clr=54
-						bclr=2
-					}
-					clrmod="alarm"
-					align="horiz. centered"
-					limits {
-					}
-				}
-			}
-		}
-		composite {
-			object {
-				x=409
-				y=95
-				width=276
-				height=20
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=409
-						y=95
-						width=150
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Andor Shutter Mode"
-					align="horiz. right"
-				}
-				menu {
-					object {
-						x=565
-						y=95
-						width=120
-						height=20
-					}
-					control {
-						chan="$(P)$(R)AndorShutterMode"
-						clr=14
-						bclr=51
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=409
-				y=120
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="External shutter"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=565
-				y=120
-				width=120
-				height=20
-			}
-			control {
-				chan="$(P)$(R)AndorShutterExTTL"
-				clr=14
-				bclr=51
-			}
-		}
-		composite {
-			object {
-				x=409
-				y=70
-				width=276
-				height=20
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=409
-						y=70
-						width=150
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Shutter Type"
-					align="horiz. right"
-				}
-				menu {
-					object {
-						x=565
-						y=70
-						width=120
-						height=20
-					}
-					control {
-						chan="$(P)$(R)ShutterMode"
-						clr=14
-						bclr=51
-					}
-				}
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=360
-		y=865
+		y=800
 		width=350
 		height=60
 	}
@@ -1324,7 +1703,7 @@ composite {
 		composite {
 			object {
 				x=482
-				y=867
+				y=802
 				width=107
 				height=21
 			}
@@ -1333,7 +1712,7 @@ composite {
 				composite {
 					object {
 						x=482
-						y=867
+						y=802
 						width=107
 						height=21
 					}
@@ -1342,7 +1721,7 @@ composite {
 						rectangle {
 							object {
 								x=482
-								y=867
+								y=802
 								width=107
 								height=21
 							}
@@ -1355,7 +1734,7 @@ composite {
 				text {
 					object {
 						x=515
-						y=867
+						y=802
 						width=40
 						height=20
 					}
@@ -1370,7 +1749,7 @@ composite {
 		rectangle {
 			object {
 				x=360
-				y=865
+				y=800
 				width=350
 				height=60
 			}
@@ -1382,7 +1761,7 @@ composite {
 		text {
 			object {
 				x=373
-				y=894
+				y=829
 				width=150
 				height=20
 			}
@@ -1395,7 +1774,7 @@ composite {
 		"related display" {
 			object {
 				x=530
-				y=894
+				y=829
 				width=70
 				height=20
 			}
@@ -1408,10 +1787,244 @@ composite {
 		}
 	}
 }
+text {
+	object {
+		x=47
+		y=900
+		width=90
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Data Type"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=147
+		y=900
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)DataType"
+		clr=14
+		bclr=51
+	}
+}
+"text update" {
+	object {
+		x=251
+		y=901
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)DataType_RBV"
+		clr=54
+		bclr=4
+	}
+	format="string"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=251
+		y=876
+		width=80
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AndorADCSpeed_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+menu {
+	object {
+		x=148
+		y=876
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AndorADCSpeed"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=47
+		y=875
+		width=90
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="ADC Speed"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=241
+		y=776
+		width=80
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AndorPreAmpGain_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+menu {
+	object {
+		x=148
+		y=776
+		width=80
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AndorPreAmpGain"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=17
+		y=775
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Pre-amp Gain"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=241
+		y=801
+		width=80
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AndorEMGain_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=67
+		y=800
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="EM Gain"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=253
+		y=826
+		width=90
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AndorEMGainMode_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+menu {
+	object {
+		x=148
+		y=826
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AndorEMGainMode"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=17
+		y=825
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="EM Gain Mode"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=251
+		y=851
+		width=80
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)AndorEMGainAdvanced_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+menu {
+	object {
+		x=148
+		y=851
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AndorEMGainAdvanced"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=17
+		y=850
+		width=120
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="EM Gain Adv."
+	align="horiz. right"
+}
 composite {
 	object {
-		x=5
-		y=860
+		x=360
+		y=865
 		width=350
 		height=100
 	}
@@ -1419,8 +2032,8 @@ composite {
 	children {
 		rectangle {
 			object {
-				x=127
-				y=862
+				x=482
+				y=867
 				width=107
 				height=21
 			}
@@ -1430,9 +2043,9 @@ composite {
 		}
 		text {
 			object {
-				x=101
-				y=863
-				width=159
+				x=505
+				y=868
+				width=60
 				height=20
 			}
 			"basic attribute" {
@@ -1443,8 +2056,8 @@ composite {
 		}
 		rectangle {
 			object {
-				x=5
-				y=860
+				x=360
+				y=865
 				width=350
 				height=100
 			}
@@ -1455,8 +2068,8 @@ composite {
 		}
 		"text update" {
 			object {
-				x=241
-				y=915
+				x=596
+				y=920
 				width=61
 				height=18
 			}
@@ -1471,8 +2084,8 @@ composite {
 		}
 		"text entry" {
 			object {
-				x=148
-				y=914
+				x=503
+				y=919
 				width=60
 				height=20
 			}
@@ -1486,8 +2099,8 @@ composite {
 		}
 		text {
 			object {
-				x=27
-				y=914
+				x=382
+				y=919
 				width=110
 				height=20
 			}
@@ -1499,8 +2112,8 @@ composite {
 		}
 		menu {
 			object {
-				x=148
-				y=889
+				x=503
+				y=894
 				width=60
 				height=20
 			}
@@ -1512,9 +2125,9 @@ composite {
 		}
 		text {
 			object {
-				x=67
-				y=889
-				width=70
+				x=432
+				y=894
+				width=60
 				height=20
 			}
 			"basic attribute" {
@@ -1525,8 +2138,8 @@ composite {
 		}
 		"text update" {
 			object {
-				x=241
-				y=890
+				x=596
+				y=895
 				width=61
 				height=18
 			}
@@ -1541,9 +2154,9 @@ composite {
 		}
 		text {
 			object {
-				x=18
-				y=939
-				width=120
+				x=433
+				y=944
+				width=60
 				height=20
 			}
 			"basic attribute" {
@@ -1554,8 +2167,8 @@ composite {
 		}
 		"text update" {
 			object {
-				x=148
-				y=943
+				x=503
+				y=948
 				width=180
 				height=12
 			}
@@ -1571,668 +2184,18 @@ composite {
 		}
 	}
 }
-composite {
+"text entry" {
 	object {
-		x=5
-		y=465
-		width=350
-		height=390
+		x=148
+		y=800
+		width=80
+		height=20
 	}
-	"composite name"=""
-	children {
-		rectangle {
-			object {
-				x=127
-				y=467
-				width=107
-				height=21
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		rectangle {
-			object {
-				x=5
-				y=465
-				width=350
-				height=390
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=101
-				y=468
-				width=159
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Readout"
-			align="horiz. centered"
-		}
-		text {
-			object {
-				x=173
-				y=495
-				width=10
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="X"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=266
-				y=495
-				width=10
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Y"
-			align="horiz. right"
-		}
-		text {
-			object {
-				x=34
-				y=750
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image Size (bytes)"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=241
-				y=751
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ArraySize_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=37
-				y=725
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image Size"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=148
-				y=726
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ArraySizeX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=726
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ArraySizeY_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=148
-				y=680
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ReverseX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=680
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ReverseY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=67
-				y=700
-				width=70
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Reverse"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=148
-				y=700
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ReverseX"
-				clr=14
-				bclr=51
-			}
-		}
-		menu {
-			object {
-				x=241
-				y=700
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ReverseY"
-				clr=14
-				bclr=51
-			}
-		}
-		text {
-			object {
-				x=97
-				y=655
-				width=40
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Region Size"
-			align="horiz. right"
-		}
-		composite {
-			object {
-				x=148
-				y=635
-				width=154
-				height=40
-			}
-			"composite name"=""
-			children {
-				"text entry" {
-					object {
-						x=148
-						y=655
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)SizeX"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text entry" {
-					object {
-						x=241
-						y=655
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)SizeY"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=148
-						y=635
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)SizeX_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=241
-						y=635
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)SizeY_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-			}
-		}
-		composite {
-			object {
-				x=148
-				y=590
-				width=154
-				height=40
-			}
-			"composite name"=""
-			children {
-				"text update" {
-					object {
-						x=148
-						y=590
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)MinX_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-				"text entry" {
-					object {
-						x=148
-						y=610
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)MinX"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text entry" {
-					object {
-						x=241
-						y=610
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)MinY"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=241
-						y=590
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)MinY_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=87
-				y=610
-				width=50
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Region Start"
-			align="horiz. right"
-		}
-		composite {
-			object {
-				x=67
-				y=545
-				width=235
-				height=40
-			}
-			"composite name"=""
-			children {
-				"text entry" {
-					object {
-						x=148
-						y=565
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)BinX"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text entry" {
-					object {
-						x=241
-						y=565
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(R)BinY"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=148
-						y=545
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)BinX_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=241
-						y=545
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)BinY_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-				text {
-					object {
-						x=67
-						y=565
-						width=70
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Binning"
-					align="horiz. right"
-				}
-			}
-		}
-		composite {
-			object {
-				x=27
-				y=520
-				width=275
-				height=20
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=27
-						y=520
-						width=110
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Sensor Size"
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=148
-						y=521
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)MaxSizeX_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=241
-						y=521
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)MaxSizeY_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=47
-				y=825
-				width=90
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Data Type"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=147
-				y=825
-				width=80
-				height=20
-			}
-			control {
-				chan="$(P)$(R)DataType"
-				clr=14
-				bclr=51
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=826
-				width=79
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)DataType_RBV"
-				clr=54
-				bclr=4
-			}
-			format="string"
-			limits {
-			}
-		}
-		composite {
-			object {
-				x=47
-				y=800
-				width=274
-				height=21
-			}
-			"composite name"=""
-			children {
-				"text update" {
-					object {
-						x=241
-						y=801
-						width=80
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)AndorADCSpeed_RBV"
-						clr=54
-						bclr=4
-					}
-					limits {
-					}
-				}
-				menu {
-					object {
-						x=148
-						y=801
-						width=80
-						height=20
-					}
-					control {
-						chan="$(P)$(R)AndorADCSpeed"
-						clr=14
-						bclr=51
-					}
-				}
-				text {
-					object {
-						x=47
-						y=800
-						width=90
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="ADC Speed"
-					align="horiz. right"
-				}
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=776
-				width=80
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)AndorPreAmpGain_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		menu {
-			object {
-				x=148
-				y=776
-				width=80
-				height=20
-			}
-			control {
-				chan="$(P)$(R)AndorPreAmpGain"
-				clr=14
-				bclr=51
-			}
-		}
-		text {
-			object {
-				x=47
-				y=775
-				width=90
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Pre-amp Gain"
-			align="horiz. right"
-		}
+	control {
+		chan="$(P)$(R)AndorEMGain"
+		clr=14
+		bclr=51
+	}
+	limits {
 	}
 }