diff --git a/GUIs.Test.EDMIBenchmark/App.config b/GUIs.Test.EDMIBenchmark/App.config
index ffaf5407..be83dbbe 100644
--- a/GUIs.Test.EDMIBenchmark/App.config
+++ b/GUIs.Test.EDMIBenchmark/App.config
@@ -1,6 +1,51 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
+      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+  <applicationSettings>
+    <DevExpress.LookAndFeel.Design.AppSettings>
+      <setting name="DefaultAppSkin" serializeAs="String">
+        <value>Skin/Office 2019 Colorful</value>
+      </setting>
+      <setting name="DefaultPalette" serializeAs="String">
+        <value>Fire Brick</value>
+      </setting>
+      <setting name="TouchUI" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="CompactUI" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="TouchScaleFactor" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DirectX" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="RegisterUserSkins" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="RegisterBonusSkins" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="FontBehavior" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DefaultAppFont" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DPIAwarenessMode" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="CustomPaletteCollection" serializeAs="Xml">
+        <value />
+      </setting>
+    </DevExpress.LookAndFeel.Design.AppSettings>
+  </applicationSettings>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
 </configuration>
\ No newline at end of file
diff --git a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb
index 9f6a0e20..a5d46b7e 100644
--- a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb
+++ b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb
@@ -24,7 +24,9 @@ Partial Class Form1
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1))
-        Dim DockingContainer2 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer()
+        Dim DockingContainer1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer()
+        Me.DocumentGroup1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup(Me.components)
+        Me.Document1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document(Me.components)
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.ButtonSelectFiles = New DevExpress.XtraBars.BarButtonItem()
         Me.ButtonImportFiles = New DevExpress.XtraBars.BarButtonItem()
@@ -63,6 +65,7 @@ Partial Class Form1
         Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel()
         Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer()
         Me.listboxFiles = New DevExpress.XtraEditors.ListBoxControl()
+        Me.BindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
         Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel()
         Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer()
         Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
@@ -70,12 +73,11 @@ Partial Class Form1
         Me.DockPanel4_Container = New DevExpress.XtraBars.Docking.ControlContainer()
         Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
         Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.BindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem()
         Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel()
-        Me.Document1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document(Me.components)
-        Me.DocumentGroup1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup(Me.components)
+        CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Document1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -91,17 +93,29 @@ Partial Class Form1
         Me.DockPanel1.SuspendLayout()
         Me.DockPanel1_Container.SuspendLayout()
         CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.DockPanel2.SuspendLayout()
         Me.DockPanel2_Container.SuspendLayout()
         Me.DockPanel4.SuspendLayout()
         Me.DockPanel4_Container.SuspendLayout()
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.Document1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
+        'DocumentGroup1
+        '
+        Me.DocumentGroup1.Items.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document() {Me.Document1})
+        '
+        'Document1
+        '
+        Me.Document1.Caption = "DockPanelGrid"
+        Me.Document1.ControlName = "DockPanel4"
+        Me.Document1.FloatLocation = New System.Drawing.Point(354, 490)
+        Me.Document1.FloatSize = New System.Drawing.Size(538, 200)
+        Me.Document1.Properties.AllowClose = DevExpress.Utils.DefaultBoolean.[True]
+        Me.Document1.Properties.AllowFloat = DevExpress.Utils.DefaultBoolean.[True]
+        Me.Document1.Properties.AllowFloatOnDoubleClick = DevExpress.Utils.DefaultBoolean.[True]
+        '
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
@@ -113,7 +127,7 @@ Partial Class Form1
         Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarMdiChildrenListItem1)
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemTextEdit3, Me.RepositoryItemTextEdit4})
-        Me.RibbonControl1.Size = New System.Drawing.Size(1093, 159)
+        Me.RibbonControl1.Size = New System.Drawing.Size(1093, 157)
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
         '
         'ButtonSelectFiles
@@ -313,8 +327,8 @@ Partial Class Form1
         '
         Me.TabbedView1.DocumentGroups.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup() {Me.DocumentGroup1})
         Me.TabbedView1.Documents.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseDocument() {Me.Document1})
-        DockingContainer2.Element = Me.DocumentGroup1
-        Me.TabbedView1.RootContainer.Nodes.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() {DockingContainer2})
+        DockingContainer1.Element = Me.DocumentGroup1
+        Me.TabbedView1.RootContainer.Nodes.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() {DockingContainer1})
         '
         'DockManager1
         '
@@ -338,22 +352,22 @@ Partial Class Form1
         Me.DockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom
         Me.DockPanel3.FloatVertical = True
         Me.DockPanel3.ID = New System.Guid("b0b62b80-3cf3-4f78-a50d-4a79b9cabc39")
