diff --git a/SnapIt.Common/Applications/ApplicationInstance.cs b/SnapIt.Common/Applications/AppInstance.cs
similarity index 91%
rename from SnapIt.Common/Applications/ApplicationInstance.cs
rename to SnapIt.Common/Applications/AppInstance.cs
index 687dbf8..0e60b19 100644
--- a/SnapIt.Common/Applications/ApplicationInstance.cs
+++ b/SnapIt.Common/Applications/AppInstance.cs
@@ -1,6 +1,6 @@
 namespace SnapIt.Common.Applications;
 
-public class ApplicationInstance
+public class AppInstance
 {
     private static readonly Mutex mutex = new Mutex(true, "{FF1FFB1E-5D42-4B8F-B42A-52DA1A1964B7}");
 
diff --git a/SnapIt.Common/Applications/AppLauncher.cs b/SnapIt.Common/Applications/AppLauncher.cs
new file mode 100644
index 0000000..163f847
--- /dev/null
+++ b/SnapIt.Common/Applications/AppLauncher.cs
@@ -0,0 +1,41 @@
+namespace SnapIt.Common.Applications;
+
+public class AppLauncher
+{
+    public static void RunAsAdmin()
+    {
+        Run("runas", true);
+    }
+
+    public static void RunBypassSingleInstance()
+    {
+        Run("nosingle");
+    }
+
+    public static bool IsAdmin(string[] startupArgs)
+    {
+        return startupArgs.Any(arg => arg.Contains("runas"));
+    }
+
+    public static bool BypassSingleInstance(string[] startupArgs)
+    {
+        return startupArgs.Any(arg => arg.Contains("nosingle"));
+    }
+
+    private static void Run(string argument = null, bool useShellExecute = false)
+    {
+        var info = new ProcessStartInfo
+        {
+            UseShellExecute = useShellExecute,
+            FileName = Process.GetCurrentProcess().ProcessName // Application.ExecutablePath; // localAppDataPath + @"\microsoft\windowsapps\SnapIt.exe" // path to the appExecutionAlias
+        };
+
+        if (!string.IsNullOrEmpty(argument))
+        {
+            info.Verb = argument;
+            info.Arguments = $"-{argument}";
+        }
+
+        Process.Start(info);
+    }
+}
\ No newline at end of file
diff --git a/SnapIt.Common/Applications/RunAsAdministrator.cs b/SnapIt.Common/Applications/RunAsAdministrator.cs
deleted file mode 100644
index 0fe4965..0000000
--- a/SnapIt.Common/Applications/RunAsAdministrator.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace SnapIt.Common.Applications;
-
-public class RunAsAdministrator
-{
-    public static void Run()
-    {
-        var info = new ProcessStartInfo
-        {
-            Verb = "runas",
-            Arguments = "-runas",
-            UseShellExecute = true,
-            FileName = Environment.ProcessPath // Application.ExecutablePath; // localAppDataPath + @"\microsoft\windowsapps\SnapIt.exe" // path to the appExecutionAlias
-        };
-        Process.Start(info);
-    }
-
-    public static bool IsAdmin(string[] startupArgs)
-    {
-        return startupArgs.Any(arg => arg.Contains("runas"));
-    }
-}
\ No newline at end of file
diff --git a/SnapIt.Common/Dev.cs b/SnapIt.Common/Dev.cs
index cbd6a9b..3585279 100644
--- a/SnapIt.Common/Dev.cs
+++ b/SnapIt.Common/Dev.cs
@@ -18,7 +18,7 @@ public static class Dev
     public const bool SkipLicense = false;
     public const bool TestTrialEnded = false;
     public const bool TestInTrial = false;
-    public const bool SkipRunAsAdmin = true;
+    public const bool SkipRunAsAdmin = false;
 #else
     public const bool IsActive = false;
     public const bool ShowSnapWindowOnStartup = false;
diff --git a/SnapIt.Services/KeyboardService.cs b/SnapIt.Services/KeyboardService.cs
index f083c0a..37f4345 100644
--- a/SnapIt.Services/KeyboardService.cs
+++ b/SnapIt.Services/KeyboardService.cs
@@ -84,12 +84,15 @@ public async Task InitializeAsync()
 
     public void SetSnappingStopped()
     {
-        var map = new Dictionary<Combination, Action>
+        if (settingService.Settings != null)
         {
-            { Combination.FromString(settingService.Settings.StartStopShortcut.Replace(" ", string.Empty).Replace("Win", "LWin")), StartStopSnapping }
-        };
+            var map = new Dictionary<Combination, Action>
+            {
+                { Combination.FromString(settingService.Settings.StartStopShortcut.Replace(" ", string.Empty).Replace("Win", "LWin")), StartStopSnapping }
+            };
 
-        globalHook?.OnCombination(map);
+            globalHook?.OnCombination(map);
+        }
     }
 
     public void Dispose()
