diff --git a/ADApp/op/edl/slac-edl/NDFile.edl b/ADApp/op/edl/slac-edl/NDFile.edl
index a6a19f882..b444d6ee3 100644
--- a/ADApp/op/edl/slac-edl/NDFile.edl
+++ b/ADApp/op/edl/slac-edl/NDFile.edl
@@ -5,8 +5,8 @@ minor 0
 release 1
 x 326
 y 796
-w 390
-h 280
+w 400
+h 480
 font "helvetica-bold-r-12.0"
 ctlFont "helvetica-bold-r-12.0"
 btnFont "helvetica-bold-r-12.0"
@@ -31,10 +31,10 @@ beginObjectProperties
 major 4
 minor 0
 release 0
-x 5
-y 15
-w 380
-h 260
+x 4
+y 12
+w 388
+h 416
 lineColor index 14
 fill
 fillColor index 3
@@ -46,8 +46,8 @@ beginObjectProperties
 major 4
 minor 1
 release 1
-x 5
-y 5
+x 4
+y 4
 w 37
 h 14
 font "helvetica-medium-r-12.0"
@@ -66,16 +66,15 @@ beginObjectProperties
 major 4
 minor 1
 release 1
-x 10
-y 20
-w 370
-h 15
+x 12
+y 176
+w 372
+h 20
 font "helvetica-bold-r-12.0"
 fgColor index 14
 bgColor index 3
-useDisplayBg
 value {
-  "File path, name, tmp. suffix"
+  "Full filename derived via File Format from Dir, Name, and File #"
 }
 endObjectProperties
 
@@ -85,11 +84,11 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 140
-y 125
-w 45
+x 152
+y 124
+w 60
 h 20
-controlPv "$(P)$(R)FileNumber_RBV"
+controlPv "$(P)$(R)FileNumber"
 font "helvetica-bold-r-12.0"
 fontAlign "center"
 fgColor index 16
@@ -109,9 +108,9 @@ beginObjectProperties
 major 4
 minor 0
 release 0
-x 295
-y 125
-w 85
+x 332
+y 124
+w 56
 h 20
 fgColor index 25
 bgColor index 3
@@ -129,39 +128,15 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 90
-y 125
-w 45
-h 20
-controlPv "$(P)$(R)FileNumber"
-font "helvetica-bold-r-12.0"
-fontAlign "center"
-fgColor index 25
-fgAlarm
-bgColor index 5
-editable
-motifWidget
-limitsFromDb
-nullColor index 40
-smartRefresh
-useHexPrefix
-newPos
-endObjectProperties
-
-# (Text Control)
-object activeXTextDspClass
-beginObjectProperties
-major 4
-minor 7
-release 0
-x 10
-y 35
-w 340
+x 76
+y 48
+w 308
 h 20
 controlPv "$(P)$(R)FilePath_RBV"
-font "helvetica-medium-r-10.0"
-fgColor index 25
-bgColor index 5
+font "helvetica-medium-r-12.0"
+fgColor index 15
+fgAlarm
+bgColor index 12
 limitsFromDb
 nullColor index 0
 smartRefresh
@@ -176,12 +151,12 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 10
-y 55
-w 370
+x 76
+y 24
+w 284
 h 20
 controlPv "$(P)$(R)FilePath"
-font "helvetica-medium-r-10.0"
+font "helvetica-medium-r-12.0"
 fgColor index 25
 bgColor index 5
 editable
@@ -202,14 +177,15 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 10
-y 80
-w 255
+x 76
+y 96
+w 308
 h 20
 controlPv "$(P)$(R)FileName_RBV"
-font "helvetica-medium-r-10.0"
-fgColor index 25
-bgColor index 5
+font "helvetica-medium-r-12.0"
+fgColor index 15
+bgColor index 12
+bgAlarm
 limitsFromDb
 nullColor index 0
 smartRefresh
@@ -224,19 +200,18 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 10
-y 100
-w 255
+x 76
+y 72
+w 308
 h 20
 controlPv "$(P)$(R)FileName"
