From c5a0264095d98632ac926b9162f153dbb912cdd7 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Fri, 20 Dec 2024 01:25:02 +0100
Subject: [PATCH] Feature: Log export exception, re-design about page (#2958)

---
 .../Resources/Strings.Designer.cs             |  72 +++++++
 .../Resources/Strings.resx                    |  24 +++
 .../ViewModels/ARPTableViewModel.cs           |   6 +-
 .../ViewModels/AboutViewModel.cs              |  20 +-
 .../ViewModels/BitCalculatorViewModel.cs      |   3 +-
 .../ViewModels/ConnectionsViewModel.cs        |   6 +-
 .../ViewModels/DNSLookupViewModel.cs          |   9 +-
 .../ViewModels/DiscoveryProtocolViewModel.cs  |   9 +-
 .../ViewModels/IPGeolocationViewModel.cs      |   2 +
 .../ViewModels/IPScannerViewModel.cs          |  10 +-
 .../ViewModels/ListenersViewModel.cs          |   6 +-
 .../ViewModels/LookupOUILookupViewModel.cs    |   6 +-
 .../ViewModels/LookupPortViewModel.cs         |   6 +-
 .../ViewModels/NetworkInterfaceViewModel.cs   |   6 +-
 .../ViewModels/PingMonitorViewModel.cs        |   4 +
 .../ViewModels/PortScannerViewModel.cs        |   6 +-
 .../ViewModels/SNMPViewModel.cs               |   6 +-
 .../ViewModels/SNTPLookupViewModel.cs         |   6 +-
 .../SubnetCalculatorSubnettingViewModel.cs    |   6 +-
 .../ViewModels/TracerouteViewModel.cs         |   3 +-
 .../ViewModels/WhoisViewModel.cs              |   8 +-
 .../ViewModels/WiFiConnectViewModel.cs        |   8 +-
 .../ViewModels/WiFiViewModel.cs               |   7 +-
 Source/NETworkManager/Views/AboutView.xaml    | 202 ++++++++++--------
 .../Views/IPScannerView.xaml.cs               |   2 +-
 25 files changed, 313 insertions(+), 130 deletions(-)

diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
index 41ccf305b9..0f995a8ebc 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
+++ b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
@@ -3005,6 +3005,15 @@ public static string DomainName {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Donate ähnelt.
+        /// </summary>
+        public static string Donate {
+            get {
+                return ResourceManager.GetString("Donate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Don&apos;t fragment ähnelt.
         /// </summary>
@@ -8296,6 +8305,15 @@ public static string Repeat {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        /// </summary>
+        public static string ReportAnIssueOrCreateAFeatureRequest {
+            get {
+                return ResourceManager.GetString("ReportAnIssueOrCreateAFeatureRequest", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Report on GitHub ähnelt.
         /// </summary>
@@ -9524,6 +9542,15 @@ public static string SSID {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        /// </summary>
+        public static string StarForkTheProjectOnGitHub {
+            get {
+                return ResourceManager.GetString("StarForkTheProjectOnGitHub", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Start minimized in tray ähnelt.
         /// </summary>
@@ -10235,6 +10262,33 @@ public static string ToolTip_ContactOrContactMeViaX {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        /// </summary>
+        public static string ToolTip_GithubDocumentationUrl {
+            get {
+                return ResourceManager.GetString("ToolTip_GithubDocumentationUrl", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        /// </summary>
+        public static string ToolTip_GithubNewIssueUrl {
+            get {
+                return ResourceManager.GetString("ToolTip_GithubNewIssueUrl", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        /// </summary>
+        public static string ToolTip_GitHubProjectUrl {
+            get {
+                return ResourceManager.GetString("ToolTip_GitHubProjectUrl", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Help translate the project on Transifex. ähnelt.
         /// </summary>
@@ -10289,6 +10343,24 @@ public static string ToolTip_SupportThisProjectWithADonation {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        /// </summary>
+        public static string ToolTip_TransifexProjectUrl {
+            get {
+                return ResourceManager.GetString("ToolTip_TransifexProjectUrl", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        /// </summary>
+        public static string ToolTip_TwitterContactUrl {
+            get {
+                return ResourceManager.GetString("ToolTip_TwitterContactUrl", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Total bytes received ähnelt.
         /// </summary>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
index 57b8cf9000..a27f42d61b 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.resx
+++ b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -3852,4 +3852,28 @@ Right-click for more options.</value>
   <data name="OpenDocumentation" xml:space="preserve">
     <value>Open documentation</value>
   </data>
+  <data name="StarForkTheProjectOnGitHub" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ToolTip_GitHubProjectUrl" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ToolTip_TransifexProjectUrl" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ToolTip_TwitterContactUrl" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ReportAnIssueOrCreateAFeatureRequest" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ToolTip_GithubNewIssueUrl" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ToolTip_GithubDocumentationUrl" xml:space="preserve">
+    <value />
+  </data>
+  <data name="Donate" xml:space="preserve">
+    <value>Donate</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
index b5db34ef9b..2d1d5f103d 100644
--- a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
@@ -9,6 +9,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
@@ -69,7 +70,8 @@ public ARPTableViewModel(IDialogCoordinator instance)
     #endregion
 
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(ARPTableViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private readonly bool _isLoading;
@@ -390,6 +392,8 @@ private async Task ExportAction()
             }
             catch (Exception ex)
             {
+                Log.Error("Error while exporting data as " + instance.FileType, ex);
+                
                 var settings = AppearanceManager.MetroDialog;
                 settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/AboutViewModel.cs b/Source/NETworkManager/ViewModels/AboutViewModel.cs
index 7329ac72c9..c4b1913122 100644
--- a/Source/NETworkManager/ViewModels/AboutViewModel.cs
+++ b/Source/NETworkManager/ViewModels/AboutViewModel.cs
@@ -1,14 +1,15 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows.Data;
-using System.Windows.Input;
-using NETworkManager.Documentation;
+using NETworkManager.Documentation;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Properties;
 using NETworkManager.Settings;
 using NETworkManager.Update;
 using NETworkManager.Utilities;
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Input;
 
 namespace NETworkManager.ViewModels;
 
@@ -33,13 +34,16 @@ public AboutViewModel()
 
     #region Methods
 
-    private void CheckForUpdates()
+    private async Task CheckForUpdatesAsync()
     {
         IsUpdateAvailable = false;
         ShowUpdaterMessage = false;
 
         IsUpdateCheckRunning = true;
 
+        // Show a loading animation for the user
+        await Task.Delay(1000);
+
         var updater = new Updater();
 
         updater.UpdateAvailable += Updater_UpdateAvailable;
@@ -208,7 +212,7 @@ public ResourceInfo SelectedResourceInfo
 
     private void CheckForUpdatesAction()
     {
-        CheckForUpdates();
+        CheckForUpdatesAsync();
     }
 
     public ICommand OpenWebsiteCommand => new RelayCommand(OpenWebsiteAction);
diff --git a/Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs b/Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs
index f3cf909cfd..ce1c4a70be 100644
--- a/Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs
+++ b/Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs
@@ -21,7 +21,6 @@ namespace NETworkManager.ViewModels;
 public class BitCalculatorViewModel : ViewModelBase
 {
     #region Variables
-
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private static readonly ILog Log = LogManager.GetLogger(typeof(BitCalculatorViewModel));
@@ -185,6 +184,8 @@ private async Task ExportAction()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs b/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
index deebef2d2c..0cf04f7284 100644
--- a/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
@@ -9,6 +9,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization;
@@ -93,7 +94,8 @@ private async void AutoRefreshTimer_Tick(object sender, EventArgs e)
     #endregion
 
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(ConnectionsViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private readonly bool _isLoading;
@@ -307,6 +309,8 @@ private async Task ExportAction()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
index b45aedaa2d..eb50d42ee1 100644
--- a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
@@ -10,6 +10,7 @@
 using System.Windows.Input;
 using System.Windows.Threading;
 using DnsClient;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
@@ -25,6 +26,7 @@ namespace NETworkManager.ViewModels;
 public class DNSLookupViewModel : ViewModelBase
 {
     #region Variables
+    private static readonly ILog Log = LogManager.GetLogger(typeof(DNSLookupViewModel));
 
     private readonly IDialogCoordinator _dialogCoordinator;
 
@@ -387,6 +389,8 @@ private async Task Export()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
@@ -398,10 +402,9 @@ await _dialogCoordinator.ShowMessageAsync(window, Strings.Error,
                 SettingsManager.Current.DNSLookup_ExportFileType = instance.FileType;
                 SettingsManager.Current.DNSLookup_ExportFilePath = instance.FilePath;
             }, _ => { _dialogCoordinator.HideMetroDialogAsync(window, customDialog); },
-            new[]
-            {
+            [
                 ExportFileType.Csv, ExportFileType.Xml, ExportFileType.Json
-            }, true,
+            ], true,
             SettingsManager.Current.DNSLookup_ExportFileType, SettingsManager.Current.DNSLookup_ExportFilePath);
 
         customDialog.Content = new ExportDialog
diff --git a/Source/NETworkManager/ViewModels/DiscoveryProtocolViewModel.cs b/Source/NETworkManager/ViewModels/DiscoveryProtocolViewModel.cs
index a4533adf3d..0eb4699fd0 100644
--- a/Source/NETworkManager/ViewModels/DiscoveryProtocolViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DiscoveryProtocolViewModel.cs
@@ -6,6 +6,7 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.Export;
@@ -19,6 +20,7 @@ namespace NETworkManager.ViewModels;
 public class DiscoveryProtocolViewModel : ViewModelBase
 {
     #region Variables
+    private static readonly ILog Log = LogManager.GetLogger(typeof(DiscoveryProtocolViewModel));
 
     private readonly IDialogCoordinator _dialogCoordinator;
 
@@ -281,6 +283,8 @@ private async Task CaptureAction()
         }
         catch (Exception ex)
         {
+            Log.Error("Error while trying to capture", ex);
+            
             await _dialogCoordinator.ShowMessageAsync(this, Strings.Error, ex.Message,
                 MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
         }
@@ -306,6 +310,8 @@ private async Task ExportAction()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
@@ -316,7 +322,8 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
 
                 SettingsManager.Current.DiscoveryProtocol_ExportFileType = instance.FileType;
                 SettingsManager.Current.DiscoveryProtocol_ExportFilePath = instance.FilePath;
-            }, _ => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, [
+            }, _ => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, 
+            [
                 ExportFileType.Csv, ExportFileType.Xml, ExportFileType.Json
             ], false, SettingsManager.Current.DiscoveryProtocol_ExportFileType,
             SettingsManager.Current.DiscoveryProtocol_ExportFilePath);
diff --git a/Source/NETworkManager/ViewModels/IPGeolocationViewModel.cs b/Source/NETworkManager/ViewModels/IPGeolocationViewModel.cs
index 2ebaa4a145..98e64c12a4 100644
--- a/Source/NETworkManager/ViewModels/IPGeolocationViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPGeolocationViewModel.cs
@@ -253,6 +253,8 @@ private async Task Export()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
index 2a2c06773d..aad0130127 100644
--- a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
@@ -13,6 +13,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
@@ -32,11 +33,12 @@ namespace NETworkManager.ViewModels;
 public class IPScannerViewModel : ViewModelBase, IProfileManagerMinimal
 {
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(IPScannerViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private CancellationTokenSource _cancellationTokenSource;
-
+    
     private readonly Guid _tabId;
     private bool _firstLoad = true;
     private bool _closed;
@@ -510,6 +512,8 @@ private async Task CustomCommand(object guid)
             }
             catch (Exception ex)
             {
+                Log.Error("Error trying to run custom command", ex);
+                
                 await _dialogCoordinator.ShowMessageAsync(this,
                     Strings.ResourceManager.GetString("Error",
                         LocalizationManager.GetInstance().Culture), ex.Message, MessageDialogStyle.Affirmative,
@@ -555,6 +559,8 @@ private Task Export()
             }
             catch (Exception ex)
             {
+                Log.Error("Error while exporting data as " + instance.FileType, ex);
+                
                 var settings = AppearanceManager.MetroDialog;
                 settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/ListenersViewModel.cs b/Source/NETworkManager/ViewModels/ListenersViewModel.cs
index c03a3c3514..bddde6c2b3 100644
--- a/Source/NETworkManager/ViewModels/ListenersViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ListenersViewModel.cs
@@ -9,6 +9,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
@@ -84,7 +85,8 @@ private async void AutoRefreshTimer_Tick(object sender, EventArgs e)
     #endregion
 
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(ListenersViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private readonly bool _isLoading;
@@ -298,6 +300,8 @@ private async Task ExportAction()
             }
             catch (Exception ex)
             {
+                Log.Error("Error while exporting data as " + instance.FileType, ex);
+                
                 var settings = AppearanceManager.MetroDialog;
                 settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs b/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
index 7ea567decb..23989159fb 100644
--- a/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
@@ -9,6 +9,7 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
@@ -58,7 +59,8 @@ private void AddSearchToHistory(string macAddressOrVendor)
     #endregion
 
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(LookupOUILookupViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private string _search;
@@ -250,6 +252,8 @@ private async Task ExportAction()
             }
             catch (Exception ex)
             {
+                Log.Error("Error while exporting data as " + instance.FileType, ex);
+                
                 var settings = AppearanceManager.MetroDialog;
                 settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/LookupPortViewModel.cs b/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
index af84380b53..cf23746d11 100644
--- a/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
+++ b/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
@@ -9,6 +9,7 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
@@ -54,7 +55,8 @@ private void AddSearchToHistory(string portOrService)
     #endregion
 
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(LookupPortLookupViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private string _search;
@@ -312,6 +314,8 @@ private async Task ExportAction()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs b/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
index 8508269b81..9fce4e1e3e 100644
--- a/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
+++ b/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
@@ -13,6 +13,7 @@
 using LiveCharts;
 using LiveCharts.Configurations;
 using LiveCharts.Wpf;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
@@ -31,7 +32,8 @@ namespace NETworkManager.ViewModels;
 public class NetworkInterfaceViewModel : ViewModelBase, IProfileManager
 {
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(NetworkInterfaceViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
     private readonly DispatcherTimer _searchDispatcherTimer = new();
     private BandwidthMeter _bandwidthMeter;
@@ -692,6 +694,8 @@ private async Task ExportAction()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/PingMonitorViewModel.cs b/Source/NETworkManager/ViewModels/PingMonitorViewModel.cs
index 321859625e..42769ef9c3 100644
--- a/Source/NETworkManager/ViewModels/PingMonitorViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingMonitorViewModel.cs
@@ -11,6 +11,7 @@
 using LiveCharts;
 using LiveCharts.Configurations;
 using LiveCharts.Wpf;
+using log4net;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.Export;
@@ -48,6 +49,7 @@ public PingMonitorViewModel(IDialogCoordinator instance, Guid hostId, Action<Gui
     #endregion
 
     #region Variables
+    private static readonly ILog Log = LogManager.GetLogger(typeof(PingMonitorViewModel));
 
     private readonly IDialogCoordinator _dialogCoordinator;
     private CancellationTokenSource _cancellationTokenSource;
@@ -412,6 +414,8 @@ public async Task Export()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
index d9180e13e7..b845b595ed 100644
--- a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
@@ -11,6 +11,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
@@ -26,7 +27,8 @@ namespace NETworkManager.ViewModels;
 public class PortScannerViewModel : ViewModelBase
 {
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(PortScannerViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private CancellationTokenSource _cancellationTokenSource;
@@ -439,6 +441,8 @@ private async Task Export()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/SNMPViewModel.cs b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
index 7080524f90..017e3e8b7f 100644
--- a/Source/NETworkManager/ViewModels/SNMPViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
@@ -12,6 +12,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
@@ -96,7 +97,8 @@ public SNMPViewModel(IDialogCoordinator instance, Guid tabId, SNMPSessionInfo se
     #endregion
 
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(SNMPViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private CancellationTokenSource _cancellationTokenSource;
@@ -723,6 +725,8 @@ private async Task Export()
             }
             catch (Exception ex)
             {
+                Log.Error("Error while exporting data as " + instance.FileType, ex);
+                
                 var settings = AppearanceManager.MetroDialog;
                 settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/SNTPLookupViewModel.cs b/Source/NETworkManager/ViewModels/SNTPLookupViewModel.cs
index 60b83361bc..ae344e243a 100644
--- a/Source/NETworkManager/ViewModels/SNTPLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNTPLookupViewModel.cs
@@ -8,6 +8,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
@@ -23,7 +24,8 @@ namespace NETworkManager.ViewModels;
 public class SNTPLookupViewModel : ViewModelBase
 {
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(SNTPLookupViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private readonly Guid _tabId;
@@ -251,6 +253,8 @@ private async Task Export()
             }
             catch (Exception ex)
             {
+                Log.Error("Error while exporting data as " + instance.FileType, ex);
+                
                 var settings = AppearanceManager.MetroDialog;
                 settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
index c9927b7b47..96f7518b5f 100644
--- a/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
@@ -11,6 +11,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
@@ -45,7 +46,8 @@ public SubnetCalculatorSubnettingViewModel(IDialogCoordinator instance)
     #endregion
 
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(SubnetCalculatorSubnettingViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private string _subnet;
@@ -201,6 +203,8 @@ private async Task ExportAction()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
index 49cc2c10f9..267ea61bff 100644
--- a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
@@ -28,7 +28,6 @@ namespace NETworkManager.ViewModels;
 public class TracerouteViewModel : ViewModelBase
 {
     #region Variables
-
     private static readonly ILog Log = LogManager.GetLogger(typeof(TracerouteViewModel));
 
     private readonly IDialogCoordinator _dialogCoordinator;
@@ -359,6 +358,8 @@ private async Task Export()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+                    
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/ViewModels/WhoisViewModel.cs b/Source/NETworkManager/ViewModels/WhoisViewModel.cs
index 5a511b6ae4..9e27233a5d 100644
--- a/Source/NETworkManager/ViewModels/WhoisViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WhoisViewModel.cs
@@ -5,6 +5,7 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
+using log4net;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
@@ -20,7 +21,8 @@ namespace NETworkManager.ViewModels;
 public class WhoisViewModel : ViewModelBase
 {
     #region Variables
-
+    private static readonly ILog Log = LogManager.GetLogger(typeof(IPScannerViewModel));
+    
     private readonly IDialogCoordinator _dialogCoordinator;
 
     private readonly Guid _tabId;
@@ -261,11 +263,13 @@ private async Task Export()
             }
             catch (Exception ex)
             {
+                Log.Error("Error while exporting data as " + instance.FileType, ex);
+                
                 var settings = AppearanceManager.MetroDialog;
                 settings.AffirmativeButtonText = Strings.OK;
 
                 await _dialogCoordinator.ShowMessageAsync(window, Strings.Error,
-                    Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine +
+                    Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
                     ex.Message, MessageDialogStyle.Affirmative, settings);
             }
 
diff --git a/Source/NETworkManager/ViewModels/WiFiConnectViewModel.cs b/Source/NETworkManager/ViewModels/WiFiConnectViewModel.cs
index eee76050b1..df40ca1548 100644
--- a/Source/NETworkManager/ViewModels/WiFiConnectViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WiFiConnectViewModel.cs
@@ -1,9 +1,9 @@
-using System;
+using NETworkManager.Models.Network;
+using NETworkManager.Utilities;
+using System;
 using System.Security;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using NETworkManager.Models.Network;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.ViewModels;
 
@@ -344,7 +344,7 @@ public async Task CheckWpsAsync()
             return;
 
         IsWpsChecking = true;
-        // Make the user happy, let him see a reload animation (and he cannot spam the reload command)        
+        // Make the user happy, let him see a reload animation (and he cannot spam the reload command)
         await Task.Delay(1000);
 
         IsWpsAvailable =
diff --git a/Source/NETworkManager/ViewModels/WiFiViewModel.cs b/Source/NETworkManager/ViewModels/WiFiViewModel.cs
index 93aad6ce3c..8d6c713639 100644
--- a/Source/NETworkManager/ViewModels/WiFiViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WiFiViewModel.cs
@@ -5,7 +5,6 @@
 using NETworkManager.Localization;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.Export;
-using NETworkManager.Models.Lookup;
 using NETworkManager.Models.Network;
 using NETworkManager.Settings;
 using NETworkManager.Utilities;
@@ -800,7 +799,7 @@ private async void Connect()
                 : string.Format(Strings.ConnectToXXX, selectedNetwork.AvailableNetwork.Ssid)
         };
 
-        var exportViewModel = new WiFiConnectViewModel(async instance =>
+        var connectViewModel = new WiFiConnectViewModel(async instance =>
             {
                 // Connect Open/PSK/EAP
                 await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
@@ -900,7 +899,7 @@ private async void Connect()
 
         customDialog.Content = new WiFiConnectDialog
         {
-            DataContext = exportViewModel
+            DataContext = connectViewModel
         };
 
         await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
@@ -947,6 +946,8 @@ private async Task Export()
                 }
                 catch (Exception ex)
                 {
+                    Log.Error("Error while exporting data as " + instance.FileType, ex);
+
                     var settings = AppearanceManager.MetroDialog;
                     settings.AffirmativeButtonText = Strings.OK;
 
diff --git a/Source/NETworkManager/Views/AboutView.xaml b/Source/NETworkManager/Views/AboutView.xaml
index 31ef11ad08..4fc5fad006 100644
--- a/Source/NETworkManager/Views/AboutView.xaml
+++ b/Source/NETworkManager/Views/AboutView.xaml
@@ -26,24 +26,23 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />                
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0" Margin="0,0,0,20">
+            <Grid Grid.Column="0" Grid.Row="0" 
+                  Margin="0,0,0,20">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="10" />
                     <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Image Grid.Column="0" Grid.Row="0" Width="128" Height="128" Source="/NETworkManager.ico"
-                       VerticalAlignment="Center" />
-                <StackPanel Grid.Column="1" Margin="20,0,0,0">
+                </Grid.ColumnDefinitions>                
+                <Image Grid.Column="0" Grid.Row="0" Width="128" Height="128" Source="/NETworkManager.ico" VerticalAlignment="Top" Margin="10" />
+                <StackPanel Grid.Column="2" Grid.Row="0">
                     <TextBlock FontSize="32" Text="{x:Static resources:Resources.NETworkManager_ProjectName}"
                                Style="{StaticResource HeaderTextBlock}" />
                     <TextBlock Text="{x:Static localization:Strings.Slogan}" Style="{DynamicResource WrapTextBlock}"
                                Margin="0,0,0,5" />
                     <TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold"
-                               VerticalAlignment="Center" Margin="0,0,0,5" />
+                               VerticalAlignment="Center" Margin="0,0,0,10" />                    
                     <TextBlock Text="{x:Static resources:Resources.NETworkManager_License}"
                                Style="{StaticResource LinkTextBlock}" HorizontalAlignment="Left" Margin="0,0,0,5">
                         <TextBlock.InputBindings>
@@ -63,12 +62,77 @@
                             </TextBlock.InputBindings>
                         </TextBlock>
                     </StackPanel>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,10">
+                    <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+                        <Button ToolTip="{x:Static localization:Strings.ToolTip_SupportThisProjectWithADonation}"
+                                Command="{Binding OpenWebsiteCommand}"
+                                CommandParameter="{x:Static resources:Resources.NETworkManager_DonateUrl}"
+                                Style="{StaticResource ImageWithTextButton}"                        
+                                HorizontalAlignment="Left">
+                            <Button.Content>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Rectangle Style="{StaticResource ButtonWithImageRectangle}">
+                                        <Rectangle.OpacityMask>
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Heart}" />
+                                        </Rectangle.OpacityMask>
+                                    </Rectangle>
+                                    <TextBlock Grid.Column="1" Grid.Row="0"                                           
+                                               Text="{x:Static localization:Strings.Donate}"
+                                               Style="{StaticResource ButtonWithImageTextBlock}" />               
+                                </Grid>
+                            </Button.Content>
+                        </Button>
+                        <Grid Margin="10,0,0,0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="10" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Button Grid.Column="0" Grid.Row="0" x:Name="ButtonCheckForUpdates"                                    
+                                    Command="{Binding CheckForUpdatesCommand}"
+                                    IsEnabled="{Binding IsUpdateCheckRunning, Converter={StaticResource BooleanReverseConverter}}"
+                                    Style="{StaticResource DefaultButton}"
+                                    Content="{x:Static localization:Strings.CheckForUpdates}" />
+                            <StackPanel Grid.Column="2" Grid.Row="0"
+                                        Orientation="Horizontal"
+                                        Visibility="{Binding IsUpdateAvailable, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                <StackPanel.InputBindings>
+                                    <MouseBinding Gesture="LeftClick" Command="{Binding OpenWebsiteCommand}"
+                                                  CommandParameter="{Binding UpdateReleaseUrl, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                                </StackPanel.InputBindings>
+                                <Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Accent}">
+                                    <Rectangle.OpacityMask>
+                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=RocketLaunchOutline}" />
+                                    </Rectangle.OpacityMask>
+                                </Rectangle>
+                                <TextBlock Text="{Binding UpdateText}" 
+                                           Style="{StaticResource LinkTextBlock}"
+                                           VerticalAlignment="Center"
+                                           Margin="10,0,0,0" />
+                            </StackPanel>
+                            <mahAppsControls:ProgressRing Grid.Column="2" Grid.Row="0"
+                                                          Visibility="{Binding IsUpdateCheckRunning, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                                                          Height="{Binding ElementName=ButtonCheckForUpdates, Path=ActualHeight}"
+                                                          Width="{Binding ElementName=ButtonCheckForUpdates, Path=ActualHeight}"
+                                                          HorizontalAlignment="Left"
+                                                          IsActive="True" />
+                            <TextBlock Grid.Column="2" Grid.Row="0"
+                                       Text="{Binding UpdaterMessage}"
+                                       Visibility="{Binding ShowUpdaterMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                                       Style="{StaticResource CenterTextBlock}"
+                                       Margin="10,0,0,0" />
+                        </Grid>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                         <StackPanel.Resources>
                             <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
                                 <Setter Property="Cursor" Value="Hand" />
                             </Style>
                         </StackPanel.Resources>
+
                         <Button ToolTip="{x:Static localization:Strings.ToolTip_StarForkProjectOnGitHub}"
                                 Command="{Binding OpenWebsiteCommand}"
                                 CommandParameter="{x:Static resources:Resources.NETworkManager_GitHubRepoUrl}">
@@ -80,9 +144,8 @@
                                     <Style TargetType="{x:Type Rectangle}">
                                         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
                                         <Style.Triggers>
-                                            <DataTrigger
-                                                Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
-                                                Value="True">
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
+                                                         Value="True">
                                                 <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                                             </DataTrigger>
                                         </Style.Triggers>
@@ -102,9 +165,8 @@
                                     <Style TargetType="{x:Type Rectangle}">
                                         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
                                         <Style.Triggers>
-                                            <DataTrigger
-                                                Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
-                                                Value="True">
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
+                                                         Value="True">
                                                 <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                                             </DataTrigger>
                                         </Style.Triggers>
@@ -113,40 +175,18 @@
                             </Rectangle>
                         </Button>
                         <Button ToolTip="{x:Static localization:Strings.ToolTip_OpenTheDocumentation}"
-                                Command="{Binding OpenDocumentationCommand}" Margin="10,0,0,0">
-                            <Rectangle Width="24" Height="24">
-                                <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Book}" />
-                                </Rectangle.OpacityMask>
-                                <Rectangle.Style>
-                                    <Style TargetType="{x:Type Rectangle}">
-                                        <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
-                                        <Style.Triggers>
-                                            <DataTrigger
-                                               Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
-                                               Value="True">
-                                                <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Rectangle.Style>
-                            </Rectangle>
-                        </Button>
-                        <Button ToolTip="{x:Static localization:Strings.ToolTip_SupportThisProjectWithADonation}"
-                                Command="{Binding OpenWebsiteCommand}"
-                                CommandParameter="{x:Static resources:Resources.NETworkManager_DonateUrl}"
+                                Command="{Binding OpenDocumentationCommand}"
                                 Margin="10,0,0,0">
                             <Rectangle Width="24" Height="24">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Heart}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Book}" />
                                 </Rectangle.OpacityMask>
                                 <Rectangle.Style>
                                     <Style TargetType="{x:Type Rectangle}">
                                         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
                                         <Style.Triggers>
-                                            <DataTrigger
-                                                 Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
-                                                 Value="True">          
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
+                                       Value="True">
                                                 <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                                             </DataTrigger>
                                         </Style.Triggers>
@@ -166,9 +206,8 @@
                                     <Style TargetType="{x:Type Rectangle}">
                                         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
                                         <Style.Triggers>
-                                            <DataTrigger
-                                                Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
-                                                Value="True">
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
+                                                         Value="True">
                                                 <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                                             </DataTrigger>
                                         </Style.Triggers>
@@ -179,7 +218,7 @@
                         <Button ToolTip="{x:Static localization:Strings.ToolTip_ContactOrContactMeViaX}"
                                 Command="{Binding OpenWebsiteCommand}"
                                 CommandParameter="{x:Static resources:Resources.NETworkManager_XContactUrl}"
-                                Margin="10,0,0,0">
+                                Margin="10,0,0,0">        
                             <Rectangle Width="24" Height="24">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform" Visual="{iconPacks:FontAwesome Kind=XTwitterBrands}" />
@@ -188,9 +227,8 @@
                                     <Style TargetType="{x:Type Rectangle}">
                                         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
                                         <Style.Triggers>
-                                            <DataTrigger
-                                                Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
-                                                Value="True">
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
+                                       Value="True">
                                                 <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                                             </DataTrigger>
                                         </Style.Triggers>
@@ -199,47 +237,14 @@
                             </Rectangle>
                         </Button>
                     </StackPanel>
-                </StackPanel>
-            </Grid>
-            <TextBlock Grid.Row="1" Text="{x:Static localization:Strings.Update}"
-                       Style="{StaticResource HeaderTextBlock}" />
-            <Grid Grid.Row="2" Margin="0,0,0,20">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Button Grid.Column="0" x:Name="ButtonCheckForUpdates" HorizontalAlignment="Left"
-                        Command="{Binding CheckForUpdatesCommand}"
-                        IsEnabled="{Binding IsUpdateCheckRunning, Converter={StaticResource BooleanReverseConverter}}"
-                        Style="{StaticResource DefaultButton}"
-                        Content="{x:Static localization:Strings.CheckForUpdates}" />
-                <StackPanel Grid.Column="2" Orientation="Horizontal"
-                            Visibility="{Binding IsUpdateAvailable, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
-                    <StackPanel.InputBindings>
-                        <MouseBinding Gesture="LeftClick" Command="{Binding OpenWebsiteCommand}"
-                                      CommandParameter="{Binding UpdateReleaseUrl, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-                    </StackPanel.InputBindings>
-                    <Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Accent}">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=RocketLaunchOutline}" />
-                        </Rectangle.OpacityMask>
-                    </Rectangle>
-                    <TextBlock Text="{Binding UpdateText}" Style="{StaticResource LinkTextBlock}"
-                               VerticalAlignment="Center" Margin="10,0,0,0" />
-                </StackPanel>
-                <mahAppsControls:ProgressRing Grid.Column="2"
-                                              Visibility="{Binding IsUpdateCheckRunning, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
-                                              Height="{Binding ElementName=ButtonCheckForUpdates, Path=ActualHeight}"
-                                              Width="{Binding ElementName=ButtonCheckForUpdates, Path=ActualHeight}"
-                                              HorizontalAlignment="Left" IsActive="True" />
-                <TextBlock Grid.Column="2" Text="{Binding UpdaterMessage}"
-                           Visibility="{Binding ShowUpdaterMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
-                           Style="{StaticResource CenterTextBlock}" Margin="10,0,0,0" />
+                </StackPanel>                
             </Grid>
-            <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.Libraries}"
+            <TextBlock Grid.Column="0" Grid.Row="1" 
+                       Text="{x:Static localization:Strings.Libraries}"
                        Style="{StaticResource HeaderTextBlock}" />
-            <DataGrid Grid.Row="4" ItemsSource="{Binding LibrariesView}" SelectedItem="{Binding SelectedLibraryInfo}"
+            <DataGrid Grid.Column="0" Grid.Row="2" 
+                      ItemsSource="{Binding LibrariesView}" 
+                      SelectedItem="{Binding SelectedLibraryInfo}"
                       Margin="0,0,0,10">
                 <DataGrid.Resources>
                     <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
@@ -294,8 +299,11 @@
                                         Binding="{Binding (documentation:LibraryInfo.License)}" MinWidth="150" />
                 </DataGrid.Columns>
             </DataGrid>
-            <Button Grid.Row="5" Command="{Binding OpenLicenseFolderCommand}" HorizontalAlignment="Right"
-                    Style="{StaticResource ImageWithTextButton}" Margin="0,0,0,20">
+            <Button Grid.Column="0" Grid.Row="3" 
+                    Command="{Binding OpenLicenseFolderCommand}" 
+                    HorizontalAlignment="Right"
+                    Style="{StaticResource ImageWithTextButton}" 
+                    Margin="0,0,0,20">
                 <Button.Content>
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -312,9 +320,12 @@
                     </Grid>
                 </Button.Content>
             </Button>
-            <TextBlock Grid.Row="6" Text="{x:Static localization:Strings.ExternalServices}"
+            <TextBlock Grid.Column="0" Grid.Row="4" 
+                       Text="{x:Static localization:Strings.ExternalServices}"
                        Style="{StaticResource HeaderTextBlock}" />
-            <DataGrid x:Name="DataGridExternalServices" Grid.Row="7" ItemsSource="{Binding ExternalServicesView}"
+            <DataGrid Grid.Column="0" Grid.Row="5"
+                      x:Name="DataGridExternalServices"                      
+                      ItemsSource="{Binding ExternalServicesView}"
                       SelectedItem="{Binding SelectedExternalServicesInfo}" Margin="0,0,0,20">
                 <DataGrid.Resources>
                     <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
@@ -356,9 +367,12 @@
                     </DataGridTextColumn>
                 </DataGrid.Columns>
             </DataGrid>
-            <TextBlock Grid.Row="8" Text="{x:Static localization:Strings.Resources}"
+            <TextBlock Grid.Column="0" Grid.Row="6"
+                       Text="{x:Static localization:Strings.Resources}"
                        Style="{StaticResource HeaderTextBlock}" />
-            <DataGrid x:Name="DataGridResources" Grid.Row="9" ItemsSource="{Binding ResourcesView}"
+            <DataGrid Grid.Column="0" Grid.Row="7" 
+                      x:Name="DataGridResources" 
+                      ItemsSource="{Binding ResourcesView}"
                       SelectedItem="{Binding SelectedResourceInfo}">
                 <DataGrid.Resources>
                     <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
diff --git a/Source/NETworkManager/Views/IPScannerView.xaml.cs b/Source/NETworkManager/Views/IPScannerView.xaml.cs
index 816e4ec8b2..8ce5b1bfff 100644
--- a/Source/NETworkManager/Views/IPScannerView.xaml.cs
+++ b/Source/NETworkManager/Views/IPScannerView.xaml.cs
@@ -17,7 +17,7 @@ namespace NETworkManager.Views;
 public partial class IPScannerView : IDragablzTabItem
 {
     private readonly IPScannerViewModel _viewModel;
-
+    
     public IPScannerView(Guid tabId, string hostOrIPRange = null)
     {
         InitializeComponent();