diff --git a/easyWSL/App.xaml.cs b/easyWSL/App.xaml.cs
index 0a0e63c..dcdff2a 100644
--- a/easyWSL/App.xaml.cs
+++ b/easyWSL/App.xaml.cs
@@ -18,7 +18,16 @@ public App()
 
         protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
         {
-            m_window = new NavigationRoot_Window();
+            var isWSLInstalled = WslSdk.CheckIfWSLInstalled();
+            if (!isWSLInstalled)
+            {
+                m_window = new WelcomeWindow();
+            }
+            else
+            {
+                m_window = new NavigationRoot_Window();
+            }
+
             m_window.Activate();
             m_window.Title = "easyWSL";
             m_windowhandle = User32.GetActiveWindow();
diff --git a/easyWSL/DockerDownloader.cs b/easyWSL/DockerDownloader.cs
index 22d0f42..286d978 100644
--- a/easyWSL/DockerDownloader.cs
+++ b/easyWSL/DockerDownloader.cs
@@ -54,7 +54,7 @@ public async Task DownloadImage(string distroImage, Action<HttpProgress> httpPro
 
             string repository = "";
             string tag = "";
-            string registry = "registry-1.docker.io";
+            string registry = "LLL";
             string authorizationUrl = "https://auth.docker.io/token";
             string registryUrl = "registry.docker.io";
 
diff --git a/easyWSL/ManageDistrosPage.xaml.cs b/easyWSL/ManageDistrosPage.xaml.cs
index 8f8dc6c..d531f9c 100644
--- a/easyWSL/ManageDistrosPage.xaml.cs
+++ b/easyWSL/ManageDistrosPage.xaml.cs
@@ -32,34 +32,12 @@ public ManageDistrosPage()
 
         private async Task RefreshInstalledDistros()
         {
-            await wslSdk.GetInstalledDistributions();
+            await  WslSdk.GetInstalledDistributions();
             distrosListView.ItemsSource = null;
             distrosListView.Items.Clear();
-            distrosListView.ItemsSource = wslSdk.InstalledDistros.Values;
-            if(distrosListView.Items.Count == 0)
-            {
-                WelcomeDialog welcomeDialogContent = new();
-                ContentDialog welcomeDialog = new ContentDialog();
-                welcomeDialog.XamlRoot = distrosListView.XamlRoot;
-                welcomeDialog.Title = $"Welcome to easyWSL";
-                welcomeDialog.Content = welcomeDialogContent;
-                welcomeDialog.DefaultButton = ContentDialogButton.Primary;
-                welcomeDialog.PrimaryButtonText = "Install WSL";
-                welcomeDialog.CloseButtonText = "WSL is already installed";
-
-                var result = await welcomeDialog.ShowAsync();
-                if(result == ContentDialogResult.Primary)
-                {
-                    var webPsi = new ProcessStartInfo
-                    {
-                        FileName = "https://docs.microsoft.com/en-us/windows/wsl/install",
-                        UseShellExecute = true
-                    };
-                    Process.Start(webPsi);
-                }
-            }
-            else
-            {
+            distrosListView.ItemsSource = WslSdk.InstalledDistros.Values;
+            if(distrosListView.Items.Count != 0) 
+            { 
                 distrosListView.SelectedIndex = 0;
             }
             
@@ -91,8 +69,8 @@ private async void removeDistroButton_Click(object sender, RoutedEventArgs e)
         private async void moreInfoButton_Click(object sender, RoutedEventArgs e)
         {
             var name = selectedDistroName;
-            var version = wslSdk.InstalledDistros[name].version;
-            var path = wslSdk.InstalledDistros[name].path;
+            var version = WslSdk.InstalledDistros[name].version;
+            var path = WslSdk.InstalledDistros[name].path;
 
             var dialogContent = new MoreInfoDialog(name, version, path);
 
@@ -126,5 +104,6 @@ private async void stopDistroButton_Click(object sender, RoutedEventArgs e)
         {
             await helpers.ExecuteProcessAsynch("wsl.exe", $"-t {selectedDistroName}");
         }
+
     }
 }
diff --git a/easyWSL/ManageSnapshotsPage.xaml.cs b/easyWSL/ManageSnapshotsPage.xaml.cs
index b1da53e..54b1714 100644
--- a/easyWSL/ManageSnapshotsPage.xaml.cs
+++ b/easyWSL/ManageSnapshotsPage.xaml.cs
@@ -29,8 +29,8 @@ public ManageSnapshotsPage()
 
         public async Task RefreshDistros()
         {
-            await wslSdk.GetInstalledDistributions();
-            var distrosList = wslSdk.InstalledDistros.Values.Select(o => o.name);
+            await WslSdk.GetInstalledDistributions();
+            var distrosList = WslSdk.InstalledDistros.Values.Select(o => o.name);
             distrosComboBox.ItemsSource = distrosList;
 
             FillSnapshotsListView();
@@ -87,8 +87,8 @@ private void removeSnapshotButton_Click(object sender, RoutedEventArgs e)
 
         private async void FillSnapshotsListView()
         {
-            await wslSdk.GetInstalledDistributions();
-            var distrosList = wslSdk.InstalledDistros.Values.Select(o => o.name);
+            await WslSdk.GetInstalledDistributions();
+            var distrosList = WslSdk.InstalledDistros.Values.Select(o => o.name);
 
             var snapshotsStoragePath = Path.Combine(storageDirectory.Path, "snapshots");
             try
@@ -105,6 +105,10 @@ private async void FillSnapshotsListView()
             }
 
             var distro = distrosComboBox.SelectedValue as string;
+            if (distro == null)
+            {
+                return;
+            }
 
             var snapshotsPath = Path.Combine(storageDirectory.Path, "snapshots", distro);
             snapshotsList = Directory.EnumerateFiles(snapshotsPath, "*.tar.gz").ToList();
diff --git a/easyWSL/WelcomeDialog.xaml.cs b/easyWSL/WelcomeDialog.xaml.cs
deleted file mode 100644
index 55e79d1..0000000
--- a/easyWSL/WelcomeDialog.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.UI.Xaml.Controls;
-
-namespace easyWSL
-{
-    public sealed partial class WelcomeDialog : Page
-    {
-        public WelcomeDialog()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/easyWSL/WelcomeDialog.xaml b/easyWSL/WelcomeWindow.xaml
similarity index 53%
rename from easyWSL/WelcomeDialog.xaml
rename to easyWSL/WelcomeWindow.xaml
index 2efb0d3..c7d3cc3 100644
--- a/easyWSL/WelcomeDialog.xaml
+++ b/easyWSL/WelcomeWindow.xaml
@@ -1,5 +1,6 @@
-<Page
-    x:Class="easyWSL.WelcomeDialog"
+<?xml version="1.0" encoding="utf-8"?>
+<Window
+    x:Class="easyWSL.WelcomeWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:easyWSL"
@@ -7,11 +8,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <StackPanel>
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="400">
+        <TextBlock Style="{StaticResource TitleTextBlockStyle}" Margin="0 0 0 20">WSL is not installed on your system</TextBlock>
         <RichTextBlock>
             <Paragraph>This application requires
-                <Hyperlink NavigateUri="https://docs.microsoft.com/en-us/windows/wsl/about">Windows Subsystem For Linux</Hyperlink> enabled on your machine. 
+                <Hyperlink NavigateUri="https://docs.microsoft.com/en-us/windows/wsl/about">Windows Subsystem For Linux</Hyperlink> enabled on your machine. Please install it and relaunch the application.
             </Paragraph>
         </RichTextBlock>
+        <Button Style="{StaticResource AccentButtonStyle}" x:Name="closeButton" Content="Close" Click="closeButton_Click" Margin="0 15"/>
     </StackPanel>
-</Page>
+</Window>
diff --git a/easyWSL/WelcomeWindow.xaml.cs b/easyWSL/WelcomeWindow.xaml.cs
new file mode 100644
index 0000000..76065f3
--- /dev/null
+++ b/easyWSL/WelcomeWindow.xaml.cs
@@ -0,0 +1,35 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.Media.Capture;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace easyWSL
+{
+    public sealed partial class WelcomeWindow : Window
+    {
+        public WelcomeWindow()
+        {
+            this.InitializeComponent();
+        }
+
+        private void closeButton_Click(object sender, RoutedEventArgs e)
+        {
+            var app = Application.Current;
+            app.Exit();
+        }
+    }
+}
diff --git a/easyWSL/WslSdk.cs b/easyWSL/WslSdk.cs
index ba2e2a6..cff98f1 100644
--- a/easyWSL/WslSdk.cs
+++ b/easyWSL/WslSdk.cs
@@ -10,7 +10,7 @@ class WslSdk
     {
         private Helpers helpers = new();
 
-        public Dictionary<string, InstalledDistrosProperties> InstalledDistros = new Dictionary<string, InstalledDistrosProperties> { };
+        public static Dictionary<string, InstalledDistrosProperties> InstalledDistros = new Dictionary<string, InstalledDistrosProperties> { };
         public class InstalledDistrosProperties
         {
             public string name { get; set; }
@@ -21,16 +21,28 @@ public class InstalledDistrosProperties
             public string size { get; set; }
         }
 
+        public static bool CheckIfWSLInstalled()
+        {
+            var currentUserReg = Registry.CurrentUser;
+            var lxssPathReg = currentUserReg.OpenSubKey(Path.Combine("SOFTWARE", "Microsoft", "Windows", "CurrentVersion", "Lxss"), false);
+            if (lxssPathReg == null)
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
 
-        public async Task GetInstalledDistributions()
+        public static async Task GetInstalledDistributions()
         {
             InstalledDistros.Clear();
 
             var currentUserReg = Registry.CurrentUser;
             var lxssPathReg = currentUserReg.OpenSubKey(Path.Combine("SOFTWARE", "Microsoft", "Windows", "CurrentVersion", "Lxss"), false);
+  
             String[] distrosRegkeyNames = lxssPathReg.GetSubKeyNames();
-
-
             foreach (string distroRegkeyName in distrosRegkeyNames)
             {
                 var distroRegkey = lxssPathReg.OpenSubKey(distroRegkeyName, false);
diff --git a/easyWSL/easyWSL.csproj b/easyWSL/easyWSL.csproj
index 13b1966..c7d0a4e 100644
--- a/easyWSL/easyWSL.csproj
+++ b/easyWSL/easyWSL.csproj
@@ -39,6 +39,7 @@
     <None Remove="RegisterNewDistro_Page.xaml" />
     <None Remove="SettingsPage.xaml" />
     <None Remove="WelcomeDialog.xaml" />
+    <None Remove="WelcomeWindow.xaml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -108,6 +109,9 @@
     <None Update="dep\zlib1.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="WelcomeWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="WelcomeDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>