diff --git a/SnapIt.Test/App.xaml b/SnapIt.Test/App.xaml
index 23894d7..ed86ea2 100644
--- a/SnapIt.Test/App.xaml
+++ b/SnapIt.Test/App.xaml
@@ -1,11 +1,11 @@
 <Application
     x:Class="SnapIt.Test.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converter="clr-namespace:SnapIt.Common.Converters;assembly=SnapIt.Common"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-    StartupUri="Window2.xaml">
+    StartupUri="Window3.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/SnapIt.Test/SnapIt.Test.csproj b/SnapIt.Test/SnapIt.Test.csproj
index e0f8562..37b91a5 100644
--- a/SnapIt.Test/SnapIt.Test.csproj
+++ b/SnapIt.Test/SnapIt.Test.csproj
@@ -31,9 +31,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
-		<PackageReference Include="Prism.DryIoc" Version="8.1.97" />
+		<PackageReference Include="Prism.DryIoc" Version="8.1.97" /> 
 		<PackageReference Include="WPF-UI" Version="3.0.0-preview.13" />
 		<PackageReference Include="WPF-UI.Tray" Version="3.0.0-preview.11" />
+		<PackageReference Include="MouseKeyHook" Version="5.7.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/SnapIt.Test/Window3.xaml b/SnapIt.Test/Window3.xaml
new file mode 100644
index 0000000..04b8c3d
--- /dev/null
+++ b/SnapIt.Test/Window3.xaml
@@ -0,0 +1,16 @@
+<Window
+    x:Class="SnapIt.Test.Window3"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    Title="Window3"
+    Width="400"
+    Height="400"
+    Background="{ui:ThemeResource ApplicationBackgroundBrush}"
+    mc:Ignorable="d">
+    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Button Click="Button_Click" Content="Select Browser" />
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/SnapIt.Test/Window3.xaml.cs b/SnapIt.Test/Window3.xaml.cs
new file mode 100644
index 0000000..75ce855
--- /dev/null
+++ b/SnapIt.Test/Window3.xaml.cs
@@ -0,0 +1,200 @@
+//using System.Windows;
+//using System.Windows.Automation;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Automation;
+using Gma.System.MouseKeyHook;
+using SnapIt.Common;
+using SnapIt.Common.Entities;
+using SnapIt.Services;
+
+namespace SnapIt.Test;
+
+public enum DragElement
+{
+    None,
+    Window,
+    Tab
+}
+
+public partial class Window3 : Window
+{
+    private IKeyboardMouseEvents globalHook;
+    private WinApiService winApiService;
+    private AutomationElementCollection firefoxes;
+    private AutomationElementCollection currentfirefoxes;
+    private ActiveWindow active;
+    private bool isListening = false;
+    private bool isDragging = false;
+    private DragElement element = DragElement.None;
+
+    public Window3()
+    {
+        InitializeComponent();
+
+        globalHook = Hook.GlobalEvents();
+
+        globalHook.MouseMove += GlobalHook_MouseMove;
+        globalHook.MouseDown += GlobalHook_MouseDown;
+        globalHook.MouseUp += GlobalHook_MouseUp;
+
+        globalHook.MouseDragStarted += GlobalHook_MouseDragStarted;
+        globalHook.MouseDragFinished += GlobalHook_MouseDragFinished;
+
+        winApiService = new WinApiService();
+    }
+
+    private void GlobalHook_MouseDragStarted(object? sender, System.Windows.Forms.MouseEventArgs e)
+    {
+        Dev.Log();
+        isDragging = true;
+        element = DragElement.None;
+    }
+
+    private void GlobalHook_MouseMove(object? sender, System.Windows.Forms.MouseEventArgs e)
+    {
+        if (isDragging)
+        {
+            if (element == DragElement.None)
+            {
+                var currentWindow = winApiService.GetActiveWindow();
+
+                if (currentWindow != null)
+                {
+                    if (currentWindow.Boundry.Equals(active.Boundry))
+                    {
+                        element = DragElement.Tab;
+                    }
+                    else
+                    {
+                        element = DragElement.Window;
+                    }
+                }
+            }
+
+            Dev.Log(element);
+        }
+    }
+
+    private void GlobalHook_MouseDragFinished(object? sender, System.Windows.Forms.MouseEventArgs e)
+    {
+        Dev.Log();
+        isDragging = false;
+    }
+
+    private void GlobalHook_MouseDown(object? sender, System.Windows.Forms.MouseEventArgs e)
+    {
+        if (e.Button == System.Windows.Forms.MouseButtons.Left)
+        {
+            active = winApiService.GetActiveWindow();
+            if (active?.Title != null && active.Title.Contains("firefox", System.StringComparison.InvariantCultureIgnoreCase))
+            {
+                //isListening = true;
+                firefoxes = AutomationElement.RootElement.FindAll(TreeScope.Children, new PropertyCondition(AutomationElement.ClassNameProperty, "MozillaWindowClass"));
+
+                foreach (AutomationElement item in firefoxes)
+                {
+                    Dev.Log($"{item.Current.NativeWindowHandle} - {item.Current.Name}");
+                }
+            }
+        }
+    }
+
+    private void GlobalHook_MouseUp(object? sender, System.Windows.Forms.MouseEventArgs e)
+    {
+        if (e.Button == System.Windows.Forms.MouseButtons.Left)
+        {
+            if (firefoxes != null && firefoxes.Count > 0)
+            {
+                Application.Current.Dispatcher.Invoke(async () =>
+                {
+                    await Task.Delay(1000);
+                    currentfirefoxes = AutomationElement.RootElement.FindAll(TreeScope.Children, new PropertyCondition(AutomationElement.ClassNameProperty, "MozillaWindowClass"));
+
+                    AutomationElement found = null;
+
+                    if (firefoxes != null && currentfirefoxes != null && currentfirefoxes.Count > firefoxes.Count)
+                    {
+                        foreach (AutomationElement item in currentfirefoxes)
+                        {
+                            Dev.Log($"{item.Current.NativeWindowHandle} - {item.Current.Name}");
+                        }
+
+                        var dictionary = new Dictionary<int, AutomationElement>();
+                        var currentDictionary = new Dictionary<int, AutomationElement>();
+
+                        foreach (AutomationElement current in currentfirefoxes)
+                        {
+                            currentDictionary.Add(current.Current.NativeWindowHandle, current);
+                        }
+
+                        foreach (AutomationElement item in firefoxes)
+                        {
+                            dictionary.Add(item.Current.NativeWindowHandle, item);
+                        }
+
+                        var dict1 = currentDictionary.Except(dictionary);
+
+                        found = dict1.FirstOrDefault().Value;
+                    }
+
+                    Dev.Log($"FOUND : {found?.Current.Name}, {found?.Current.NativeWindowHandle}"); //name can be null here
+
+                    firefoxes = null;
+                    currentfirefoxes = null;
+                });
+            }
+        }
+    }
+
+    private string GetBrowserURL()
+    {
+        //var list = AutomationElement.RootElement.FindAll(TreeScope.Children,
+        //           new PropertyCondition(AutomationElement.ClassNameProperty, "MozillaWindowClass"));
+
+        //AutomationElement root = AutomationElement.RootElement.FindFirst(TreeScope.Children,
+        //    new PropertyCondition(AutomationElement.ClassNameProperty, "MozillaWindowClass"));
+
+        //Condition toolBar = new AndCondition(
+        //new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.ToolBar),
+        //new PropertyCondition(AutomationElement.NameProperty, "Browser tabs"));
+        //var tool = root.FindFirst(TreeScope.Children, toolBar);
+
+        //var tool2 = TreeWalker.ControlViewWalker.GetNextSibling(tool);
+
+        //var children = tool2.FindAll(TreeScope.Children, Condition.TrueCondition);
+
+        //foreach (AutomationElement item in children)
+        //{
+        //    foreach (AutomationElement i in item.FindAll(TreeScope.Children, Condition.TrueCondition))
+        //    {
+        //        foreach (AutomationElement ii in i.FindAll(TreeScope.Element, Condition.TrueCondition))
+        //        {
+        //            //if (ii.Current.LocalizedControlType == "edit")
+        //            {
+        //                //if (!ii.Current.BoundingRectangle.X.ToString().Contains("empty"))
+        //                {
+        //                    try
+        //                    {
+        //                        ValuePattern activeTab = ii.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+        //                        var activeUrl = activeTab.Current.Value;
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                    }
+        //                }
+        //            }
+        //        }
+        //    }
+        //}
+
+        return string.Empty;
+    }
+
+    private void Button_Click(object sender, RoutedEventArgs e)
+    {
+        GetBrowserURL();
+    }
+}
\ No newline at end of file
diff --git a/SnapIt/App.config b/SnapIt/App.config
new file mode 100644
index 0000000..b6691b2
--- /dev/null
+++ b/SnapIt/App.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="SnapIt.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <SnapIt.Properties.Settings>
+            <setting name="RunAsAdmin" serializeAs="String">
+                <value>True</value>
+            </setting>
+        </SnapIt.Properties.Settings>
+    </userSettings>
+</configuration>
\ No newline at end of file
diff --git a/SnapIt/App.xaml.cs b/SnapIt/App.xaml.cs
index bc90658..305caf4 100644
--- a/SnapIt/App.xaml.cs
+++ b/SnapIt/App.xaml.cs
@@ -77,6 +77,7 @@ private void OnStartup(object sender, StartupEventArgs e)
                    .WriteTo.File(Path.Combine(Constants.RootFolder, "logs", "log.txt"),
                         rollingInterval: RollingInterval.Day)
                    .CreateLogger();
