diff --git a/VisionBuilder.UI.Common/ViewModel/ErrorPreviewVM.cs b/VisionBuilder.UI.Common/ViewModel/ErrorPreviewVM.cs
index 25a0cd4..82d0471 100644
--- a/VisionBuilder.UI.Common/ViewModel/ErrorPreviewVM.cs
+++ b/VisionBuilder.UI.Common/ViewModel/ErrorPreviewVM.cs
@@ -108,7 +108,7 @@ public partial class ErrorPreviewVM:ObservableObject
             ImageAnalysis = null;
             return;
         }
-        
+        OriginalView= false;
         IsNextImageEnabled = imageIndex < _errorsVm.Errors.Count - 1;
         IsPreviousImageEnabled = imageIndex > 0;
         ImageName = _errorData.Title;
diff --git a/VisionBuilder.UI.Common/ViewModel/SingleCameraVM.cs b/VisionBuilder.UI.Common/ViewModel/SingleCameraVM.cs
index b9fef56..09e0c05 100644
--- a/VisionBuilder.UI.Common/ViewModel/SingleCameraVM.cs
+++ b/VisionBuilder.UI.Common/ViewModel/SingleCameraVM.cs
@@ -57,8 +57,8 @@ namespace VisionBuilder.UI.Common
 
         public bool CanStop => IsRunning;
         public bool CanStart => !IsRunning && SelectedRecipe!=null;
-        public bool CanPause => (IsRunning && !IsPaused);
-        public bool CanResume => (IsRunning && IsPaused);
+        public bool CanPause => (IsRunning && !IsPaused)&&_uiConfiguration.ShowPauseButton;
+        public bool CanResume => (IsRunning && IsPaused) && _uiConfiguration.ShowPauseButton;
         
         
 
diff --git a/VisionBuilder.UI.Windows.Test/Program.cs b/VisionBuilder.UI.Windows.Test/Program.cs
index ef6591e..393b118 100644
--- a/VisionBuilder.UI.Windows.Test/Program.cs
+++ b/VisionBuilder.UI.Windows.Test/Program.cs
@@ -33,6 +33,17 @@ namespace VisionBuilder.UI.Windows.Test
         [STAThread]
         static void Main(string[] args)
         {
+
+            //AppDomain.CurrentDomain.FirstChanceException += (sender, e) =>
+            //{
+            //    if (e.Exception.Message.Contains("timed out"))
+            //    {
+            //        File.AppendAllText("timeout_log.txt",
+            //            $"[{DateTime.Now:O}] {e.Exception.GetType().FullName}: {e.Exception.Message}\n" +
+            //            $"{e.Exception.StackTrace}\n" +
+            //            $"--- Inner: {e.Exception.InnerException}\n\n");
+            //    }
+            //};
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
diff --git a/VisionBuilder.UI.Windows/Dialogs/ImagePreview.Designer.cs b/VisionBuilder.UI.Windows/Dialogs/ImagePreview.Designer.cs
index d82480c..956a7fb 100644
--- a/VisionBuilder.UI.Windows/Dialogs/ImagePreview.Designer.cs
+++ b/VisionBuilder.UI.Windows/Dialogs/ImagePreview.Designer.cs
@@ -150,7 +150,7 @@ namespace Inspectron.HawkEye.View
             btnSwitchView.Primary = false;
             btnSwitchView.Size = new Size(168, 64);
             btnSwitchView.TabIndex = 7;
-            btnSwitchView.Text = "Switch view";
+            btnSwitchView.Text = "Show original";
             btnSwitchView.UseVisualStyleBackColor = true;
             btnSwitchView.Click += btnSwitchView_Click;
             // 
diff --git a/VisionBuilder.UI.Windows/Dialogs/ImagePreview.cs b/VisionBuilder.UI.Windows/Dialogs/ImagePreview.cs
index b640715..cd666f9 100644
--- a/VisionBuilder.UI.Windows/Dialogs/ImagePreview.cs
+++ b/VisionBuilder.UI.Windows/Dialogs/ImagePreview.cs
@@ -44,7 +44,9 @@ namespace Inspectron.HawkEye.View
                 case nameof(ErrorPreviewVM.ImageName):
                     this.lblErrName.Text = _previewVm.ImageName;
                     break;
-
+                case nameof(ErrorPreviewVM.OriginalView):
+                    btnSwitchView.Text = _previewVm.OriginalView ? "Show Analysis" : "Show Original";
+                    break;
             }
         }
 
@@ -75,7 +77,7 @@ namespace Inspectron.HawkEye.View
 
         private void btnSwitchView_Click(object sender, EventArgs e)
         {
-
+            _previewVm.SwitchView();
         }
     }
 }