diff --git a/ADApp/op/adl/pilatusDetector.adl b/ADApp/op/adl/pilatusDetector.adl
index ed968cf..3bd43e7 100644
--- a/ADApp/op/adl/pilatusDetector.adl
+++ b/ADApp/op/adl/pilatusDetector.adl
@@ -5,10 +5,10 @@ file {
 }
 display {
 	object {
-		x=573
+		x=234
 		y=30
-		width=700
-		height=1050
+		width=1400
+		height=590
 	}
 	clr=14
 	bclr=4
@@ -147,7 +147,7 @@ rectangle {
 		x=5
 		y=340
 		width=335
-		height=155
+		height=205
 	}
 	"basic attribute" {
 		clr=14
@@ -167,60 +167,49 @@ text {
 	textix="Detector"
 	align="horiz. centered"
 }
-composite {
+text {
 	object {
 		x=15
 		y=395
-		width=294
+		width=130
 		height=20
 	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=15
-				y=395
-				width=130
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Detector Size"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=155
-				y=396
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MaxSizeX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=248
-				y=396
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MaxSizeY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Detector Size"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=155
+		y=396
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)MaxSizeX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=248
+		y=396
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)MaxSizeY_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
 	}
 }
 composite {
@@ -270,904 +259,34 @@ composite {
 		}
 	}
 }
-composite {
-	object {
-		x=35
-		y=420
-		width=265
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=41
-				y=420
-				width=160
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Threshold (keV):"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=206
-				y=420
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ThresholdEnergy"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=15
-		y=445
-		width=305
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=21
-				y=445
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Shaping time/Gain:"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=206
-				y=445
-				width=120
-				height=20
-			}
-			control {
-				chan="$(P)$(R)GainMenu"
-				clr=14
-				bclr=51
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=15
-		y=470
-		width=285
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=21
-				y=470
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Read CBF/TIFF tmot:"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=206
-				y=470
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ImageFileTmot"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=20
-		y=823
-		width=109
-		height=21
-	}
-	"composite name"=""
-	children {
-		composite {
-			object {
-				x=20
-				y=823
-				width=109
-				height=21
-			}
-			"composite name"=""
-			children {
-				rectangle {
-					object {
-						x=20
-						y=823
-						width=109
-						height=21
-					}
-					"basic attribute" {
-						clr=2
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=54
-				y=823
-				width=41
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="File"
-			align="horiz. centered"
-		}
-	}
-}
-composite {
-	object {
-		x=33
-		y=1022
-		width=653
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=33
-				y=1022
-				width=133
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Last filename"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=175
-				y=1023
-				width=511
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)FullFileName_RBV"
-				clr=54
-				bclr=4
-			}
-			format="string"
-			limits {
-			}
-		}
-	}
-}
 text {
 	object {
-		x=12
-		y=997
-		width=153
+		x=21
+		y=495
+		width=180
 		height=20
 	}
 	"basic attribute" {
 		clr=14
 	}
-	textix="Filename format"
+	textix="Read file timeout:"
 	align="horiz. right"
 }
-composite {
-	object {
-		x=175
-		y=974
-		width=164
-		height=43
-	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=175
-				y=974
-				width=164
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)FileTemplate_RBV"
-				clr=54
-				bclr=4
-			}
-			format="string"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=175
-				y=997
-				width=164
-				height=20
-			}
-			control {
-				chan="$(P)$(R)FileTemplate"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=22
-		y=949
-		width=305
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=22
-				y=949
-				width=143
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Auto increment"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=175
-				y=949
-				width=66
-				height=20
-			}
-			control {
-				chan="$(P)$(R)AutoIncrement"
-				clr=14
-				bclr=51
-			}
-		}
-		"text update" {
-			object {
-				x=245
-				y=950
-				width=82
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)AutoIncrement_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=53
-		y=922
-		width=270
-		height=22
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=53
-				y=923
-				width=112
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Next file #"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=175
-				y=922
-				width=61
-				height=22
-			}
-			control {
-				chan="$(P)$(R)FileNumber"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=241
-				y=924
-				width=82
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)FileNumber_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=73
-		y=874
-		width=612
-		height=43
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=73
-				y=897
-				width=92
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="File name"
-			align="horiz. right"
-		}
-		composite {
-			object {
-				x=174
-				y=874
-				width=511
-				height=43
-			}
-			"composite name"=""
-			children {
-				"text entry" {
-					object {
-						x=174
-						y=897
-						width=511
-						height=20
-					}
-					control {
-						chan="$(P)$(R)FileName"
-						clr=14
-						bclr=51
-					}
-					format="string"
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=174
-						y=874
-						width=511
-						height=18
-					}
-					monitor {
-						chan="$(P)$(R)FileName_RBV"
-						clr=54
-						bclr=4
-					}
-					format="string"
-					limits {
-					}
-				}
-			}
-		}
-	}
-}
 "text entry" {
 	object {
-		x=174
-		y=849
-		width=511
+		x=206
+		y=495
+		width=100
 		height=20
 	}
 	control {
-		chan="$(P)$(R)FilePath"
+		chan="$(P)$(R)ImageFileTmot"
 		clr=14
 		bclr=51
 	}
-	format="string"
 	limits {
 	}
 }