+
         RegisterGlobalExceptionHandling(Log.Logger);
 
         //todo change this
@@ -85,36 +86,38 @@ private void OnStartup(object sender, StartupEventArgs e)
         //    Icon = new System.Drawing.Icon(GetResourceStream(new Uri("pack://application:,,,/Assets/app.ico")).Stream)
         //};
 
-        if (SnapIt.Properties.Settings.Default.RunAsAdmin && !Dev.SkipRunAsAdmin)
+        if (!AppLauncher.BypassSingleInstance(e.Args))
         {
-            if (e.Args.Length > 0 && RunAsAdministrator.IsAdmin(e.Args))
+            if (SnapIt.Properties.Settings.Default.RunAsAdmin && !Dev.SkipRunAsAdmin)
             {
-                if (!ApplicationInstance.RegisterSingleInstance())
+                if (e.Args.Length > 0 && AppLauncher.IsAdmin(e.Args))
                 {
-                    //NotifyIcon.ShowBalloonTip(3000, null, $"Only one instance of {Constants.AppName} can run at the same time.", ToolTipIcon.Warning);
-                    //NotifyIcon.Visible = true;
-
+                    if (!AppInstance.RegisterSingleInstance())
+                    {
+                        //NotifyIcon.ShowBalloonTip(3000, null, $"Only one instance of {Constants.AppName} can run at the same time.", ToolTipIcon.Warning);
+                        //NotifyIcon.Visible = true;
+
+                        Shutdown();
+                        return;
+                    }
+                }
+                else if (!Dev.IsActive)
+                {
+                    AppLauncher.RunAsAdmin();
                     Shutdown();
                     return;
                 }
             }
-            else if (!Dev.IsActive)
-            {
-                RunAsAdministrator.Run();
-                Shutdown();
-                return;
-            }
-        }
-        else
-
-        {
-            if (!ApplicationInstance.RegisterSingleInstance() && !Dev.IsActive)
+            else
             {
-                //NotifyIcon.ShowBalloonTip(3000, null, $"Only one instance of {Constants.AppName} can run at the same time.", ToolTipIcon.Warning);
-                //NotifyIcon.Visible = true;
+                if (!AppInstance.RegisterSingleInstance() && !Dev.IsActive)
+                {
+                    //NotifyIcon.ShowBalloonTip(3000, null, $"Only one instance of {Constants.AppName} can run at the same time.", ToolTipIcon.Warning);
+                    //NotifyIcon.Visible = true;
 
-                Shutdown();
-                return;
+                    Shutdown();
+                    return;
+                }
             }
         }
 
