diff --git a/ADApp/op/adl/ADBase.adl b/ADApp/op/adl/ADBase.adl
index 248ecdc..f905ef6 100644
--- a/ADApp/op/adl/ADBase.adl
+++ b/ADApp/op/adl/ADBase.adl
@@ -602,7 +602,7 @@ text {
 	"basic attribute" {
 		clr=14
 	}
-	textix="Frame type"
+	textix="Image type"
 	align="horiz. right"
 }
 menu {
@@ -613,7 +613,7 @@ menu {
 		height=20
 	}
 	control {
-		chan="$(P)$(D)FrameType"
+		chan="$(P)$(D)ImageType"
 		clr=14
 		bclr=51
 	}
@@ -787,7 +787,7 @@ composite {
 			"basic attribute" {
 				clr=14
 			}
-			textix="# frames"
+			textix="# images"
 			align="horiz. right"
 		}
 		"text entry" {
@@ -798,7 +798,7 @@ composite {
 				height=20
 			}
 			control {
-				chan="$(P)$(D)NumFrames"
+				chan="$(P)$(D)NumImages"
 				clr=14
 				bclr=51
 			}
@@ -813,7 +813,7 @@ composite {
 				height=18
 			}
 			monitor {
-				chan="$(P)$(D)NumFrames_RBV"
+				chan="$(P)$(D)NumImages_RBV"
 				clr=54
 				bclr=4
 			}
@@ -833,7 +833,7 @@ text {
 	"basic attribute" {
 		clr=14
 	}
-	textix="# exp./frame"
+	textix="# exp./image"
 	align="horiz. right"
 }
 "text entry" {
@@ -875,7 +875,7 @@ text {
 		height=18
 	}
 	monitor {
-		chan="$(P)$(D)FrameType_RBV"
+		chan="$(P)$(D)ImageType_RBV"
 		clr=54
 		bclr=4
 	}
@@ -887,7 +887,7 @@ text {
 composite {
 	object {
 		x=60
-		y=60
+		y=92
 		width=268
 		height=20
 	}
@@ -896,7 +896,7 @@ composite {
 		text {
 			object {
 				x=168
-				y=61
+				y=93
 				width=160
 				height=18
 			}
@@ -908,7 +908,7 @@ composite {
 		text {
 			object {
 				x=60
-				y=60
+				y=92
 				width=100
 				height=20
 			}
@@ -923,7 +923,7 @@ composite {
 composite {
 	object {
 		x=40
-		y=85
+		y=117
 		width=288
 		height=20
 	}
@@ -932,7 +932,7 @@ composite {
 		text {
 			object {
 				x=40
-				y=85
+				y=117
 				width=120
 				height=20
 			}
@@ -945,7 +945,7 @@ composite {
 		"text update" {
 			object {
 				x=168
-				y=86
+				y=118
 				width=160
 				height=18
 			}
@@ -2095,7 +2095,7 @@ composite {
 			"basic attribute" {
 				clr=14
 			}
-			textix="Frame mode"
+			textix="Image mode"
 			align="horiz. right"
 		}
 		menu {
@@ -2106,7 +2106,7 @@ composite {
 				height=20
 			}
 			control {
-				chan="$(P)$(D)FrameMode"
+				chan="$(P)$(D)ImageMode"
 				clr=14
 				bclr=51
 			}
@@ -2119,7 +2119,7 @@ composite {
 				height=18
 			}
 			monitor {
-				chan="$(P)$(D)FrameMode_RBV"
+				chan="$(P)$(D)ImageMode_RBV"
 				clr=54
 				bclr=4
 			}
@@ -2173,49 +2173,38 @@ menu {
 	limits {
 	}
 }
-composite {
+text {
 	object {
 		x=110
-		y=110
-		width=218
+		y=142
+		width=50
 		height=20
 	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=110
-				y=110
-				width=50
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Model"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=168
-				y=111
-				width=160
-				height=18
-			}
-			monitor {
-				chan="$(P)$(D)Model_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Model"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=168
+		y=143
+		width=160
+		height=18
+	}
+	monitor {
+		chan="$(P)$(D)Model_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
 	}
 }
 text {
 	object {
 		x=60
-		y=180
+		y=192
 		width=100
 		height=20
 	}
@@ -2228,7 +2217,7 @@ text {
 "message button" {
 	object {
 		x=168
-		y=180
+		y=192
 		width=80
 		height=20
 	}
@@ -2243,7 +2232,7 @@ text {
 "message button" {
 	object {
 		x=253
-		y=180
+		y=192
 		width=80
 		height=20
 	}
@@ -2274,7 +2263,7 @@ composite {
 			"basic attribute" {
 				clr=14
 			}
-			textix="Frame counter"
+			textix="Image counter"
 			align="horiz. right"
 		}
 		"text update" {
@@ -2285,7 +2274,7 @@ composite {
 				height=18
 			}
 			monitor {
-				chan="$(P)$(D)FrameCounter_RBV"
+				chan="$(P)$(D)ImageCounter_RBV"
 				clr=54
 				bclr=4
 			}
@@ -2300,7 +2289,7 @@ composite {
 				height=20
 			}
 			control {
-				chan="$(P)$(D)FrameCounter"
+				chan="$(P)$(D)ImageCounter"
 				clr=14
 				bclr=51
 			}
@@ -2319,7 +2308,7 @@ text {
 	"basic attribute" {
 		clr=14
 	}
-	textix="Frame rate"
+	textix="Image rate"
 	align="horiz. right"
 }
 "text update" {
@@ -2330,7 +2319,7 @@ text {
 		height=18
 	}
 	monitor {
-		chan="$(P)$(D)FrameRate_RBV"
+		chan="$(P)$(D)ImageRate_RBV"
 		clr=54
 		bclr=4
 	}
@@ -2340,7 +2329,7 @@ text {
 text {
 	object {
 		x=199
-		y=153
+		y=165
 		width=90
 		height=20
 	}
@@ -2358,7 +2347,7 @@ text {
 text {
 	object {
 		x=184
-		y=153
+		y=165
 		width=120
 		height=20
 	}
@@ -2407,3 +2396,31 @@ composite {
 		}
 	}
 }
+text {
+	object {
+		x=60
+		y=67
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="asyn port"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=168
+		y=68
+		width=160
+		height=18
+	}
+	monitor {
+		chan="$(P)$(D)PortName_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
diff --git a/ADApp/op/adl/ADImage.adl b/ADApp/op/adl/ADImage.adl
index 8f70212..fd7a31d 100644
--- a/ADApp/op/adl/ADImage.adl
+++ b/ADApp/op/adl/ADImage.adl
@@ -7,8 +7,8 @@ display {
 	object {
 		x=165
 		y=73
-		width=370
-		height=300
+		width=380
+		height=345
 	}
 	clr=14
 	bclr=4
@@ -87,75 +87,53 @@ display {
 		1a7309,
 	}
 }
-composite {
+"text entry" {
 	object {
-		x=10
-		y=75
-		width=346
+		x=164
+		y=76
+		width=100
 		height=20
 	}
-	"composite name"=""
-	children {
-		composite {
-			object {
-				x=150
-				y=75
-				width=206
-				height=20
-			}
-			"composite name"=""
-			children {
-				"text entry" {
-					object {
-						x=150
-						y=75
-						width=100
-						height=20
-					}
-					control {
-						chan="$(P)$(I)ImageAddress"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=256
-						y=76
-						width=100
-						height=18
-					}
-					monitor {
-						chan="$(P)$(I)ImageAddress_RBV"
-						clr=54
-						bclr=4
-					}
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=10
-				y=75
-				width=130
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image address"
-			align="horiz. right"
-		}
+	control {
+		chan="$(P)$(I)ImageAddress"
+		clr=14
+		bclr=51
 	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=270
+		y=77
+		width=100
+		height=18
+	}
+	monitor {
+		chan="$(P)$(I)ImageAddress_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=24
+		y=76
+		width=130
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image address"
+	align="horiz. right"
 }
 composite {
 	object {
-		x=40
-		y=48
+		x=54
+		y=51
 		width=316
 		height=20
 	}
@@ -163,8 +141,8 @@ composite {
 	children {
 		text {
 			object {
-				x=40
-				y=48
+				x=54
+				y=51
 				width=100
 				height=20
 			}
@@ -176,8 +154,8 @@ composite {
 		}
 		"text entry" {
 			object {
-				x=150
-				y=48
+				x=164
+				y=51
 				width=100
 				height=20
 			}
@@ -191,8 +169,8 @@ composite {
 		}
 		"text update" {
 			object {
-				x=256
-				y=49
+				x=270
+				y=52
 				width=100
 				height=18
 			}
@@ -206,151 +184,81 @@ composite {
 		}
 	}
 }
-composite {
+text {
 	object {
-		x=30
-		y=101
-		width=200
-		height=20
-	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=30
-				y=101
-				width=110
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Post images"
-			align="horiz. right"
-		}
-		menu {
-			object {
-				x=150
-				y=101
-				width=80
-				height=20
-			}
-			control {
-				chan="$(P)$(I)PostImages"
-				clr=14
-				bclr=51
-			}
-		}
-	}
-}
-composite {
-	object {
-		x=50
+		x=64
 		y=126
-		width=160
+		width=90
 		height=20
 	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=50
-				y=126
-				width=90
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Min. time"
-			align="horiz. right"
-		}
-		"text entry" {
-			object {
-				x=150
-				y=126
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(I)MinImageUpdate"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
+	"basic attribute" {
+		clr=14
 	}
+	textix="Min. time"
+	align="horiz. right"
 }
-composite {
+"text entry" {
 	object {
-		x=10
-		y=151
-		width=306
+		x=164
+		y=126
+		width=100
 		height=20
 	}
-	"composite name"=""
-	children {
-		composite {
-			object {
-				x=150
-				y=151
-				width=166
-				height=20
-			}
-			"composite name"=""
-			children {
-				"text entry" {
-					object {
-						x=150
-						y=151
-						width=60
-						height=20
-					}
-					control {
-						chan="$(P)$(I)ImageCounter"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=216
-						y=152
-						width=100
-						height=18
-					}
-					monitor {
-						chan="$(P)$(I)ImageCounter_RBV"
-						clr=54
-						bclr=4
-					}
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=10
-				y=151
-				width=130
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image counter"
-			align="horiz. right"
-		}
+	control {
+		chan="$(P)$(I)MinImageUpdate"
+		clr=14
+		bclr=51
+	}
+	limits {
 	}
 }
-composite {
+"text entry" {
 	object {
-		x=40
+		x=164
+		y=176
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(I)ImageCounter"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=270
 		y=177
+		width=100
+		height=18
+	}
+	monitor {
+		chan="$(P)$(I)ImageCounter_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=24
+		y=176
+		width=130
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image counter"
+	align="horiz. right"
+}
+composite {
+	object {
+		x=54
+		y=201
 		width=210
 		height=20
 	}
@@ -358,8 +266,8 @@ composite {
 	children {
 		text {
 			object {
-				x=40
-				y=177
+				x=54
+				y=201
 				width=100
 				height=20
 			}
@@ -371,8 +279,8 @@ composite {
 		}
 		"text update" {
 			object {
-				x=150
-				y=178
+				x=164
+				y=202
 				width=100
 				height=18
 			}
@@ -386,77 +294,55 @@ composite {
 		}
 	}
 }
-composite {
+text {
 	object {
-		x=40
-		y=206
-		width=264
+		x=54
+		y=251
+		width=100
 		height=20
 	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=40
-				y=206
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image Size"
-			align="horiz. right"
-		}
-		composite {
-			object {
-				x=150
-				y=207
-				width=154
-				height=18
-			}
-			"composite name"=""
-			children {
-				"text update" {
-					object {
-						x=150
-						y=207
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(I)ImageSizeX_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=243
-						y=207
-						width=61
-						height=18
-					}
-					monitor {
-						chan="$(P)$(I)ImageSizeY_RBV"
-						clr=54
-						bclr=4
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-			}
-		}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image Size"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=164
+		y=252
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(I)ImageSizeX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=263
+		y=252
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(I)ImageSizeY_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
 	}
 }
 composite {
 	object {
-		x=50
-		y=236
+		x=64
+		y=276
 		width=179
 		height=20
 	}
@@ -464,8 +350,8 @@ composite {
 	children {
 		text {
 			object {
-				x=50
-				y=236
+				x=64
+				y=276
 				width=90
 				height=20
 			}
@@ -477,8 +363,8 @@ composite {
 		}
 		"text update" {
 			object {
-				x=150
-				y=237
+				x=164
+				y=277
 				width=79
 				height=18
 			}
@@ -496,8 +382,8 @@ composite {
 }
 composite {
 	object {
-		x=121
-		y=267
+		x=128
+		y=306
 		width=129
 		height=20
 	}
@@ -505,8 +391,8 @@ composite {
 	children {
 		text {
 			object {
-				x=121
-				y=267
+				x=128
+				y=306
 				width=50
 				height=20
 			}
@@ -518,8 +404,8 @@ composite {
 		}
 		"related display" {
 			object {
-				x=180
-				y=267
+				x=187
+				y=306
 				width=70
 				height=20
 			}
@@ -533,9 +419,160 @@ composite {
 		}
 	}
 }
+"text entry" {
+	object {
+		x=164
+		y=226
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(I)DroppedImages"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=270
+		y=227
+		width=100
+		height=18
+	}
+	monitor {
+		chan="$(P)$(I)DroppedImages_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=14
+		y=226
+		width=140
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Dropped images"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=270
+		y=127
+		width=100
+		height=18
+	}
+	monitor {
+		chan="$(P)$(I)MinImageUpdate_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
+composite {
+	object {
+		x=44
+		y=101
+		width=326
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=44
+				y=101
+				width=110
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Post images"
+			align="horiz. right"
+		}
+		menu {
+			object {
+				x=164
+				y=101
+				width=100
+				height=20
+			}
+			control {
+				chan="$(P)$(I)PostImages"
+				clr=14
+				bclr=51
+			}
+		}
+		"text update" {
+			object {
+				x=270
+				y=102
+				width=100
+				height=18
+			}
+			monitor {
+				chan="$(P)$(I)PostImages_RBV"
+				clr=54
+				bclr=4
+			}
+			limits {
+			}
+		}
+	}
+}
+text {
+	object {
+		x=4
+		y=151
+		width=150
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Callbacks block"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=164
+		y=151
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(I)BlockingCallbacks"
+		clr=14
+		bclr=51
+	}
+}
+"text update" {
+	object {
+		x=270
+		y=152
+		width=100
+		height=18
+	}
+	monitor {
+		chan="$(P)$(I)BlockingCallbacks_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
+	}
+}
 rectangle {
 	object {
-		x=5
+		x=10
 		y=16
 		width=360
 		height=26
@@ -546,7 +583,7 @@ rectangle {
 }
 text {
 	object {
-		x=77
+		x=82
 		y=17
 		width=216
 		height=25
diff --git a/ADApp/op/adl/ADTop.adl b/ADApp/op/adl/ADTop.adl
index 70e45a4..155fb94 100644
--- a/ADApp/op/adl/ADTop.adl
+++ b/ADApp/op/adl/ADTop.adl
@@ -5,10 +5,10 @@ file {
 }
 display {
 	object {
-		x=88
-		y=153
-		width=233
-		height=86
+		x=119
+		y=99
+		width=300
+		height=170
 	}
 	clr=14
 	bclr=4
@@ -89,7 +89,7 @@ display {
 }
 text {
 	object {
-		x=16
+		x=50
 		y=6
 		width=201
 		height=30
@@ -101,26 +101,139 @@ text {
 }
 "related display" {
 	object {
-		x=84
+		x=220
 		y=53
 		width=64
 		height=21
 	}
 	display[0] {
-		label="Simulator #1"
-		name="simDetector.adl"
-		args="P=13SIM1:, D=cam1:, I=image1:"
+		label="Simulator #1 General"
+		name="ADBase.adl"
+		args="P=13SIM1:, D=cam1:"
 	}
 	display[1] {
-		label="Simulator #2"
+		label="Simulator #1 Specific"
 		name="simDetector.adl"
-		args="P=13SIM1:, D=cam2:, I=image2::"
+		args="P=13SIM1:, D=cam1:"
 	}
 	display[2] {
-		label="Prosilica"
-		name="prosilica.adl"
-		args="P=13PS1:, D=cam1:, I=image1:"
+		label="Simulator #2 General"
+		name="ADBase.adl"
+		args="P=13SIM1:, D=cam2:"
+	}
+	display[3] {
+		label="Simulator #2 Specific"
+		name="simDetector.ad"
+		args="P=13SIM1:, D=cam2:"
 	}
 	clr=14
-	bclr=4
+	bclr=51
+}
+text {
+	object {
+		x=42
+		y=53
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Simulator Drivers"
+}
+"related display" {
+	object {
+		x=220
+		y=79
+		width=64
+		height=21
+	}
+	display[0] {
+		label="Prosilica general"
+		name="ADBase.adl"
+		args="P=13PS1:, D=cam1:"
+	}
+	display[1] {
+		label="Prosilica specific"
+		name="prosilica.adl"
+		args="P=13PS1:, D=cam1:"
+	}
+	clr=14
+	bclr=51
+}
+text {
+	object {
+		x=42
+		y=79
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Prosilica Drivers"
+}
+"related display" {
+	object {
+		x=220
+		y=105
+		width=64
+		height=21
+	}
+	display[0] {
+		label="Image #1"
+		name="ADImage.adl"
+		args="P=13SIM1:, I=image1:"
+	}
+	display[1] {
+		label="File #1"
+		name="ADFile.adl"
+		args="P=13SIM1:, F=file1:"
+	}
+	clr=14
+	bclr=51
+}
+text {
+	object {
+		x=32
+		y=105
+		width=80
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Simulator Plug-ins"
+}
+"related display" {
+	object {
+		x=220
+		y=131
+		width=64
+		height=21
+	}
+	display[0] {
+		label="Image #1"
+		name="ADImage.adl"
+		args="P=13PS1:, I=image1:"
+	}
+	display[1] {
+		label="File #1"
+		name="ADFile.adl"
+		args="P=13PS1:, F=file1:"
+	}
+	clr=14
+	bclr=51
+}
+text {
+	object {
+		x=32
+		y=131
+		width=80
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Prosilica Plug-ins"
 }
diff --git a/ADApp/op/adl/prosilica.adl b/ADApp/op/adl/prosilica.adl
index c49c5c7..59e52e3 100644
--- a/ADApp/op/adl/prosilica.adl
+++ b/ADApp/op/adl/prosilica.adl
@@ -112,11 +112,6 @@ text {
 		name="ADBase.adl"
 		args="P=$(P), D=$(D)"
 	}
-	display[1] {
-		label="Image control"
-		name="ADImage.adl"
-		args="P=$(P), I=$(I)"
-	}
 	clr=14
 	bclr=51
 }
diff --git a/ADApp/op/adl/simDetector.adl b/ADApp/op/adl/simDetector.adl
index b2b4a88..a1352aa 100644
--- a/ADApp/op/adl/simDetector.adl
+++ b/ADApp/op/adl/simDetector.adl
@@ -111,11 +111,6 @@ text {
 		name="ADBase.adl"
 		args="P=$(P), D=$(D)"
 	}
-	display[1] {
-		label="Image display"
-		name="ADImage.adl"
-		args="P=$(P), I=$(I)"
-	}
 	clr=14
 	bclr=51
 }
@@ -258,6 +253,6 @@ text {
 	"basic attribute" {
 		clr=14
 	}
-	textix="$(P($D)"
+	textix="$(P)$(D)"
 	align="horiz. centered"
 }