-font "helvetica-medium-r-10.0"
+font "helvetica-medium-r-12.0"
 fgColor index 25
 bgColor index 5
 editable
 motifWidget
 limitsFromDb
 nullColor index 0
-useKp
 file
 useHexPrefix
 newPos
@@ -250,9 +225,9 @@ beginObjectProperties
 major 4
 minor 1
 release 1
-x 10
-y 125
-w 70
+x 12
+y 124
+w 68
 h 20
 font "helvetica-bold-r-12.0"
 fgColor index 14
@@ -269,8 +244,8 @@ beginObjectProperties
 major 4
 minor 1
 release 1
-x 195
-y 125
+x 232
+y 124
 w 95
 h 20
 font "helvetica-bold-r-12.0"
@@ -288,14 +263,15 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 10
-y 255
-w 285
+x 12
+y 240
+w 376
 h 20
 controlPv "$(P)$(R)FullFileName_RBV"
-font "helvetica-medium-r-10.0"
-fgColor index 25
-bgColor index 5
+font "helvetica-medium-r-12.0"
+fgColor index 15
+fgAlarm
+bgColor index 12
 limitsFromDb
 nullColor index 0
 smartRefresh
@@ -310,9 +286,9 @@ beginObjectProperties
 major 4
 minor 1
 release 1
-x 10
-y 150
-w 80
+x 12
+y 152
+w 68
 h 20
 font "helvetica-bold-r-12.0"
 fgColor index 14
@@ -329,12 +305,12 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 85
-y 150
+x 84
+y 152
 w 100
 h 20
 controlPv "$(P)$(R)FileTemplate"
-font "helvetica-medium-r-10.0"
+font "helvetica-medium-r-12.0"
 fgColor index 25
 bgColor index 5
 editable
@@ -355,14 +331,15 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 190
-y 150
+x 192
+y 152
 w 100
 h 20
 controlPv "$(P)$(R)FileTemplate_RBV"
-font "helvetica-medium-r-10.0"
-fgColor index 25
-bgColor index 5
+font "helvetica-medium-r-12.0"
+fgColor index 15
+fgAlarm
+bgColor index 12
 limitsFromDb
 nullColor index 0
 smartRefresh
@@ -377,29 +354,9 @@ beginObjectProperties
 major 4
 minor 0
 release 0
-x 100
-y 205
-w 70
-h 20
-fgColor index 25
-bgColor index 3
-inconsistentColor index 0
-topShadowColor index 1
-botShadowColor index 11
-controlPv "$(P)$(R)FileWriteMode"
-indicatorPv "$(P)$(R)FileWriteMode_RBV"
-font "helvetica-bold-r-12.0"
-endObjectProperties
-
-# (Menu Button)
-object activeMenuButtonClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 295
-y 150
-w 85
+x 296
+y 152
+w 92
 h 20
 fgColor index 25
 bgColor index 3
@@ -411,39 +368,14 @@ indicatorPv "$(P)$(R)FileFormat_RBV"
 font "helvetica-bold-r-12.0"
 endObjectProperties
 
-# (Text Control)
-object activeXTextDspClass
-beginObjectProperties
-major 4
-minor 7
-release 0
-x 90
-y 175
-w 45
-h 20
-controlPv "$(P)$(R)NumCapture"
-font "helvetica-bold-r-12.0"
-fontAlign "center"
-fgColor index 25
-fgAlarm
-bgColor index 5
-editable
-motifWidget
-limitsFromDb
-nullColor index 40
-smartRefresh
-useHexPrefix
-newPos
-endObjectProperties
-
 # (Static Text)
 object activeXTextClass
 beginObjectProperties
 major 4
 minor 1
 release 1
-x 240
-y 175
+x 268
+y 268
 w 60
 h 20
 font "helvetica-bold-r-12.0"
@@ -461,9 +393,9 @@ beginObjectProperties
 major 4
 minor 0
 release 0
-x 305
-y 175
-w 75
+x 332
+y 268
+w 56
 h 20
 fgColor index 25
 bgColor index 3
@@ -475,166 +407,14 @@ indicatorPv "$(P)$(R)AutoSave_RBV"
 font "helvetica-bold-r-12.0"
 endObjectProperties
 