@@ -147,17 +150,23 @@ private void RegisterGlobalExceptionHandling(ILogger log)
 
         Dispatcher.UnhandledException += (sender, args) => DispatcherOnUnhandledException(args, log);
 
-        TaskScheduler.UnobservedTaskException +=
-            (sender, args) => TaskSchedulerOnUnobservedTaskException(args, log);
+        TaskScheduler.UnobservedTaskException += (sender, args) => TaskSchedulerOnUnobservedTaskException(args, log);
     }
 
     private static void CurrentDomainOnUnhandledException(UnhandledExceptionEventArgs args, ILogger log)
     {
+        AppLauncher.RunBypassSingleInstance();
+
         var exception = args.ExceptionObject as Exception;
         var terminatingMessage = args.IsTerminating ? " The application is terminating." : string.Empty;
         var exceptionMessage = exception?.Message ?? "An unmanaged exception occured.";
         var message = string.Concat(exceptionMessage, terminatingMessage, exception?.StackTrace, exception?.InnerException);
         log.Error(exception, message);
+
+        if (exception?.InnerException != null)
+        {
+            log.Error(exception?.InnerException, message);
+        }
     }
 
     private static void CurrentOnDispatcherUnhandledException(DispatcherUnhandledExceptionEventArgs args, ILogger log)