-        Me.DockPanel3.Location = New System.Drawing.Point(0, 0)
+        Me.DockPanel3.Location = New System.Drawing.Point(0, 496)
         Me.DockPanel3.Name = "DockPanel3"
         Me.DockPanel3.Options.ShowCloseButton = False
         Me.DockPanel3.OriginalSize = New System.Drawing.Size(200, 119)
         Me.DockPanel3.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom
         Me.DockPanel3.SavedIndex = 0
-        Me.DockPanel3.Size = New System.Drawing.Size(1310, 119)
+        Me.DockPanel3.Size = New System.Drawing.Size(1093, 119)
         Me.DockPanel3.Text = "Log"
         Me.DockPanel3.Visibility = DevExpress.XtraBars.Docking.DockVisibility.AutoHide
         '
         'DockPanel3_Container
         '
         Me.DockPanel3_Container.Controls.Add(Me.listboxLog)
-        Me.DockPanel3_Container.Location = New System.Drawing.Point(3, 27)
+        Me.DockPanel3_Container.Location = New System.Drawing.Point(3, 47)
         Me.DockPanel3_Container.Name = "DockPanel3_Container"
-        Me.DockPanel3_Container.Size = New System.Drawing.Size(1304, 89)
+        Me.DockPanel3_Container.Size = New System.Drawing.Size(1087, 69)
         Me.DockPanel3_Container.TabIndex = 0
         '
         'listboxLog
@@ -361,7 +375,7 @@ Partial Class Form1
         Me.listboxLog.Dock = System.Windows.Forms.DockStyle.Fill
         Me.listboxLog.Location = New System.Drawing.Point(0, 0)
         Me.listboxLog.Name = "listboxLog"
-        Me.listboxLog.Size = New System.Drawing.Size(1304, 89)
+        Me.listboxLog.Size = New System.Drawing.Size(1087, 69)
         Me.listboxLog.TabIndex = 0
         '
         'DockPanel1
@@ -369,11 +383,11 @@ Partial Class Form1
         Me.DockPanel1.Controls.Add(Me.DockPanel1_Container)
         Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left
         Me.DockPanel1.ID = New System.Guid("12b5eead-07cc-48c6-93a4-85cd0b4b82ce")
-        Me.DockPanel1.Location = New System.Drawing.Point(0, 159)
+        Me.DockPanel1.Location = New System.Drawing.Point(0, 157)
         Me.DockPanel1.Name = "DockPanel1"
         Me.DockPanel1.Options.ShowCloseButton = False
         Me.DockPanel1.OriginalSize = New System.Drawing.Size(297, 200)
-        Me.DockPanel1.Size = New System.Drawing.Size(297, 456)
+        Me.DockPanel1.Size = New System.Drawing.Size(297, 458)
         Me.DockPanel1.Text = "Files to Upload"
         '
         'DockPanel1_Container
@@ -381,7 +395,7 @@ Partial Class Form1
         Me.DockPanel1_Container.Controls.Add(Me.listboxFiles)
         Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46)
         Me.DockPanel1_Container.Name = "DockPanel1_Container"
-        Me.DockPanel1_Container.Size = New System.Drawing.Size(290, 407)
+        Me.DockPanel1_Container.Size = New System.Drawing.Size(290, 409)
         Me.DockPanel1_Container.TabIndex = 0
         '
         'listboxFiles
@@ -390,19 +404,22 @@ Partial Class Form1
         Me.listboxFiles.Dock = System.Windows.Forms.DockStyle.Fill
         Me.listboxFiles.Location = New System.Drawing.Point(0, 0)
         Me.listboxFiles.Name = "listboxFiles"
-        Me.listboxFiles.Size = New System.Drawing.Size(290, 407)
+        Me.listboxFiles.Size = New System.Drawing.Size(290, 409)
         Me.listboxFiles.TabIndex = 1
         '
+        'BindingSource1
+        '
+        '
         'DockPanel2
         '
         Me.DockPanel2.Controls.Add(Me.DockPanel2_Container)
         Me.DockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right
         Me.DockPanel2.ID = New System.Guid("e82850af-b594-49e9-ae83-36d4bf007da5")
-        Me.DockPanel2.Location = New System.Drawing.Point(893, 159)
+        Me.DockPanel2.Location = New System.Drawing.Point(893, 157)
         Me.DockPanel2.Name = "DockPanel2"
         Me.DockPanel2.Options.ShowCloseButton = False
         Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200)