-# (Static Text)
-object activeXTextClass
-beginObjectProperties
-major 4
-minor 1
-release 1
-x 10
-y 175
-w 80
-h 20
-font "helvetica-bold-r-12.0"
-fgColor index 14
-bgColor index 3
-useDisplayBg
-value {
-  "# Capture"
-}
-endObjectProperties
-
-# (Text Monitor)
-object activeXTextDspClass:noedit
-beginObjectProperties
-major 4
-minor 7
-release 0
-x 140
-y 175
-w 45
-h 20
-controlPv "$(P)$(R)NumCapture_RBV"
-font "helvetica-bold-r-12.0"
-fontAlign "center"
-fgColor index 16
-fgAlarm
-bgColor index 12
-limitsFromDb
-nullColor index 40
-smartRefresh
-useHexPrefix
-newPos
-objType "monitors"
-endObjectProperties
-
-# (Text Monitor)
-object activeXTextDspClass:noedit
-beginObjectProperties
-major 4
-minor 7
-release 0
-x 190
-y 175
-w 45
-h 20
-controlPv "$(P)$(R)NumCaptured_RBV"
-font "helvetica-bold-r-12.0"
-fontAlign "center"
-fgColor index 16
-fgAlarm
-bgColor index 12
-limitsFromDb
-nullColor index 40
-smartRefresh
-useHexPrefix
-newPos
-objType "monitors"
-endObjectProperties
-
-# (Static Text)
-object activeXTextClass
-beginObjectProperties
-major 4
-minor 1
-release 1
-x 10
-y 205
-w 90
-h 20
-font "helvetica-bold-r-12.0"
-fgColor index 14
-bgColor index 3
-useDisplayBg
-value {
-  "Capture Mode"
-}
-endObjectProperties
-
-# (Message Button)
-object activeMessageButtonClass
-beginObjectProperties
-major 4
-minor 1
-release 0
-x 200
-y 205
-w 45
-h 40
-fgColor index 19
-onColor index 4
-offColor index 3
-topShadowColor index 1
-botShadowColor index 11
-controlPv "$(P)$(R)Capture"
-pressValue "1"
-onLabel "Start"
-offLabel "Start"
-3d
-useEnumNumeric
-font "helvetica-bold-r-12.0"
-endObjectProperties
-
-# (Byte)
-object ByteClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 175
-y 205
-w 18
-h 18
-controlPv "$(P)$(R)Capture_RBV"
-lineColor index 14
-onColor index 15
-offColor index 19
-lineWidth 2
-numBits 1
-endObjectProperties
-
-# (Message Button)
-object activeMessageButtonClass
-beginObjectProperties
-major 4
-minor 1
-release 0
-x 250
-y 205
-w 45
-h 40
-fgColor index 21
-onColor index 4
-offColor index 3
-topShadowColor index 1
-botShadowColor index 11
-controlPv "$(P)$(R)Capture"
-pressValue "0"
-onLabel "Stop"
-offLabel "Stop"
-3d
-useEnumNumeric
-font "helvetica-bold-r-12.0"
-endObjectProperties
-
 # (Group)
 object activeGroupClass
 beginObjectProperties
 major 4
 minor 0
 release 0
-x 300
-y 205
+x 308
+y 296
 w 80
 h 40
 
@@ -646,10 +426,10 @@ beginObjectProperties
 major 4
 minor 1
 release 1
-x 300
-y 205
+x 308
+y 296
 w 40
-h 15
+h 20
 font "helvetica-bold-r-12.0"
 fgColor index 14
 bgColor index 3
@@ -665,14 +445,14 @@ beginObjectProperties
 major 4
 minor 0
 release 0
-x 305
-y 225
-w 18
-h 18
+x 312
+y 316
+w 20
+h 20
 controlPv "$(P)$(R)WriteFile_RBV"
 lineColor index 14
 onColor index 15
-offColor index 19
+offColor index 6
 lineWidth 2
 numBits 1
 endObjectProperties
@@ -683,10 +463,10 @@ beginObjectProperties
 major 4
 minor 1
 release 0