diff --git a/SnapIt/Properties/Settings.Designer.cs b/SnapIt/Properties/Settings.Designer.cs
index 7ab4849..af8b193 100644
--- a/SnapIt/Properties/Settings.Designer.cs
+++ b/SnapIt/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace SnapIt.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/SnapIt/SnapIt.csproj b/SnapIt/SnapIt.csproj
index 315bdc4..c41ba3b 100644
--- a/SnapIt/SnapIt.csproj
+++ b/SnapIt/SnapIt.csproj
@@ -7,7 +7,7 @@
     <ApplicationIcon>Assets\app.ico</ApplicationIcon>
     <Product>SnapIt</Product>
     <Description>SnapIt is a window manager for Windows. Organizes your windows to improve your productivity when working with wide and multiple screens.</Description>
-    <Version>5.0.1.0</Version>
+    <Version>5.0.2.0</Version>
     <Copyright>Copyright ©  2019</Copyright>
     <Company>Engin KIRMACI</Company>
     <FileVersion>
diff --git a/SnapIt/ViewModels/Pages/MouseSettingsPageViewModel.cs b/SnapIt/ViewModels/Pages/MouseSettingsPageViewModel.cs
index c9babf6..eae8949 100644
--- a/SnapIt/ViewModels/Pages/MouseSettingsPageViewModel.cs
+++ b/SnapIt/ViewModels/Pages/MouseSettingsPageViewModel.cs
@@ -76,8 +76,8 @@ public MouseSettingsPageViewModel(
 
         HoldKeyBehaviours =
         [
-            new Resource<HoldKeyBehaviour>(SnapIt.Common.Entities.HoldKeyBehaviour.HoldToEnable, "Hold key to enable snapping"),
-            new Resource<HoldKeyBehaviour>(SnapIt.Common.Entities.HoldKeyBehaviour.HoldToDisable, "Hold key to disable snapping")
+            new Resource<HoldKeyBehaviour>(Common.Entities.HoldKeyBehaviour.HoldToEnable, "Hold key to enable snapping"),
+            new Resource<HoldKeyBehaviour>(Common.Entities.HoldKeyBehaviour.HoldToDisable, "Hold key to disable snapping")
         ];
     }