diff --git a/src/components/common/ListExplorer.vue b/src/components/common/ListExplorer.vue
index 6bdb007cdf..0cf554c936 100644
--- a/src/components/common/ListExplorer.vue
+++ b/src/components/common/ListExplorer.vue
@@ -42,7 +42,7 @@
               >
                 <span v-if="index === 0" :class="['mr-2 pi', row.icon]"></span>
                 <span class="whitespace-nowrap overflow-hidden text-ellipsis">
-                  {{ row._display[item.key] }}
+                  {{ (row._display as any)[item.key] }}
                 </span>
               </div>
             </div>
@@ -73,9 +73,7 @@ type Item = {
   size: number
 }
 
-type RecordString<T> = {
-  [key in keyof T]: T[key]
-}
+type RecordString<T> = Record<keyof T, any>
 
 type ResolvedItem<T> = T & {
   icon: string
@@ -137,23 +135,29 @@ const sortField = ref('name')
 
 const iconMapLegacy = (icon: string) => {
   const prefix = 'pi-'
-  const legacy = {
+  const legacy: Record<string, string> = {
     audio: 'headphones'
   }
   return prefix + (legacy[icon] || icon)
 }
 
 const renderedItems = computed(() => {
-  const columnRenderText = columns.value.reduce((acc, column) => {
-    acc[column.key] = column.renderText
-    return acc
-  }, {})
+  const columnRenderText = columns.value.reduce(
+    (acc, column) => {
+      acc[column.key] = column.renderText
+      return acc
+    },
+    {} as Record<string, (val: any, row: Item) => string>
+  )
 
   return props.items.map((item) => {
-    const display = Object.entries(item).reduce((acc, [key, value]) => {
-      acc[key] = columnRenderText[key]?.(value, item) ?? value
-      return acc
-    }, {} as RecordString<Item>)
+    const display = Object.entries(item).reduce(
+      (acc, [key, value]) => {
+        acc[key] = columnRenderText[key]?.(value, item) ?? value
+        return acc
+      },
+      {} as Record<string, any>
+    )
     return { ...item, icon: iconMapLegacy(item.type), _display: display }
   })
 })
@@ -173,8 +177,8 @@ const sortedItems = computed(() => {
   const direction = sortDirection.value === 'asc' ? 1 : -1
 
   const sorting = (a: ResolvedItem<Item>, b: ResolvedItem<Item>) => {
-    const aValue = a[sortField.value]
-    const bValue = b[sortField.value]
+    const aValue = (a as any)[sortField.value]
+    const bValue = (b as any)[sortField.value]
 
     const result =
       typeof aValue === 'string'
diff --git a/src/components/common/VirtualScroll.vue b/src/components/common/VirtualScroll.vue
index 358058d60f..2cb566ff07 100644
--- a/src/components/common/VirtualScroll.vue
+++ b/src/components/common/VirtualScroll.vue
@@ -19,7 +19,7 @@
 
 <script setup lang="ts" generic="T">
 import { useElementSize, useScroll } from '@vueuse/core'
-import { clamp } from 'lodash'
+import { clamp } from 'es-toolkit'
 import { type CSSProperties, computed, ref } from 'vue'
 
 type Item = T & { key: string }
diff --git a/src/components/sidebar/tabs/OutputExplorerSidebarTab.vue b/src/components/sidebar/tabs/OutputExplorerSidebarTab.vue
index 1252f33e69..29b20781e9 100644
--- a/src/components/sidebar/tabs/OutputExplorerSidebarTab.vue
+++ b/src/components/sidebar/tabs/OutputExplorerSidebarTab.vue
@@ -2,25 +2,25 @@
   <SidebarTabTemplate :title="$t('sideToolbar.outputExplorer')">
     <template #tool-buttons>
       <Button
+        v-tooltip.bottom="$t('g.back')"
         icon="pi pi-arrow-up"
-        @click="handleBackParentFolder"
         severity="secondary"
         text
-        v-tooltip.bottom="$t('g.back')"
         :disabled="!currentFolder"
+        @click="handleBackParentFolder"
       />
       <Button
+        v-tooltip.bottom="$t('g.refresh')"
         icon="pi pi-refresh"
-        @click="loadFolderItems"
         severity="secondary"
         text
-        v-tooltip.bottom="$t('g.refresh')"
+        @click="loadFolderItems"
       />
     </template>
     <template #header>
       <SearchBox
-        class="model-lib-search-box p-2 2xl:p-4"
         v-model:modelValue="searchQuery"
+        class="model-lib-search-box p-2 2xl:p-4"
         :placeholder="$t('g.searchIn', ['output'])"
         @search="handleSearch"
       />
@@ -141,14 +141,22 @@ const itemsCount = computed(() => {
 
 const renderedItems = computed(() => {
   const query = filterContent.value
+  let items = currentFolderItems.value
 
-  if (!query) {
-    return currentFolderItems.value
+  if (query) {
+    items = items.filter((item) => {
+      return item.name.toLowerCase().includes(query.toLowerCase())
+    })
   }
 
-  return currentFolderItems.value.filter((item) => {
-    return item.name.toLowerCase().includes(query.toLowerCase())
-  })
+  // Convert OutputItem to Item format expected by ListExplorer
+  return items.map((item) => ({
+    key: item.key,
+    name: item.name,
+    type: item.type,
+    size: item.size,
+    modifyTime: item.modifyTime
+  }))
 })
 
 const handleSearch = async (query: string) => {
@@ -214,11 +222,17 @@ const handleBackParentFolder = async () => {
   await loadFolderItems()
 }
 
-const handleDbClickItem = (item: OutputItem, event: MouseEvent) => {
-  if (item.type === 'folder') {
-    openFolder(item, folderPaths.value.length)
+const handleDbClickItem = (item: any, _event: MouseEvent) => {
+  // Find the original OutputItem from currentFolderItems
+  const originalItem = currentFolderItems.value.find(
+    (outputItem) => outputItem.key === item.key
+  )
+  if (!originalItem) return
+
+  if (originalItem.type === 'folder') {
+    void openFolder(originalItem, folderPaths.value.length)
   } else {
-    openItemPreview(item)
+    openItemPreview(originalItem)
   }
 }
 
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index b20ce38011..7d176c2bfe 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -703,5 +703,79 @@
     "UPSCALE_MODEL": "UPSCALE_MODEL",
     "VAE": "VAE",
     "WEBCAM": "WEBCAM"
+  },
+  "auth": {
+    "apiKey": {
+      "title": "API Key",
+      "label": "API Key",
+      "description": "Use your Comfy API key to enable API Nodes",
+      "placeholder": "Enter your API Key",
+      "error": "Invalid API Key",
+      "storageFailed": "Failed to store API Key",
+      "storageFailedDetail": "Please try again.",
+      "stored": "API Key stored",
+      "storedDetail": "Your API Key has been stored successfully",
+      "cleared": "API Key cleared",
+      "clearedDetail": "Your API Key has been cleared successfully",
+      "invalid": "Invalid API Key",
+      "invalidDetail": "Please enter a valid API Key",
+      "helpText": "Need an API key?",
+      "generateKey": "Get one here",
+      "whitelistInfo": "About non-whitelisted sites"
+    },
+    "login": {
+      "title": "Log in to your account",
+      "useApiKey": "Comfy API Key",
+      "signInOrSignUp": "Sign In / Sign Up",
+      "forgotPasswordError": "Failed to send password reset email",
+      "passwordResetSent": "Password reset email sent",
+      "passwordResetSentDetail": "Please check your email for a link to reset your password.",
+      "newUser": "New here?",
+      "userAvatar": "User Avatar",
+      "signUp": "Sign up",
+      "emailLabel": "Email",
+      "emailPlaceholder": "Enter your email",
+      "passwordLabel": "Password",
+      "passwordPlaceholder": "Enter your password",
+      "confirmPasswordLabel": "Confirm Password",
+      "confirmPasswordPlaceholder": "Enter the same password again",
+      "forgotPassword": "Forgot password?",
+      "loginButton": "Log in",
+      "orContinueWith": "Or continue with",
+      "loginWithGoogle": "Log in with Google",
+      "loginWithGithub": "Log in with Github",
+      "termsText": "By clicking \"Next\" or \"Sign Up\", you agree to our",
+      "termsLink": "Terms of Use",
+      "andText": "and",
+      "privacyLink": "Privacy Policy",
+      "success": "Login successful",
+      "failed": "Login failed",
+      "insecureContextWarning": "This connection is insecure (HTTP) - your credentials may be intercepted by attackers if you proceed to login.",
+      "questionsContactPrefix": "Questions? Contact us at",
+      "noAssociatedUser": "There is no Comfy user associated with the provided API key"
+    },
+    "signup": {
+      "title": "Create an account",
+      "alreadyHaveAccount": "Already have an account?",
+      "emailLabel": "Email",
+      "emailPlaceholder": "Enter your email",
+      "passwordLabel": "Password",
+      "passwordPlaceholder": "Enter new password",
+      "signUpButton": "Sign up",
+      "signIn": "Sign in",
+      "signUpWithGoogle": "Sign up with Google",
+      "signUpWithGithub": "Sign up with Github",
+      "regionRestrictionChina": "In accordance with local regulatory requirements, our services are temporarily unavailable to users located in China.",
+      "personalDataConsentLabel": "I agree to the processing of my personal data."
+    },
+    "signOut": {
+      "signOut": "Log Out",
+      "success": "Signed out successfully",
+      "successDetail": "You have been signed out of your account."
+    },
+    "passwordUpdate": {
+      "success": "Password Updated",
+      "successDetail": "Your password has been updated successfully"
+    }
   }
 }
\ No newline at end of file
diff --git a/src/stores/workspace/sidebarTabStore.ts b/src/stores/workspace/sidebarTabStore.ts
index 47cec336c5..1cd921d9ec 100644
--- a/src/stores/workspace/sidebarTabStore.ts
+++ b/src/stores/workspace/sidebarTabStore.ts
@@ -1,9 +1,9 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
+import { useOutputExplorerSidebarTab } from '@/composables/sidebarTabs/outputExplorerSidebarTab'
 import { useModelLibrarySidebarTab } from '@/composables/sidebarTabs/useModelLibrarySidebarTab'
 import { useNodeLibrarySidebarTab } from '@/composables/sidebarTabs/useNodeLibrarySidebarTab'
-import { useOutputExplorerSidebarTab } from '@/composables/sidebarTabs/outputExplorerSidebarTab'
 import { useQueueSidebarTab } from '@/composables/sidebarTabs/useQueueSidebarTab'
 import { useWorkflowsSidebarTab } from '@/composables/sidebarTabs/useWorkflowsSidebarTab'
 import { t, te } from '@/i18n'
@@ -93,7 +93,7 @@ export const useSidebarTabStore = defineStore('sidebarTab', () => {
     registerSidebarTab(useNodeLibrarySidebarTab())
     registerSidebarTab(useModelLibrarySidebarTab())
     registerSidebarTab(useWorkflowsSidebarTab())
-<<<<<<< HEAD
+    registerSidebarTab(useOutputExplorerSidebarTab())
 
     const menuStore = useMenuItemStore()
 
@@ -113,9 +113,6 @@ export const useSidebarTabStore = defineStore('sidebarTab', () => {
       ['View'],
       ['Comfy.Canvas.ZoomIn', 'Comfy.Canvas.ZoomOut', 'Comfy.Canvas.FitView']
     )
-=======
-    registerSidebarTab(useOutputExplorerSidebarTab())
->>>>>>> e9f3e42a (Add output explorer)
   }
 
   return {