-x 335
-y 205
-w 45
-h 40
+x 344
+y 296
+w 44
+h 44
 fgColor index 25
 onColor index 4
 offColor index 3
@@ -704,7 +484,7 @@ endObjectProperties
 endGroup
 
 visPv "$(P)$(R)FileWriteMode_RBV"
-visMin "1"
+visMin "0"
 visMax "2"
 endObjectProperties
 
@@ -714,14 +494,14 @@ beginObjectProperties
 major 4
 minor 0
 release 0
-x 360
-y 35
-w 18
+x 364
+y 24
+w 20
 h 18
 controlPv "$(P)$(R)FilePathExists_RBV"
 lineColor index 14
 onColor index 15
-offColor index 19
+offColor index 20
 lineWidth 2
 numBits 1
 endObjectProperties
@@ -732,15 +512,16 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 10
-y 230
-w 160
+x 76
+y 344
+w 312
 h 20
 controlPv "$(P)$(R)WriteMessage"
-font "helvetica-medium-r-10.0"
+font "helvetica-medium-r-12.0"
 fontAlign "center"
-fgColor index 25
-bgColor index 5
+fgColor index 15
+fgAlarm
+bgColor index 12
 limitsFromDb
 nullColor index 0
 smartRefresh
@@ -755,14 +536,14 @@ beginObjectProperties
 major 4
 minor 0
 release 0
-x 175
-y 230
+x 52
+y 344
 w 18
 h 18
 controlPv "$(P)$(R)WriteStatus"
 lineColor index 14
 onColor index 20
-offColor index 24
+offColor index 3
 lineWidth 2
 numBits 1
 endObjectProperties
@@ -773,73 +554,500 @@ beginObjectProperties
 major 4
 minor 7
 release 0
-x 270
-y 100
-w 110
+x 84
+y 124
+w 64
 h 20
-controlPv "$(P)$(R)TempSuffix"
-font "helvetica-medium-r-10.0"
+controlPv "$(P)$(R)FileNumber"
+font "helvetica-medium-r-12.0"
+fontAlign "center"
 fgColor index 25
 bgColor index 5
 editable
 motifWidget
 limitsFromDb
-nullColor index 0
-useKp
-file
+nullColor index 25
+smartRefresh
 useHexPrefix
 newPos
-inputFocusUpdates
 objType "controls"
 endObjectProperties
 
-# (Text Control)
-object activeXTextDspClass
-beginObjectProperties
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 12
+y 24
+w 60
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "Directory"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 12
+y 72
+w 60
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "Filename"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 8
+y 344
+w 40
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "Status"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 12
+y 196
+w 372
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+value {
+  "First %s in format is dir, 2nd is filename, %d is number"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 12
+y 216
+w 372
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+value {
+  "Example File Format: %s%s_%d.tif"
+}
+endObjectProperties
+
+# (Group)
+object activeGroupClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 12
+y 268
+w 289
+h 68
+
+beginGroup
+
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 1
+release 0
+x 256
+y 296
+w 45
+h 40
+fgColor index 21
+onColor index 4
+offColor index 3
+topShadowColor index 1
+botShadowColor index 11
+controlPv "$(P)$(R)Capture"
+pressValue "0"
+onLabel "Stop"
+offLabel "Stop"
+3d
+useEnumNumeric
+font "helvetica-bold-r-12.0"
+endObjectProperties
+
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 1
+release 0
+x 204
+y 296
+w 45
+h 40
+fgColor index 19
+onColor index 4
+offColor index 3
+topShadowColor index 1
+botShadowColor index 11
+controlPv "$(P)$(R)Capture"
+pressValue "1"
+onLabel "Start"
+offLabel "Start"
+3d
+useEnumNumeric
+font "helvetica-bold-r-12.0"
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
 major 4
 minor 7
 release 0
-x 270
-y 80
-w 110
+x 200
+y 268
+w 52
 h 20
-controlPv "$(P)$(R)TempSuffix_RBV"
-font "helvetica-medium-r-10.0"
+controlPv "$(P)$(R)NumCaptured_RBV"
+font "helvetica-bold-r-12.0"
+fontAlign "center"
+fgColor index 16
+fgAlarm
+bgColor index 12
+limitsFromDb
+nullColor index 40
+smartRefresh
+useHexPrefix
+newPos
+objType "monitors"
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 144
+y 268
+w 52
+h 20
+controlPv "$(P)$(R)NumCapture_RBV"
+font "helvetica-bold-r-12.0"
+fontAlign "center"
+fgColor index 16
+fgAlarm
+bgColor index 12
+limitsFromDb
+nullColor index 40
+smartRefresh
+useHexPrefix
+newPos
+objType "monitors"
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 84
+y 268
+w 56
+h 20
+controlPv "$(P)$(R)NumCapture"
+font "helvetica-medium-r-12.0"
+fontAlign "center"
 fgColor index 25
 bgColor index 5
+editable
+motifWidget
 limitsFromDb
-nullColor index 0
+nullColor index 25
 smartRefresh
 useHexPrefix
 newPos
 objType "controls"
 endObjectProperties
 
-# (Related Display)
-object relatedDisplayClass
+# (Static Text)
+object activeXTextClass
 beginObjectProperties
 major 4
-minor 4
+minor 1
+release 1
+x 12
+y 268
+w 68
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "# Capture"
+}
+endObjectProperties
+
+endGroup
+
+visPv "$(P)$(R)FileWriteMode"
+visMin "1"
+visMax "3"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 12
+y 296
+w 90
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "Capture Mode"
+}
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
 release 0
