diff --git a/.gitignore b/.gitignore
index 8b9cbb4..10391fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ obj
 .vs
 *.DotSettings*
 *.user
-log*
\ No newline at end of file
+log*.txt
\ No newline at end of file
diff --git a/Azaion.Annotator/Annotator.xaml.cs b/Azaion.Annotator/Annotator.xaml.cs
index e570b93..d5c3507 100644
--- a/Azaion.Annotator/Annotator.xaml.cs
+++ b/Azaion.Annotator/Annotator.xaml.cs
@@ -415,8 +415,6 @@ public partial class Annotator
         _mediaPlayer.Stop();
         _mediaPlayer.Dispose();
         _libVLC.Dispose();
-
-        Application.Current.Shutdown();
     }
 
     private void OpenContainingFolder(object sender, RoutedEventArgs e)
diff --git a/Azaion.Common/DTO/LoginResponse.cs b/Azaion.Common/DTO/LoginResponse.cs
new file mode 100644
index 0000000..b2a027b
--- /dev/null
+++ b/Azaion.Common/DTO/LoginResponse.cs
@@ -0,0 +1,6 @@
+namespace Azaion.Common.DTO;
+
+public class LoginResponse
+{
+    public string Token { get; set; } = null!;
+}
\ No newline at end of file
diff --git a/Azaion.Dataset/DatasetExplorer.xaml.cs b/Azaion.Dataset/DatasetExplorer.xaml.cs
index 56df701..6159ca4 100644
--- a/Azaion.Dataset/DatasetExplorer.xaml.cs
+++ b/Azaion.Dataset/DatasetExplorer.xaml.cs
@@ -89,13 +89,7 @@ public partial class DatasetExplorer
             DataContext = this;
         };
 
-        Closing += (sender, args) =>
-        {
-            args.Cancel = true;
-            Visibility = Visibility.Hidden;
-        };
-
-        ThumbnailsView.KeyDown += async (sender, args) =>
+         ThumbnailsView.KeyDown += async (sender, args) =>
         {
             switch (args.Key)
             {
diff --git a/Azaion.Dataset/DatasetExplorerEventHandler.cs b/Azaion.Dataset/DatasetExplorerEventHandler.cs
index 72eff92..6db0ab0 100644
--- a/Azaion.Dataset/DatasetExplorerEventHandler.cs
+++ b/Azaion.Dataset/DatasetExplorerEventHandler.cs
@@ -22,7 +22,7 @@ public class DatasetExplorerEventHandler(DatasetExplorer datasetExplorer, IGalle
 
     public async Task Handle(KeyEvent keyEvent, CancellationToken cancellationToken)
     {
-        if (keyEvent.WindowEnum != WindowEnum.Annotator)
+        if (keyEvent.WindowEnum != WindowEnum.DatasetExplorer)
             return;
 
         var key = keyEvent.Args.Key;
diff --git a/Azaion.Suite/App.xaml.cs b/Azaion.Suite/App.xaml.cs
index 3265eb1..089c156 100644
--- a/Azaion.Suite/App.xaml.cs
+++ b/Azaion.Suite/App.xaml.cs
@@ -44,6 +44,7 @@ public partial class App
 
     static App()
     {
+        //Load encrypted dlls
         var result = Parser.Default.ParseArguments<SuiteCommandLineOptions>(Environment.GetCommandLineArgs());
         if (result.Errors.Any())
              return;
@@ -158,8 +159,9 @@ public partial class App
 
     protected override async void OnExit(ExitEventArgs e)
     {
+        base.OnExit(e);
+
         await _host.StopAsync();
         _host.Dispose();
-        base.OnExit(e);
     }
 }
\ No newline at end of file
diff --git a/logo.ico b/logo.ico
new file mode 100644
index 0000000..8addc00
Binary files /dev/null and b/logo.ico differ