-        Me.DockPanel2.Size = New System.Drawing.Size(200, 456)
+        Me.DockPanel2.Size = New System.Drawing.Size(200, 458)
         Me.DockPanel2.Text = "Document Viewer"
         '
         'DockPanel2_Container
@@ -410,15 +427,16 @@ Partial Class Form1
         Me.DockPanel2_Container.Controls.Add(Me.DocumentViewer1)
         Me.DockPanel2_Container.Location = New System.Drawing.Point(4, 46)
         Me.DockPanel2_Container.Name = "DockPanel2_Container"
-        Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 407)
+        Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 409)
         Me.DockPanel2_Container.TabIndex = 0
         '
         'DocumentViewer1
         '
         Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.DocumentViewer1.FileLoaded = False
         Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
         Me.DocumentViewer1.Name = "DocumentViewer1"
-        Me.DocumentViewer1.Size = New System.Drawing.Size(193, 407)
+        Me.DocumentViewer1.Size = New System.Drawing.Size(193, 409)
         Me.DocumentViewer1.TabIndex = 0
         '
         'DockPanel4
@@ -440,7 +458,7 @@ Partial Class Form1
         Me.DockPanel4_Container.Controls.Add(Me.GridControl1)
         Me.DockPanel4_Container.Location = New System.Drawing.Point(0, 0)
         Me.DockPanel4_Container.Name = "DockPanel4_Container"
-        Me.DockPanel4_Container.Size = New System.Drawing.Size(590, 424)
+        Me.DockPanel4_Container.Size = New System.Drawing.Size(590, 426)
         Me.DockPanel4_Container.TabIndex = 0
         '
         'GridControl1
@@ -451,7 +469,7 @@ Partial Class Form1
         Me.GridControl1.MainView = Me.GridView1
         Me.GridControl1.MenuManager = Me.RibbonControl1
         Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(590, 424)
+        Me.GridControl1.Size = New System.Drawing.Size(590, 426)
         Me.GridControl1.TabIndex = 5
         Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
         '
@@ -460,9 +478,6 @@ Partial Class Form1
         Me.GridView1.GridControl = Me.GridControl1
         Me.GridView1.Name = "GridView1"
         '
-        'BindingSource1
-        '
-        '
         'Timer1
         '
         Me.Timer1.Interval = 3000
@@ -487,20 +502,6 @@ Partial Class Form1
         Me.panelContainer1.Size = New System.Drawing.Size(192, 145)
         Me.panelContainer1.Text = "panelContainer1"
         '
-        'Document1
-        '
-        Me.Document1.Caption = "DockPanelGrid"
-        Me.Document1.ControlName = "DockPanel4"
-        Me.Document1.FloatLocation = New System.Drawing.Point(354, 490)
-        Me.Document1.FloatSize = New System.Drawing.Size(538, 200)
-        Me.Document1.Properties.AllowClose = DevExpress.Utils.DefaultBoolean.[True]
-        Me.Document1.Properties.AllowFloat = DevExpress.Utils.DefaultBoolean.[True]
-        Me.Document1.Properties.AllowFloatOnDoubleClick = DevExpress.Utils.DefaultBoolean.[True]
-        '
-        'DocumentGroup1
-        '
-        Me.DocumentGroup1.Items.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document() {Me.Document1})
-        '
         'Form1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -515,6 +516,8 @@ Partial Class Form1
         Me.Ribbon = Me.RibbonControl1
         Me.StatusBar = Me.RibbonStatusBar1
         Me.Text = "Form1"
+        CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Document1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -530,15 +533,13 @@ Partial Class Form1
         Me.DockPanel1.ResumeLayout(False)
         Me.DockPanel1_Container.ResumeLayout(False)
         CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.DockPanel2.ResumeLayout(False)
         Me.DockPanel2_Container.ResumeLayout(False)
         Me.DockPanel4.ResumeLayout(False)
         Me.DockPanel4_Container.ResumeLayout(False)
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.Document1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
diff --git a/GUIs.Test.EDMIBenchmark/Form1.resx b/GUIs.Test.EDMIBenchmark/Form1.resx
index e655131f..96070a10 100644
--- a/GUIs.Test.EDMIBenchmark/Form1.resx
+++ b/GUIs.Test.EDMIBenchmark/Form1.resx
@@ -335,15 +335,12 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>159</value>
   </metadata>
+  <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>316, 17</value>
+  </metadata>
   <metadata name="DockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>176, 18</value>
   </metadata>
-  <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>316, 17</value>
-  </metadata>
-  <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>316, 17</value>
-  </metadata>
   <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>453, 17</value>
   </metadata>