diff --git a/guest_server/scripts/apps.ps1 b/guest_server/scripts/apps.ps1
index 94dc73a0..e24ab1da 100644
--- a/guest_server/scripts/apps.ps1
+++ b/guest_server/scripts/apps.ps1
@@ -131,41 +131,27 @@ function Get-ApplicationName {
     return $appName
 }
 
-function Get-PrettifyName {
-    param (
-        [string]$Name
-    )
-
-    if ($Name -match '\.([^\.]+)$') {
-        $ProductName = $Matches[1]
-    } else {
-        # If no period is found, use the whole name.
-        $ProductName = $Name
-    }
-    
-    $PrettyName = ($ProductName -creplace  '([A-Z\W_]|\d+)(?<![a-z])',' $&').trim()
-
-    return $PrettyName
-}
-
 # Gets the display name for a UWP app.
 function Get-UWPApplicationName {
     param (
+        [string]$exePath, # The resolved executable path
         $app # The AppxPackage object
     )
+
     # UWP properties are usually the best source
-    if ($app.DisplayName) { 
-        return $app.DisplayName.Trim()
-        #Write-Host($app)
+    if ($app.DisplayName) { return $app.DisplayName.Trim() }
+    if ($app.Name) { return $app.Name.Trim() } # Often the package name, less ideal but a fallback
+
+    # If UWP properties fail, try standard name extraction on the EXE
+    if (Test-Path $exePath -PathType Leaf) {
+        return Get-ApplicationName -targetPath $exePath
     }
-    if ($app.Name) { 
-        return Get-PrettifyName -Name $app.Name
-    } # Often the package name, less ideal but a fallback
 
     return $null # Failed to get a name
 }
 
-function Get-ParseUWP {
+# Parses the AppxManifest.xml to find the primary executable path for a UWP app.
+function Get-UWPExecutablePath {
     param ([string]$instLoc) # InstallLocation from Get-AppxPackage
 
     $manifestPath = Join-Path -Path $instLoc -ChildPath "AppxManifest.xml"
@@ -173,70 +159,55 @@ function Get-ParseUWP {
         return $null # Manifest doesn't exist or isn't a file
     }
 
-    $xmlContent = Get-Content $manifestPath -Raw -Encoding Default -ErrorAction Stop
-    
-    $appId = "App" # Default, as it works for most packages.
-    if ($xmlContent -match '<Application[^>]*Id\s*=\s*"([^"]+)"') {
-        $appId = $Matches[1]
-    }
-
-    $logoMatch = [regex]::Match($xmlContent, '<Properties.*?>.*?<Logo>(.*?)</Logo>.*?</Properties>', [System.Text.RegularExpressions.RegexOptions]::Singleline)
-    if ($logoMatch.Success) {
-        $logo = $logoMatch.Groups[1].Value
-    }
+    try {
+        # Read manifest content, default encoding often works
+        $xmlContent = Get-Content $manifestPath -Raw -Encoding Default -ErrorAction Stop
+
+        # Remove known namespace prefixes and xmlns attributes to simplify XML parsing
+        $prefixesToRemove = 'uap10', 'uap', 'desktop', 'rescap', 'com' # Common prefixes
+        $cleanedXml = $xmlContent
+        foreach ($prefix in $prefixesToRemove) {
+            # Regex to remove 'prefix:' from start/end tags and self-closing tags
+            $cleanedXml = $cleanedXml -replace "(</?)$prefix`:", '$1' `
+                                     -replace "<$prefix`:([^>\s]+?)\s*/>", "<$1 />"
+        }
+        # Remove the xmlns declarations themselves
+        $cleanedXml = $cleanedXml -replace 'xmlns(:\w+)?="[^"]+"', ''
 
-    return $logo, $appId
-}
+        # Attempt to parse the cleaned XML
+        [xml]$manifest = $cleanedXml
 
-function Get-UWPBase64Logo {
-    param([string]$logo, [string]$instLoc)
+        # Find the first <Application> node
+        $appNode = $manifest.Package.Applications.Application | Select-Object -First 1
+        if (-not $appNode) { return $null } # No application defined
 
-    $logoPath = Join-Path -Path $instLoc -ChildPath $logo
+        # Get the 'Executable' attribute value
+        $exeRelPath = $appNode.Executable
+        if (-not $exeRelPath) { return $null } # No executable attribute
 
-    if (-not (Test-Path $logoPath)) {
-        # if base file not exist, attempt to find scaled version.
-        $scaledVersions = @("scale-100", "scale-200", "scale-400")
-        foreach ($scale in $scaledVersions) {
-            $scaledLogoPath = $logoPath -replace '\.png$', ".$scale.png"
-            if (Test-Path $scaledLogoPath) {
-                $logoPath = $scaledLogoPath
-                break
+        # Handle special $targetnametoken$.exe case by finding the first EXE in the root
+        if ($exeRelPath -like '*$targetnametoken$.exe*') {
+            $candidateExe = Get-ChildItem -Path $instLoc -Filter *.exe -File -ErrorAction SilentlyContinue | Select-Object -First 1
+            if ($candidateExe -and (Test-Path $candidateExe.FullName -PathType Leaf)) {
+                return $candidateExe.FullName
+            }
+        } else {
+            # Handle regular relative path
+            $fullPath = Join-Path -Path $instLoc -ChildPath $exeRelPath
+            if (Test-Path $fullPath -PathType Leaf) {
+                return $fullPath
             }
         }
-
-        # null if no valid file found.
-        if (-not (Test-Path $logoPath)) {
-            return $null
-        }
-    }
-
-    try {
-        $image = [System.Drawing.Image]::FromFile($logoPath)
-
-        # resize to 32x32
-        $resizedBmp = New-Object System.Drawing.Bitmap(32, 32)
-        $graphics = [System.Drawing.Graphics]::FromImage($resizedBmp)
-        $graphics.InterpolationMode = [System.Drawing.Drawing2D.InterpolationMode]::HighQualityBicubic
-        $graphics.DrawImage($image, 0, 0, 32, 32)
-
-        # Save as PNG to memory stream
-        $stream = New-Object System.IO.MemoryStream
-        $resizedBmp.Save($stream, [System.Drawing.Imaging.ImageFormat]::Png)
-
-        $base64 = [Convert]::ToBase64String($stream.ToArray())
-
-        # Clean up
-        $stream.Dispose()
-        $graphics.Dispose()
-        $resizedBmp.Dispose()
-        $image.Dispose()
-
-        return $base64
     } catch {
+        # Ignore any parsing errors and return null
         return $null
     }
+
+    # Default return if no valid path found
+    return $null
 }
 
+
 # --- Main Application Logic ---
 
 # Use efficient List and HashSet for collection and deduplication
@@ -249,45 +220,14 @@ function Add-AppToListIfValid {
     param(
         [string]$Name,
         [string]$InputPath, # The path discovered (can be relative or contain variables)
-        [string]$Source,     # Source type (e.g., 'system', 'winreg', 'startmenu')
-
-        [string]$logoBase64,  # Optional base64 logo, mainly for UWP logo discover system
-        [string]$launchArg # optional arg
+        [string]$Source     # Source type (e.g., 'system', 'winreg', 'startmenu')
     )
 
     $resolved = $null
     $fullPath = $null
     $normalizedPathKey = $null
 
-    # Step 1, handle UWP app.
-    if ($Source -eq "uwp") {
-        if (-not $launchArg) {
-            return # launching UWP app requires Arg
-        }
-        
-        $normalizedPathKey = $InputPath.ToLowerInvariant() + $launchArg.ToLowerInvariant()
-        if ($addedPaths.Contains($normalizedPathKey)) {
-            return # Already added this app
-        }
-
-        $icon = $null
-        if ($logoBase64) {
-            $icon = $logoBase64
-        }
-
-        # UWP object
-        $apps.Add([PSCustomObject]@{
-            Name   = $Name
-            Path   = $InputPath
-            Args   = $launchArg
-            Icon   = $icon
-            Source = 'uwp'
-        })
-        $addedPaths.Add($normalizedPathKey) | Out-Null
-        return
-    }
-
-    # 2. Resolve and Validate Path Other
+    # 1. Resolve and Validate Path
     try {
         $resolved = Resolve-Path -Path $InputPath -ErrorAction SilentlyContinue
     } catch { return } # Ignore if path resolution throws error
@@ -301,29 +241,28 @@ function Add-AppToListIfValid {
         return # Skip if path doesn't resolve to a valid file
     }
 
-    # 3. Validate Name (Basic Check)
+    # 2. Validate Name (Basic Check)
     if (-not $Name -or $Name.Trim().Length -eq 0 -or $Name -like 'Microsoft? Windows? Operating System*') {
         return # Skip if name is empty, invalid, or generic OS name
     }
 
-    # 4. Check for Duplicates using normalized path
+    # 3. Check for Duplicates using normalized path
     if ($addedPaths.Contains($normalizedPathKey)) {
         return # Skip if this exact executable path has already been added
     }
 
-    # 5. Get Icon
+    # 4. Get Icon
     $icon = Get-ApplicationIcon -targetPath $fullPath
 
-    # 6. Add the Application Object (matching WinApp type)
+    # 5. Add the Application Object (matching WinApp type)
     $apps.Add([PSCustomObject]@{
         Name   = $Name
         Path   = $fullPath # Use the resolved, non-normalized path for output
-        Args    = ""
         Icon   = $icon
         Source = $Source
     })
 
-    # 7. Mark Path as Added
+    # 6. Mark Path as Added
     $addedPaths.Add($normalizedPathKey) | Out-Null
 }
 
@@ -513,9 +452,9 @@ if ($lnkFiles) {
 
 
 # 4. UWP Apps
-if (Get-Command Get-AppxPackage -AllUsers -ErrorAction SilentlyContinue) {
+if (Get-Command Get-AppxPackage -ErrorAction SilentlyContinue) {
     try {
-        Get-AppxPackage -AllUsers -ErrorAction SilentlyContinue |
+        Get-AppxPackage -ErrorAction SilentlyContinue |
             Where-Object {
                 $_.IsFramework -eq $false -and
                 $_.IsResourcePackage -eq $false -and
@@ -524,18 +463,14 @@ if (Get-Command Get-AppxPackage -AllUsers -ErrorAction SilentlyContinue) {
             } |
             ForEach-Object {
                 $app = $_
-                $pathValue = "explorer.exe"
-
-                # Attempt to find logo and executable using Appxmanifest.xml
-                $logo, $appId = Get-ParseUWP -instLoc $app.InstallLocation
-                $launchArgs = "shell:AppsFolder\" + $app.PackageFamilyName + '!' + $appId
+                # Attempt to find the executable path using the manifest
+                $exePath = Get-UWPExecutablePath -instLoc $app.InstallLocation
 
-                if ($appId) { # check if we have appId
+                if ($exePath) { # Function already validates path is a file
                     # Get the best display name (UWP properties preferred)
                     $name = Get-UWPApplicationName -exePath $exePath -app $app
                     if ($name) {
-                        $base64 = Get-UWPBase64Logo -logo $logo -instLoc $app.InstallLocation
-                        Add-AppToListIfValid -Name $name -InputPath $pathValue -Source "uwp" -logoBase64 $base64 -launchArg $launchArgs
+                        Add-AppToListIfValid -Name $name -InputPath $exePath -Source "uwp"
                     }
                 }
             }
@@ -632,7 +567,4 @@ if ($scoopDir) {
 
 # Convert the final list of application objects to a compressed JSON string.
 # This is the only output sent to the standard output stream.
-
-$apps | ConvertTo-Json -Depth 5 -Compress
-
-
+$apps | ConvertTo-Json -Depth 5 -Compress
\ No newline at end of file
diff --git a/src/renderer/components/WBContextMenu.vue b/src/renderer/components/WBContextMenu.vue
index 4503b10c..a772fe3b 100644
--- a/src/renderer/components/WBContextMenu.vue
+++ b/src/renderer/components/WBContextMenu.vue
@@ -5,7 +5,7 @@
 -->
 <template>
     <!-- Invisible trigger area that covers the parent element -->
-    <!-- div v-if="hasTrigger" ref="triggerRef" class="wb-contextmenu-trigger" @contextmenu.prevent="showMenu"></div> -->
+    <div v-if="hasTrigger" ref="triggerRef" class="wb-contextmenu-trigger" @contextmenu.prevent="showMenu"></div>
 
     <!-- Context menu popup -->
     <teleport to="body">
@@ -65,15 +65,13 @@ const showMenu = (event: MouseEvent) => {
     emit("show");
 
     // Close on next tick to allow menu to render
-    adjustPosition();
-    document.addEventListener("click", hideMenu);
-    document.addEventListener("contextmenu", hideMenu);
-    window.addEventListener("scroll", hideMenu);
-    window.addEventListener("resize", hideMenu);
-    
     nextTick(() => {
         adjustPosition();
-    })
+        document.addEventListener("click", hideMenu);
+        document.addEventListener("contextmenu", hideMenu);
+        window.addEventListener("scroll", hideMenu);
+        window.addEventListener("resize", hideMenu);
+    });
 };
 
 const handleMenuClick = (event: MouseEvent) => {
diff --git a/src/renderer/lib/winboat.ts b/src/renderer/lib/winboat.ts
index 363279cd..93758fe0 100644
--- a/src/renderer/lib/winboat.ts
+++ b/src/renderer/lib/winboat.ts
@@ -44,7 +44,6 @@ const presetApps: WinApp[] = [
         Icon: AppIcons[InternalApps.WINDOWS_DESKTOP],
         Source: "internal",
         Path: InternalApps.WINDOWS_DESKTOP,
-        Args: "",
         Usage: 0,
     },
     {
@@ -52,7 +51,6 @@ const presetApps: WinApp[] = [
         Icon: AppIcons[InternalApps.WINDOWS_EXPLORER],
         Source: "internal",
         Path: "%windir%\\explorer.exe",
-        Args: "",
         Usage: 0,
     },
     {
@@ -60,7 +58,6 @@ const presetApps: WinApp[] = [
         Icon: AppIcons[InternalApps.NOVNC_BROWSER],
         Source: "internal",
         Path: CustomAppCommands.NOVNC_COMMAND,
-        Args: "",
         Usage: 0,
     },
 ];
@@ -181,14 +178,12 @@ class AppManager {
      * Adds a custom app to WinBoat's application list
      * @param name Name of the app
      * @param path Path of the app
-     * @param args Args of the app
      * @param icon Icon of the app
      */
-    async addCustomApp(name: string, path: string, args: string, icon: string) {
+    async addCustomApp(name: string, path: string, icon: string) {
         const customWinApp: WinApp = {
             Name: name,
             Path: path,
-            Args: args,
             Icon: icon,
             Source: "custom",
             Usage: 0,
@@ -198,28 +193,6 @@ class AppManager {
         await this.writeToDisk();
         this.#wbConfig!.config.customApps = this.#wbConfig!.config.customApps.concat(customWinApp);
     }
-    
-    async updateCustomApp(
-    	oldName: string,
-    	updatedApp: {name: string, path: string, args: string, icon: string, Source: "custom", Usage: 0}) {
-    	
-    	this.appCache = this.appCache.map(app =>
-    	    app.Name === oldName ? { ...app, ...updatedApp } : app
-    	);
-        
-        // update appUsage if name changed
-        if (oldName !== updatedApp.Name) {
-            this.appUsageCache[updatedApp.Name] = this.appUsageCache[oldName] ?? 0;
-            delete this.appUsageCache[oldName];
-        }
-        
-        // update persisted app config
-        this.#wbConfig!.config.customApps = this.#wbConfig!.config.customApps.map(app => 
-            app.Name == oldName ? { ...app, ...updatedApp } : app
-        );
-        
-        await this.writeToDisk();
-    }
 
     /**
      * Removes a custom app from WinBoat's application list
@@ -707,9 +680,13 @@ export class Winboat {
         // Additional (new) arguments added by user
         const newArgs = this.#wbConfig?.config.rdpArgs.filter(a => !a.isReplacement).map(v => v.newArg) ?? [];
         // The stock arguments after any replacements have been made and new arguments have been added
-        const combinedArgs = stockArgs.map(argStr => useOriginalIfUndefinedOrNull(replacementArgs?.find(r => argStr === r.original?.trim())?.newArg, argStr))
-            .concat(newArgs).join(" ");
-	
+        const combinedArgs = stockArgs
+            .map(argStr =>
+                useOriginalIfUndefinedOrNull(replacementArgs?.find(r => argStr === r.original?.trim())?.newArg, argStr),
+            )
+            .concat(newArgs)
+            .join(" ");
+
         let cmd = `${freeRDPBin} /u:"${username}"\
         /p:"${password}"\
         /v:127.0.0.1\
@@ -721,7 +698,7 @@ export class Winboat {
         /scale-desktop:${this.#wbConfig?.config.scaleDesktop ?? 100}\
         ${combinedArgs}\
         /wm-class:"winboat-${cleanAppName}"\
-        /app:program:"${app.Path}",name:"${cleanAppName}",cmd:"${app.Args}" &`;
+        /app:program:"${app.Path}",name:"${cleanAppName}" &`;
 
         if (app.Path == InternalApps.WINDOWS_DESKTOP) {
             cmd = `${freeRDPBin} /u:"${username}"\
diff --git a/src/renderer/views/Apps.vue b/src/renderer/views/Apps.vue
index 4f778802..029e5ee9 100644
--- a/src/renderer/views/Apps.vue
+++ b/src/renderer/views/Apps.vue
@@ -1,13 +1,13 @@
 <template>
     <div>
         <dialog ref="addCustomAppDialog">
-            <h3 class="mb-2">{{ currentAppForm.Source === "custom" ? "Edit App" : "Add App" }}</h3>
-            <!-- <p>Add a custom app to your apps list.</p> -->
+            <h3 class="mb-2">Add Custom App</h3>
+            <p>Add a custom app to your apps list.</p>
 
             <div class="flex flex-row gap-5 mt-4 w-[35vw]">
                 <div class="flex flex-col flex-none gap-2 justify-center items-center">
                     <div class="relative">
-                        <img v-if="currentAppForm.Icon" :src="currentAppForm.Icon" class="size-24" />
+                        <img v-if="customAppIcon" :src="customAppIcon" class="size-24" />
                         <Icon v-else class="size-24 text-neutral-400" icon="mdi:image"></Icon>
                         <button
                             @click="pickCustomAppIcon"
@@ -20,19 +20,13 @@
                 </div>
                 <div class="flex flex-col gap-0.5 justify-center w-full">
                     <x-label>Name</x-label>
-                    <x-input v-model="currentAppForm.Name" class="!max-w-full" @input="(e: any) => (customAppName = e.target.value)" type="text" />
-                    <!-- <x-input type="text" class="!max-w-full" @input="(e: any) => (customAppName = e.target.value)">
+                    <x-input type="text" class="!max-w-full" @input="(e: any) => (customAppName = e.target.value)">
                         <x-label>My Awesome App</x-label>
-                    </x-input> -->
+                    </x-input>
                     <x-label class="mt-4">Path</x-label>
-                    <x-input v-model="currentAppForm.Path" type="text" class="!max-w-full" @input="(e: any) => (customAppPath = e.target.value)" />
-
-                    <!-- <x-input type="text" class="!max-w-full" @input="(e: any) => (customAppPath = e.target.value)">
+                    <x-input type="text" class="!max-w-full" @input="(e: any) => (customAppPath = e.target.value)">
                         <x-label>C:\Program Files\MyAwesomeApp\myapp.exe</x-label>
-                    </x-input> -->
-
-                    <x-label class="mt-2">Arguments</x-label>
-                    <x-input v-model="currentAppForm.Args" type="text" class="!max-w-full" placeholder="Optional" />
+                    </x-input>
                 </div>
             </div>
 
@@ -60,43 +54,12 @@
                 </div>
             </div>
 
-            <template>
-                <div class="apps-grid">
-                    <div
-                    v-for="app in apps"
-                    :key="app.id"
-                    class="app-tile"
-                    @contextmenu.prevent="openContextMenu($event, app)"
-                    >
-                    {{ app.name }}
-                    </div>
-                </div>
-            </template>
-            
-            <WBContextMenu ref="contextMenuRef" @hide="onContextMenuHide">
-                <WBMenuItem @click="launchApp">
-                    <Icon class="size-4" icon="mdi:play-circle-outline"></Icon>
-                    <x-label>Launch</x-label>
-                </WBMenuItem>
-
-                <WBMenuItem @click="openEditAppDialog(contextMenuTarget)">
-                    <Icon class="size-4" icon="mdi:pencil-outline"></Icon>
-                    <x-label>Edit</x-label>
-                </WBMenuItem>
-
-                <WBMenuItem v-if="contextMenuTarget?.Source === 'custom'" @click="removeCustomApp">
-                    <Icon class="size-4" icon="mdi:trash-can-outline"></Icon>
-                    <x-label>Remove</x-label>
-                </WBMenuItem>
-            </WBContextMenu>
-
-
             <footer>
                 <x-button @click="cancelAddCustomApp" id="cancel-button">
                     <x-label>Cancel</x-label>
                 </x-button>
-                <x-button toggled id="add-button" :disabled="customAppAddErrors.length > 0 || (orginalAppForm?.Source === 'custom' && isSame)" @click="saveApp">
-                    <x-label>{{ currentAppForm.Source === "custom" ? "Save" : "Create New" }}</x-label>
+                <x-button toggled id="add-button" :disabled="customAppAddErrors.length > 0" @click="addCustomApp">
+                    <x-label>Add</x-label>
                 </x-button>
             </footer>
         </dialog>
@@ -117,7 +80,7 @@
                 </x-button>
 
                 <!-- Custom App Add Button -->
-                <x-button class="flex flex-row gap-1 items-center" @click="openAddAppDialog()">
+                <x-button class="flex flex-row gap-1 items-center" @click="addCustomAppDialog!.showModal()">
                     <x-icon href="#add" class="qualifier"></x-icon>
                     <x-label class="qualifier">Add Custom</x-label>
                 </x-button>
@@ -152,17 +115,7 @@
                                 All
                             </x-label>
                         </x-menuitem>
-
-                        <x-menuitem
-                            v-for="(label, value) in AllSources"
-                            :value="value"
-                        >
-                            <x-label>
-                                <span class="qualifier"> Filter: </span>
-                                {{ label }}
-                            </x-label>
-                        </x-menuitem>
-                        <!-- <x-menuitem value="custom">
+                        <x-menuitem value="custom">
                             <x-label>
                                 <span class="qualifier"> Filter: </span>
                                 Custom
@@ -173,7 +126,7 @@
                                 <span class="qualifier"> Filter: </span>
                                 Default
                             </x-label>
-                        </x-menuitem> -->
+                        </x-menuitem>
                     </x-menu>
                 </x-select>
 
@@ -201,38 +154,27 @@
             >
                 <x-card
                     v-for="app of computedApps"
-                    :key="app.id"
+                    :key="app.Path"
                     class="flex relative flex-row gap-2 justify-between items-center p-2 my-0 backdrop-blur-xl backdrop-brightness-150 cursor-pointer generic-hover bg-neutral-800/20"
                     :class="{ 'bg-gradient-to-r from-yellow-600/20 bg-neutral-800/20': app.Source === 'custom' }"
                     @click="winboat.launchApp(app)"
-                    @contextmenu="openContextMenu($event, app)"
                 >
                     <div class="flex flex-row items-center gap-2 w-[85%]">
                         <img class="rounded-md size-10" :src="`data:image/png;charset=utf-8;base64,${app.Icon}`" />
                         <x-label class="truncate text-ellipsis">{{ app.Name }}</x-label>
                     </div>
                     <Icon icon="cuida:caret-right-outline"></Icon>
+                    <WBContextMenu v-if="app.Source === 'custom'">
+                        <WBMenuItem @click="removeCustomApp(app)">
+                            <Icon class="size-4" icon="mdi:trash-can"></Icon>
+                            <x-label>Remove Custom App</x-label>
+                        </WBMenuItem>
+                    </WBContextMenu>
                 </x-card>
             </TransitionGroup>
             <div v-else class="flex justify-center items-center mt-40">
                 <x-throbber class="w-16 h-16"></x-throbber>
             </div>
-            <WBContextMenu>
-                <WBMenuItem @click="launchApp">
-                    <Icon class="size-4" icon="mdi:play-circle-outline"></Icon>
-                    <x-label>Launch</x-label>
-                </WBMenuItem>
-
-                <WBMenuItem @click="editApp">
-                    <Icon class="size-4" icon="mdi:pencil-outline"></Icon>
-                    <x-label>Edit</x-label>
-                </WBMenuItem>
-
-                <WBMenuItem @click="removeApp">
-                    <Icon class="size-4" icon="mdi:trash-can-outline"></Icon>
-                    <x-label>Remove</x-label>
-                </WBMenuItem>
-            </WBContextMenu>
         </div>
         <div v-else class="px-2 mt-32">
             <div class="flex flex-col gap-4 justify-center items-center">
@@ -258,7 +200,7 @@
 
 <script setup lang="ts">
 import { Icon } from "@iconify/vue";
-import { computed, onMounted, ref, useTemplateRef, watch, nextTick } from "vue";
+import { computed, onMounted, ref, useTemplateRef, watch } from "vue";
 import { ContainerStatus, Winboat } from "../lib/winboat";
 import { type WinApp } from "../../types";
 import WBContextMenu from "../components/WBContextMenu.vue";
@@ -274,20 +216,11 @@ const winboat = new Winboat();
 const apps = ref<WinApp[]>([]);
 const searchInput = ref("");
 const sortBy = ref("");
-const filterBy = ref("all");
+const filterBy = ref("");
 const addCustomAppDialog = useTemplateRef("addCustomAppDialog");
 const customAppName = ref("");
 const customAppPath = ref("");
 const customAppIcon = ref(`data:image/png;base64,${AppIcons[DEFAULT_ICON]}`);
-const customAppArgs = ref("");
-const orginalAppForm = ref<WinApp | null>(null);
-const currentAppForm = ref<WinApp>({
-    Name: '',
-    Path: '',
-    Args: '',
-    Icon: '',
-    Source: ''
-});
 
 const apiURL = computed(() => {
     const port = winboat.portMgr.value?.getHostPort(GUEST_API_PORT) ?? GUEST_API_PORT;
@@ -295,41 +228,26 @@ const apiURL = computed(() => {
     return `http://127.0.0.1:${port}`;
 });
 
-const AllSources = computed(() => {
-    var sourceList = {};
-    const sourceMap = {
-        "system": "System",
-        "winreg": "Windows Registry",
-        "startmenu": "Start Menu",
-        "uwp": "Microsoft Store",
-        "internal": "Internal"
-    }
-    apps.value.forEach(app => {
-        sourceList[app.Source] = sourceMap[app.Source] || app.Source; 
-    });
-    return sourceList;
-})
-
 const computedApps = computed(() => {
-    var appsCache = [...apps.value]; // make copy 
+    var appsCache = apps.value;
 
-    if (filterBy.value !== "all") {
-        appsCache = appsCache.filter(app => app.Source === filterBy.value);
-    }
-    
-    if (searchInput.value) {
-        appsCache = appsCache.filter(app =>
-            app.Name.toLowerCase().includes(searchInput.value.toLowerCase())
-        );
+    if (filterBy.value == "custom") {
+        appsCache = appsCache.filter(app => app.Source === "custom");
+    } else if (filterBy.value == "default") {
+        appsCache = appsCache.filter(app => app.Source !== "custom");
     }
 
-    if (sortBy.value === "usage") {
-        appsCache.sort((a, b) => (b.Usage ?? 0) - (a.Usage ?? 0));
-    } else {
-        appsCache.sort((a, b) => a.Name.localeCompare(b.Name));
-    }
+    if (!searchInput.value)
+        return appsCache.sort((a, b) => {
+            if (sortBy.value == "usage" && a.Usage !== b.Usage) {
+                return b.Usage! - a.Usage!;
+            }
+            return a.Name.localeCompare(b.Name);
+        });
 
-    return appsCache;
+    return appsCache
+        .filter(app => app.Name.toLowerCase().includes(searchInput.value.toLowerCase()))
+        .sort((a, b) => a.Name.localeCompare(b.Name));
 });
 
 onMounted(async () => {
@@ -346,21 +264,16 @@ onMounted(async () => {
     watch(customAppPath, async (newVal, oldVal) => {
         await debouncedFetchIcon(newVal, oldVal);
     });
-
-    const onScroll = () => contextMenuRef.value?.hide();
-    window.addEventListener("scroll", onScroll, true);
-    window.addEventListener("resize", onScroll);
 });
 
 async function refreshApps() {
     if (winboat.isOnline.value) {
-        const loadedApps = await winboat.appMgr!.getApps(apiURL.value);
-        apps.value = loadedApps.map(app => ({
-            ...app,
-            id: crypto.randomUUID()
-        }));
+        apps.value = await winboat.appMgr!.getApps(apiURL.value);
         // Run in background, won't impact UX
         await winboat.appMgr!.updateAppCache(apiURL.value);
+        if (winboat.appMgr!.appCache.length !== apps.value.length) {
+            apps.value = winboat!.appMgr!.appCache;
+        }
     }
 }
 
@@ -378,17 +291,6 @@ const debouncedFetchIcon = debounce(async (newVal: string, oldVal: string) => {
     }
 }, 500);
 
-const isSame = computed(() => {
-    if(!orginalAppForm.value) return true; // new app
-    const orig = orginalAppForm.value;
-    const curr = currentAppForm.value;
-    return (
-        orig.Name === curr.Name &&
-        orig.Path === curr.Path &&
-        (orig.Args || "") === (curr.Args || "")
-    );
-})
-
 const customAppAddErrors = computed(() => {
     const errors: string[] = [];
 
@@ -397,9 +299,12 @@ const customAppAddErrors = computed(() => {
     }
 
     if (apps.value.find(app => app.Name === customAppName.value)) {
-        if (orginalAppForm.value.Name !== customAppName.value || orginalAppForm.value.Source !== "custom") {
-            errors.push("An app with this name already exists");
-        }
+        errors.push("An app with this name already exists");
+    }
+
+    const appWithConflictingPath = apps.value.find(app => app.Path === customAppPath.value);
+    if (appWithConflictingPath) {
+        errors.push(`An app (${appWithConflictingPath.Name}) with this path already exists`);
     }
 
     if (!customAppPath.value) {
@@ -413,83 +318,6 @@ const customAppAddErrors = computed(() => {
     return errors;
 });
 
-const contextMenuRef = ref();
-const contextMenuTarget = ref(null);
-const dialogMode = ref<"edit" | "add">("add");
-
-async function openContextMenu(event, app) {
-    contextMenuTarget.value = app;
-    await nextTick(); // wait for DOM to update
-    contextMenuRef.value?.show(event); // Let WBContextMenu handle positioning
-}
-
-function openAddAppDialog() {
-    orginalAppForm.value = null;
-    const app = {
-        Name: "",
-        Path: "",
-        Args: "",
-        Icon: customAppIcon.value,
-        Source: ""
-    };
-    currentAppForm.value = app;
-    contextMenuTarget.value = null;
-    addCustomAppDialog.value?.showModal();
-}
-
-function openEditAppDialog(app: WinApp) {
-    orginalAppForm.value = { ...app }; // clone
-    customAppName.value = app.Name;
-    customAppPath.value = app.Path;
-    customAppIcon.value = app.Icon;
-    customAppArgs.value = app.Args;
-    contextMenuTarget.value = app;
-    currentAppForm.value = {
-        Name: app.Name,
-        Path: app.Path,
-        Args: app.Args || "",
-        Icon: `data:image/png;base64,${app.Icon}`,
-        Source: app.Source
-    };
-    addCustomAppDialog.value?.showModal();
-}
-
-async function saveApp() {
-    const iconRaw = currentAppForm.value.Icon.split("data:image/png;base64,")[1];
-
-    if (currentAppForm.value.Source === "custom") {
-        await winboat.appMgr!.updateCustomApp(orginalAppForm.value.Name, {
-            Name: currentAppForm.value.Name,
-            Path: currentAppForm.value.Path,
-            Args: currentAppForm.value.Args,
-            Icon: iconRaw
-        })
-        console.log("Save");
-    } else {
-        await winboat.appMgr!.addCustomApp(
-            currentAppForm.value.Name,
-            currentAppForm.value.Path,
-            currentAppForm.value.Args,
-            iconRaw
-        );
-        console.log("New save");
-    }
-    
-    refreshApps();
-    //apps.value = await winboat.appMgr!.getApps(apiURL.value);
-    cancelAddCustomApp();
-}
-
-function onContextMenuHide() {
-    contextMenuTarget.value = null;
-}
-
-function launchApp() {
-  if (contextMenuTarget.value) {
-    winboat.launchApp(contextMenuTarget.value);
-  }
-}
-
 /**
  * Triggers the file picker for the custom app icon, then processes the image selected
  */
@@ -527,22 +355,34 @@ function cancelAddCustomApp() {
     resetCustomAppForm();
 }
 
+/**
+ * Adds a custom app to WinBoat's application list
+ */
+async function addCustomApp() {
+    const iconRaw = customAppIcon.value.split("data:image/png;base64,")[1];
+    await winboat.appMgr!.addCustomApp(customAppName.value, customAppPath.value, iconRaw);
+    apps.value = await winboat.appMgr!.getApps(apiURL.value);
+    addCustomAppDialog.value!.close();
+    resetCustomAppForm();
+}
+
 /**
  * Removes a custom app from WinBoat's application list
  */
-async function removeCustomApp() {
-    if (!contextMenuTarget.value) return;
-    await winboat.appMgr!.removeCustomApp(contextMenuTarget.value);
-    await refreshApps(); 
+async function removeCustomApp(app: WinApp) {
+    await winboat.appMgr!.removeCustomApp(app);
+    apps.value = await winboat.appMgr!.getApps(apiURL.value);
 }
 
+/**
+ * Resets the custom app form to its default values
+ */
 async function resetCustomAppForm() {
     // So there is no visual flicker while the dialog is closing
     setTimeout(() => {
         customAppName.value = "";
         customAppPath.value = "";
         customAppIcon.value = `data:image/png;base64,${AppIcons[DEFAULT_ICON]}`;
-        customAppArgs.value = "";        
 
         // Because of course Vue reactivity fails here :(
         addCustomAppDialog.value?.querySelectorAll("x-input")?.forEach((input: any) => {
diff --git a/src/types.ts b/src/types.ts
index 9fdb164a..4c7a4086 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -28,7 +28,6 @@ export type InstallConfiguration = {
 export type WinApp = {
     Name: string;
     Path: string;
-    Args: string;
     Icon: string;
     Source: string;
     Usage?: number;