diff --git a/NearDrop.xcodeproj/project.pbxproj b/NearDrop.xcodeproj/project.pbxproj
index 66d67a0..fca9ae2 100644
--- a/NearDrop.xcodeproj/project.pbxproj
+++ b/NearDrop.xcodeproj/project.pbxproj
@@ -419,7 +419,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1430;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1620;
 				TargetAttributes = {
 					699DEBA02AB0573200115D22 = {
 						CreatedOnToolsVersion = 14.3.1;
@@ -686,6 +686,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 9;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 92SDAWLN76;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -697,7 +698,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -714,6 +715,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 9;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 92SDAWLN76;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -725,7 +727,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -739,6 +741,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -769,9 +772,11 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -800,6 +805,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -830,9 +836,11 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -853,7 +861,6 @@
 		69DA9A1C29E0BF5200A442DA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
@@ -861,6 +868,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 9;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 92SDAWLN76;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -875,7 +883,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -889,7 +897,6 @@
 		69DA9A1D29E0BF5200A442DA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
@@ -897,6 +904,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 9;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 92SDAWLN76;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -911,7 +919,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -925,12 +933,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks";
 				EXECUTABLE_PREFIX = lib;
 				LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
@@ -941,12 +950,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks";
 				EXECUTABLE_PREFIX = lib;
 				LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
diff --git a/NearDrop.xcodeproj/xcshareddata/xcschemes/NearDrop.xcscheme b/NearDrop.xcodeproj/xcshareddata/xcschemes/NearDrop.xcscheme
index 3a735a3..ab39b02 100644
--- a/NearDrop.xcodeproj/xcshareddata/xcschemes/NearDrop.xcscheme
+++ b/NearDrop.xcodeproj/xcshareddata/xcschemes/NearDrop.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/NearDrop.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme b/NearDrop.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme
index 45a3810..c1be9a4 100644
--- a/NearDrop.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme
+++ b/NearDrop.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1620"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/NearDrop/AppDelegate.swift b/NearDrop/AppDelegate.swift
index 44650df..cd4a1e2 100644
--- a/NearDrop/AppDelegate.swift
+++ b/NearDrop/AppDelegate.swift
@@ -62,7 +62,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
         NearbyConnectionManager.shared.mainAppDelegate=self
         NearbyConnectionManager.shared.becomeVisible()
         
-        openWelcomeScreen()
+        if !UserDefaults.standard.bool(forKey: "ShowedWelcomeScreen"){
+            openWelcomeScreen()
+            UserDefaults.standard.set(true, forKey: "ShowedWelcomeScreen")
+        }
     }
     
     
@@ -81,6 +84,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
         window?.isReleasedWhenClosed = false
         window?.setFrameAutosaveName("WelcomeScreen")
         window?.contentView = NSHostingView(rootView: welcomeView)
+        
+        // Ensure the window is always on top
+        window?.level = .floating
+        
         window?.makeKeyAndOrderFront(nil)
     }
     
diff --git a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/Contents.json b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/Contents.json
index 436623c..5d0b42b 100644
--- a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/Contents.json
+++ b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/Contents.json
@@ -1,13 +1,13 @@
 {
   "images" : [
     {
+      "filename" : "menubar1x.png",
       "idiom" : "universal",
-      "filename" : "NearbyShare.png",
       "scale" : "1x"
     },
     {
+      "filename" : "menubar2x.png",
       "idiom" : "universal",
-      "filename" : "NearbyShare@2x.png",
       "scale" : "2x"
     },
     {
@@ -16,10 +16,10 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
\ No newline at end of file
+}
diff --git a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/NearbyShare.png b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/NearbyShare.png
deleted file mode 100644
index fbac020..0000000
Binary files a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/NearbyShare.png and /dev/null differ
diff --git a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/NearbyShare@2x.png b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/NearbyShare@2x.png
deleted file mode 100644
index f7b74f7..0000000
Binary files a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/NearbyShare@2x.png and /dev/null differ
diff --git a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar1x.png b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar1x.png
new file mode 100644
index 0000000..b46b27e
Binary files /dev/null and b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar1x.png differ
diff --git a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar2x.png b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar2x.png
new file mode 100644
index 0000000..9874c2d
Binary files /dev/null and b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar2x.png differ