diff --git a/DocumentViewer.Designer.vb b/DocumentViewer.Designer.vb
index 211af3c..3c077c2 100644
--- a/DocumentViewer.Designer.vb
+++ b/DocumentViewer.Designer.vb
@@ -279,7 +279,7 @@ Partial Class DocumentViewer
         Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
         Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
         Me.barDockControlTop.Manager = Me.BarManager1
-        Me.barDockControlTop.Size = New System.Drawing.Size(634, 33)
+        Me.barDockControlTop.Size = New System.Drawing.Size(634, 36)
         '
         'barDockControlBottom
         '
@@ -293,17 +293,17 @@ Partial Class DocumentViewer
         '
         Me.barDockControlLeft.CausesValidation = False
         Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left
-        Me.barDockControlLeft.Location = New System.Drawing.Point(0, 33)
+        Me.barDockControlLeft.Location = New System.Drawing.Point(0, 36)
         Me.barDockControlLeft.Manager = Me.BarManager1
-        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 522)
+        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 519)
         '
         'barDockControlRight
         '
         Me.barDockControlRight.CausesValidation = False
         Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
-        Me.barDockControlRight.Location = New System.Drawing.Point(634, 33)
+        Me.barDockControlRight.Location = New System.Drawing.Point(634, 36)
         Me.barDockControlRight.Manager = Me.BarManager1
-        Me.barDockControlRight.Size = New System.Drawing.Size(0, 522)
+        Me.barDockControlRight.Size = New System.Drawing.Size(0, 519)
         '
         'BarStaticItem1
         '
@@ -381,7 +381,7 @@ Partial Class DocumentViewer
         Me.MyGDPViewer.HQAnnotationRendering = True
         Me.MyGDPViewer.IgnoreDocumentResolution = False
         Me.MyGDPViewer.KeepDocumentPosition = False
-        Me.MyGDPViewer.Location = New System.Drawing.Point(192, 138)
+        Me.MyGDPViewer.Location = New System.Drawing.Point(183, 125)
         Me.MyGDPViewer.LockViewer = False
         Me.MyGDPViewer.MagnifierHeight = 90
         Me.MyGDPViewer.MagnifierWidth = 160
@@ -446,7 +446,7 @@ Partial Class DocumentViewer
         Me.lbFileNotLoaded.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center
         Me.lbFileNotLoaded.AutoEllipsis = True
         Me.lbFileNotLoaded.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
-        Me.lbFileNotLoaded.Location = New System.Drawing.Point(6, 78)
+        Me.lbFileNotLoaded.Location = New System.Drawing.Point(6, 47)
         Me.lbFileNotLoaded.Name = "lbFileNotLoaded"
         Me.lbFileNotLoaded.Size = New System.Drawing.Size(628, 72)
         Me.lbFileNotLoaded.TabIndex = 0
diff --git a/DocumentViewer.resx b/DocumentViewer.resx
index 63fd272..6f34371 100644
--- a/DocumentViewer.resx
+++ b/DocumentViewer.resx
@@ -123,9 +123,6 @@
   <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>285, 22</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>147</value>
-  </metadata>
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="buttonPrint.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -164,6 +161,26 @@
         NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy
         OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00
         LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+        Cjwvc3ZnPgs=
 </value>
   </data>
   <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -202,6 +219,9 @@
         OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>147</value>
+  </metadata>
   <data name="btnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@@ -226,26 +246,6 @@
         ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
         LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
         QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
-        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
-        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
-        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
-        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
-        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
-        Cjwvc3ZnPgs=
 </value>
   </data>
   <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/DocumentViewer.vb b/DocumentViewer.vb
index 6d0e9fb..436a160 100644
--- a/DocumentViewer.vb
+++ b/DocumentViewer.vb
@@ -180,6 +180,10 @@ Public Class DocumentViewer
             Exit Sub
         End If
 
+        ' Reset state from previous file
+        _ViewOverride = ""
+        _ViewerMode = ViewerMode.GDPicture ' Default mode
+
         _FilePath = FilePath
         _FileLoadMode = FileLoadMode.File
         _FileInfo = New FileInfo(FilePath)
@@ -196,7 +200,9 @@ Public Class DocumentViewer
     Public Sub LoadFile_FromStream(FileName As String, Stream As Stream)
         FileLoaded = False
 
-
+        ' Reset state from previous file
+        _ViewOverride = ""
+        _ViewerMode = ViewerMode.GDPicture ' Default mode
 
         Dim oExtension As String = FileName.Substring(FileName.LastIndexOf("."))
 
@@ -204,9 +210,9 @@ Public Class DocumentViewer
         _FileLoadMode = FileLoadMode.Stream
 
         _logger.Info("Loading file [{0}] from Stream", FileName)
-        SetViewerMode(oExtension)  ' Erst ViewerMode setzen ...
+        SetViewerMode(oExtension)
         FileLoaded = DoLoadFileExtension(Stream, oExtension)
-        UpdateMainUi()             ' ... dann UI aktualisieren
+        UpdateMainUi()
     End Sub
 
     ''' <summary>
@@ -522,7 +528,7 @@ Public Class DocumentViewer
             _ViewerMode = ViewerMode.Richtext
         Else
             Select Case Extension.ToUpper
-                Case "CSV"
+                Case ".CSV"
                     _ViewerMode = ViewerMode.Excel
                 Case ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
                     _ViewerMode = ViewerMode.Richtext
@@ -672,10 +678,10 @@ Public Class DocumentViewer
             lblInfo.Visible = False
 
             ' Determine viewer mode and load file
-            If ViewOverride = "Richtext" Then
+            If ViewOverride = "Richtext" OrElse _ViewerMode = ViewerMode.Richtext Then
                 _logger.Info("Loading Richtext file: {0}", FilePath)
                 Return LoadRichtextFile(FilePath, oExtension)
-            ElseIf oExtension = ".CSV" Or (oExtension = ".XLSX" AndAlso oFileInfo.Length > 15000) Then
+            ElseIf _ViewerMode = ViewerMode.Excel OrElse oExtension = ".CSV" OrElse (oExtension = ".XLSX" AndAlso oFileInfo.Length > 15000) Then
                 _logger.Debug("Loading Spreadsheet file: {0}", FilePath)
                 Return LoadSpreadsheetFile(FilePath, oExtension)
             Else
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index aa30cbb..7005c6f 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.2.0")>
-<Assembly: AssemblyFileVersion("2.7.2.0")>
+<Assembly: AssemblyVersion("2.7.3.0")>
+<Assembly: AssemblyFileVersion("2.7.3.0")>