-x 300
-y 255
-w 80
+x 100
+y 296
+w 72
 h 20
-fgColor index 43
+fgColor index 25
 bgColor index 3
+inconsistentColor index 0
 topShadowColor index 1
 botShadowColor index 11
+controlPv "$(P)$(R)FileWriteMode"
+indicatorPv "$(P)$(R)FileWriteMode_RBV"
+font "helvetica-bold-r-12.0"
+endObjectProperties
+
+# (Byte)
+object ByteClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 178
+y 296
+w 20
+h 20
+controlPv "$(P)$(R)Capture_RBV"
+lineColor index 14
+onColor index 15
+offColor index 6
+lineWidth 2
+numBits 1
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 100
+y 372
+w 100
+h 20
+controlPv "$(P)$(R)Capture_RBV"
 font "helvetica-medium-r-12.0"
-xPosOffset 120
-yPosOffset -500
-buttonLabel "more..."
-numPvs 4
-numDsps 1
-displayFileName {
-  0 "areaDetectorScreens/NDFileDetails.edl"
+fgColor index 15
+fgAlarm
+bgColor index 12
+limitsFromDb
+nullColor index 0
+smartRefresh
+useHexPrefix
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 8
+y 372
+w 92
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "Capture Status"
 }
-setPosition {
-  0 "button"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 8
+y 396
+w 92
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "Save Status"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 100
+y 396
+w 100
+h 20
+controlPv "$(P)$(R)WriteFile_RBV"
+font "helvetica-medium-r-12.0"
+fgColor index 15
+fgAlarm
+bgColor index 12
+limitsFromDb
+nullColor index 0
+smartRefresh
+useHexPrefix
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 284
+y 372
+w 104
+h 20
+controlPv "$(P)$(R)ReadFile_RBV"
+font "helvetica-medium-r-12.0"
+fgColor index 15
+fgAlarm
+bgColor index 12
+limitsFromDb
+nullColor index 0
+smartRefresh
+useHexPrefix
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 204
+y 372
+w 76
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "Read Status"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 284
+y 396
+w 104
+h 20
+controlPv "$(P)$(R)WriteStatus"
+font "helvetica-medium-r-12.0"
+fgColor index 15
+fgAlarm
+bgColor index 12
+limitsFromDb
+nullColor index 0
+smartRefresh
+useHexPrefix
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 204
+y 396
+w 76
+h 20
+font "helvetica-bold-r-12.0"
+fgColor index 14
+bgColor index 3
+useDisplayBg
+value {
+  "Write Status"
 }
 endObjectProperties