-"text update" {
-	object {
-		x=174
-		y=826
-		width=395
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)FilePath_RBV"
-		clr=54
-		bclr=4
-	}
-	format="string"
-	limits {
-	}
-}
-text {
-	object {
-		x=73
-		y=849
-		width=92
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="File path"
-	align="horiz. right"
-}
-rectangle {
-	object {
-		x=5
-		y=816
-		width=690
-		height=230
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-composite {
-	object {
-		x=387
-		y=997
-		width=286
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=387
-				y=997
-				width=112
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="File format"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=591
-				y=998
-				width=82
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)FileFormat_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
-		menu {
-			object {
-				x=504
-				y=997
-				width=82
-				height=20
-			}
-			control {
-				chan="$(P)$(R)FileFormat"
-				clr=14
-				bclr=51
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=5
-		y=701
-		width=690
-		height=110
-	}
-	"composite name"=""
-	children {
-		rectangle {
-			object {
-				x=303
-				y=707
-				width=105
-				height=21
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		rectangle {
-			object {
-				x=5
-				y=701
-				width=690
-				height=110
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		text {
-			object {
-				x=276
-				y=707
-				width=157
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Status"
-			align="horiz. centered"
-		}
-		composite {
-			object {
-				x=20
-				y=786
-				width=655
-				height=20
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=20
-						y=786
-						width=150
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="From camserver:"
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=175
-						y=789
-						width=500
-						height=15
-					}
-					monitor {
-						chan="$(P)$(R)StringFromServer_RBV"
-						clr=14
-						bclr=51
-					}
-					format="string"
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=100
-				y=736
-				width=70
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Status:"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=175
-				y=739
-				width=500
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)StatusMessage_RBV"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
-		composite {
-			object {
-				x=40
-				y=761
-				width=635
-				height=20
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=40
-						y=761
-						width=130
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="To camserver:"
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=175
-						y=764
-						width=500
-						height=15
-					}
-					monitor {
-						chan="$(P)$(R)StringToServer_RBV"
-						clr=14
-						bclr=51
-					}
-					format="string"
-					limits {
-					}
-				}
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=5
-		y=566
-		width=690
-		height=130
-	}
-	"composite name"=""
-	children {
-		rectangle {
-			object {
-				x=260
-				y=571
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=2
-			}
-		}
-		text {
-			object {
-				x=268
-				y=571
-				width=160
-				height=20
-			}
-			"basic attribute" {
-				clr=54
-			}
-			textix="Data corrections"
-			align="horiz. centered"
-		}
-		rectangle {
-			object {
-				x=5
-				y=566
-				width=690
-				height=130
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		composite {
-			object {
-				x=10
-				y=594
-				width=170
-				height=95
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=30
-						y=594
-						width=150
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Bad pixel file:"
-					align="horiz. right"
-				}
-				text {
-					object {
-						x=20
-						y=644
-						width=160
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Flat field file:"
-					align="horiz. right"
-				}
-				text {
-					object {
-						x=50
-						y=619
-						width=130
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="# Bad pixels:"
-					align="horiz. right"
-				}
-				text {
-					object {
-						x=10
-						y=669
-						width=170
-						height=20
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Flat field valid:"
-					align="horiz. right"
-				}
-			}
-		}
-		"text entry" {
-			object {
-				x=185
-				y=594
-				width=500
-				height=20
-			}
-			control {
-				chan="$(P)$(R)BadPixelFile"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=185
-				y=644
-				width=500
-				height=20
-			}
-			control {
-				chan="$(P)$(R)FlatFieldFile"
-				clr=14
-				bclr=51
-			}
-			format="string"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=185
-				y=620
-				width=80
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)NumBadPixels"
-				clr=14
-				bclr=51
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=185
-				y=670
-				width=80
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)FlatFieldValid"
-				clr=14
-				bclr=51
-			}
-			align="horiz. centered"
-			format="string"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=299
-				y=669
-				width=180
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Min. flat field:"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=482
-				y=669
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinFlatField"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-	}
-}
 composite {
 	object {
 		x=345
@@ -1858,8 +977,8 @@ composite {
 }
 composite {
 	object {
-		x=5
-		y=501
+		x=705
+		y=520
 		width=335
 		height=60
 	}
@@ -1867,8 +986,8 @@ composite {
 	children {
 		composite {
 			object {
-				x=121
-				y=503
+				x=821
+				y=522
 				width=102
 				height=21
 			}
@@ -1876,8 +995,8 @@ composite {
 			children {
 				rectangle {
 					object {
-						x=121
-						y=503
+						x=821
+						y=522
 						width=102
 						height=21
 					}
@@ -1889,8 +1008,8 @@ composite {
 		}
 		text {
 			object {
-				x=153
-				y=503
+				x=853
+				y=522
 				width=38
 				height=20
 			}
@@ -1902,8 +1021,8 @@ composite {
 		}
 		rectangle {
 			object {
-				x=5
-				y=501
+				x=705
+				y=520
 				width=335
 				height=60
 			}
@@ -1914,8 +1033,8 @@ composite {
 		}
 		text {
 			object {
-				x=17
-				y=530
+				x=717
+				y=549
 				width=38
 				height=20
 			}
@@ -1927,8 +1046,8 @@ composite {
 		}
 		"text entry" {
 			object {
-				x=61
-				y=531
+				x=761
+				y=550
 				width=268
 				height=20
 			}
@@ -1945,8 +1064,791 @@ composite {
 }
 composite {
 	object {
-		x=575
-		y=825
+		x=720
+		y=292
+		width=109
+		height=21
+	}
+	"composite name"=""
+	children {
+		composite {
+			object {
+				x=720
+				y=292
+				width=109
+				height=21
+			}
+			"composite name"=""
+			children {
+				rectangle {
+					object {
+						x=720
+						y=292
+						width=109
+						height=21
+					}
+					"basic attribute" {
+						clr=2
+					}
+				}
+			}
+		}
+		text {
+			object {
+				x=754
+				y=292
+				width=41
+				height=20
+			}
+			"basic attribute" {
+				clr=54
+			}
+			textix="File"
+			align="horiz. centered"
+		}
+	}
+}
+composite {
+	object {
+		x=733
+		y=491
+		width=653
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=733
+				y=491
+				width=133
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Last filename"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=875
+				y=492
+				width=511
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)FullFileName_RBV"
+				clr=54
+				bclr=4
+			}
+			format="string"
+			limits {
+			}
+		}
+	}
+}
+text {
+	object {
+		x=712
+		y=466
+		width=153
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Filename format"
+	align="horiz. right"
+}
+composite {
+	object {
+		x=875
+		y=443
+		width=164
+		height=43
+	}
+	"composite name"=""
+	children {
+		"text update" {
+			object {
+				x=875
+				y=443
+				width=164
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)FileTemplate_RBV"
+				clr=54
+				bclr=4
+			}
+			format="string"
+			limits {
+			}
+		}
+		"text entry" {
+			object {
+				x=875
+				y=466
+				width=164
+				height=20
+			}
+			control {
+				chan="$(P)$(R)FileTemplate"
+				clr=14
+				bclr=51
+			}
+			format="string"
+			limits {
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=722
+		y=418
+		width=305
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=722
+				y=418
+				width=143
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Auto increment"
+			align="horiz. right"
+		}
+		menu {
+			object {
+				x=875
+				y=418
+				width=66
+				height=20
+			}
+			control {
+				chan="$(P)$(R)AutoIncrement"
+				clr=14
+				bclr=51
+			}
+		}
+		"text update" {
+			object {
+				x=945
+				y=419
+				width=82
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)AutoIncrement_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=753
+		y=391
+		width=270
+		height=22
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=753
+				y=392
+				width=112
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Next file #"
+			align="horiz. right"
+		}
+		"text entry" {
+			object {
+				x=875
+				y=391
+				width=61
+				height=22
+			}
+			control {
+				chan="$(P)$(R)FileNumber"
+				clr=14
+				bclr=51
+			}
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=941
+				y=393
+				width=82
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)FileNumber_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=773
+		y=343
+		width=612
+		height=43
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=773
+				y=366
+				width=92
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="File name"
+			align="horiz. right"
+		}
+		composite {
+			object {
+				x=874
+				y=343
+				width=511
+				height=43
+			}
+			"composite name"=""
+			children {
+				"text entry" {
+					object {
+						x=874
+						y=366
+						width=511
+						height=20
+					}
+					control {
+						chan="$(P)$(R)FileName"
+						clr=14
+						bclr=51
+					}
+					format="string"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=874
+						y=343
+						width=511
+						height=18
+					}
+					monitor {
+						chan="$(P)$(R)FileName_RBV"
+						clr=54
+						bclr=4
+					}
+					format="string"
+					limits {
+					}
+				}
+			}
+		}
+	}
+}
+"text entry" {
+	object {
+		x=874
+		y=318
+		width=511
+		height=20
+	}
+	control {
+		chan="$(P)$(R)FilePath"
+		clr=14
+		bclr=51
+	}
+	format="string"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=874
+		y=295
+		width=395
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)FilePath_RBV"
+		clr=54
+		bclr=4
+	}
+	format="string"
+	limits {
+	}
+}
+text {
+	object {
+		x=773
+		y=318
+		width=92
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="File path"
+	align="horiz. right"
+}
+rectangle {
+	object {
+		x=705
+		y=285
+		width=690
+		height=230
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+composite {
+	object {
+		x=1087
+		y=466
+		width=286
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=1087
+				y=466
+				width=112
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="File format"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=1291
+				y=467
+				width=82
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)FileFormat_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+		menu {
+			object {
+				x=1204
+				y=466
+				width=82
+				height=20
+			}
+			control {
+				chan="$(P)$(R)FileFormat"
+				clr=14
+				bclr=51
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=705
+		y=35
+		width=690
+		height=110
+	}
+	"composite name"=""
+	children {
+		rectangle {
+			object {
+				x=1003
+				y=41
+				width=105
+				height=21
+			}
+			"basic attribute" {
+				clr=2
+			}
+		}
+		rectangle {
+			object {
+				x=705
+				y=35
+				width=690
+				height=110
+			}
+			"basic attribute" {
+				clr=14
+				fill="outline"
+			}
+		}
+		text {
+			object {
+				x=976
+				y=41
+				width=157
+				height=20
+			}
+			"basic attribute" {
+				clr=54
+			}
+			textix="Status"
+			align="horiz. centered"
+		}
+		composite {
+			object {
+				x=720
+				y=120
+				width=655
+				height=20
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=720
+						y=120
+						width=150
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="From camserver:"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=875
+						y=123
+						width=500
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)StringFromServer_RBV"
+						clr=14
+						bclr=51
+					}
+					format="string"
+					limits {
+					}
+				}
+			}
+		}
+		text {
+			object {
+				x=800
+				y=70
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Status:"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=875
+				y=73
+				width=500
+				height=15
+			}
+			monitor {
+				chan="$(P)$(R)StatusMessage_RBV"
+				clr=14
+				bclr=51
+			}
+			format="string"
+			limits {
+			}
+		}
+		composite {
+			object {
+				x=740
+				y=95
+				width=635
+				height=20
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=740
+						y=95
+						width=130
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="To camserver:"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=875
+						y=98
+						width=500
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)StringToServer_RBV"
+						clr=14
+						bclr=51
+					}
+					format="string"
+					limits {
+					}
+				}
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=705
+		y=150
+		width=690
+		height=130
+	}
+	"composite name"=""
+	children {
+		rectangle {
+			object {
+				x=960
+				y=155
+				width=180
+				height=20
+			}
+			"basic attribute" {
+				clr=2
+			}
+		}
+		text {
+			object {
+				x=968
+				y=155
+				width=160
+				height=20
+			}
+			"basic attribute" {
+				clr=54
+			}
+			textix="Data corrections"
+			align="horiz. centered"
+		}
+		rectangle {
+			object {
+				x=705
+				y=150
+				width=690
+				height=130
+			}
+			"basic attribute" {
+				clr=14
+				fill="outline"
+			}
+		}
+		composite {
+			object {
+				x=710
+				y=178
+				width=170
+				height=95
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=730
+						y=178
+						width=150
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Bad pixel file:"
+					align="horiz. right"
+				}
+				text {
+					object {
+						x=720
+						y=228
+						width=160
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Flat field file:"
+					align="horiz. right"
+				}
+				text {
+					object {
+						x=750
+						y=203
+						width=130
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="# Bad pixels:"
+					align="horiz. right"
+				}
+				text {
+					object {
+						x=710
+						y=253
+						width=170
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Flat field valid:"
+					align="horiz. right"
+				}
+			}
+		}
+		"text entry" {
+			object {
+				x=885
+				y=178
+				width=500
+				height=20
+			}
+			control {
+				chan="$(P)$(R)BadPixelFile"
+				clr=14
+				bclr=51
+			}
+			format="string"
+			limits {
+			}
+		}
+		"text entry" {
+			object {
+				x=885
+				y=228
+				width=500
+				height=20
+			}
+			control {
+				chan="$(P)$(R)FlatFieldFile"
+				clr=14
+				bclr=51
+			}
+			format="string"
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=885
+				y=204
+				width=80
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)NumBadPixels"
+				clr=14
+				bclr=51
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=885
+				y=254
+				width=80
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)FlatFieldValid"
+				clr=14
+				bclr=51
+			}
+			align="horiz. centered"
+			format="string"
+			limits {
+			}
+		}
+		text {
+			object {
+				x=999
+				y=253
+				width=180
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Min. flat field:"
+			align="horiz. right"
+		}
+		"text entry" {
+			object {
+				x=1182
+				y=253
+				width=100
+				height=20
+			}
+			control {
+				chan="$(P)$(R)MinFlatField"
+				clr=14
+				bclr=51
+			}
+			limits {
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=1275
+		y=294
 		width=115
 		height=20
 	}
@@ -1954,8 +1856,8 @@ composite {
 	children {
 		text {
 			object {
-				x=575
-				y=825
+				x=1275
+				y=294
 				width=70
 				height=20
 			}
@@ -1966,8 +1868,8 @@ composite {
 		}
 		"text update" {
 			object {
-				x=650
-				y=825
+				x=1350
+				y=294
 				width=40
 				height=20
 			}
@@ -1984,8 +1886,8 @@ composite {
 }
 composite {
 	object {
-		x=350
-		y=949
+		x=1050
+		y=418
 		width=289
 		height=20
 	}
@@ -1993,8 +1895,8 @@ composite {
 	children {
 		"related display" {
 			object {
-				x=569
-				y=949
+				x=1269
+				y=418
 				width=70
 				height=20
 			}
@@ -2008,8 +1910,8 @@ composite {
 		}
 		text {
 			object {
-				x=350
-				y=949
+				x=1050
+				y=418
 				width=210
 				height=20
 			}
@@ -2021,3 +1923,173 @@ composite {
 		}
 	}
 }
+composite {
+	object {
+		x=21
+		y=470
+		width=305
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=21
+				y=470
+				width=180
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Shaping time/Gain:"
+			align="horiz. right"
+		}
+		menu {
+			object {
+				x=206
+				y=470
+				width=120
+				height=20
+			}
+			control {
+				chan="$(P)$(R)GainMenu"
+				clr=14
+				bclr=51
+			}
+		}
+	}
+}
+text {
+	object {
+		x=41
+		y=445
+		width=160
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Threshold apply:"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=206
+		y=445
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ThresholdAutoApply"
+		clr=14
+		bclr=51
+	}
+}
+"message button" {
+	object {
+		x=274
+		y=446
+		width=60
+		height=19
+	}
+	control {
+		chan="$(P)$(R)ThresholdApply"
+		clr=14
+		bclr=51
+	}
+	label="Apply"
+	press_msg="1"
+}
+composite {
+	object {
+		x=41
+		y=420
+		width=265
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=41
+				y=420
+				width=160
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Threshold (keV):"
+			align="horiz. right"
+		}
+		"text entry" {
+			object {
+				x=206
+				y=420
+				width=100
+				height=20
+			}
+			control {
+				chan="$(P)$(R)ThresholdEnergy"
+				clr=14
+				bclr=51
+			}
+			limits {
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=41
+		y=520
+		width=292
+		height=20
+	}
+	"composite name"=""
+	children {
+		"text update" {
+			object {
+				x=272
+				y=521
+				width=61
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)GapFill_RBV"
+				clr=54
+				bclr=4
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+		menu {
+			object {
+				x=206
+				y=520
+				width=60
+				height=20
+			}
+			control {
+				chan="$(P)$(R)GapFill"
+				clr=14
+				bclr=51
+			}
+		}
+		text {
+			object {
+				x=41
+				y=520
+				width=160
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Gap fill:"
+			align="horiz. right"
+		}
+	}
+}