diff --git a/apps/api/src/lib/apiKeys/schema.ts b/apps/api/src/lib/apiKeys/schema.ts
index 8b722336f..de2d00f04 100644
--- a/apps/api/src/lib/apiKeys/schema.ts
+++ b/apps/api/src/lib/apiKeys/schema.ts
@@ -1,5 +1,4 @@
 import z from 'zod'
-
 import { cleanSchemas } from '@lifeforge/server-utils'
 
 export const schemas = {
diff --git a/apps/web/src/core/moduleManager/pages/Modules/components/ModuleItem.tsx b/apps/web/src/core/moduleManager/pages/Modules/components/ModuleItem.tsx
index ba3a4229f..3ae193419 100644
--- a/apps/web/src/core/moduleManager/pages/Modules/components/ModuleItem.tsx
+++ b/apps/web/src/core/moduleManager/pages/Modules/components/ModuleItem.tsx
@@ -152,6 +152,7 @@ function ModuleItem({
                 disabled={!(module.hasSource && module.hasDist)}
                 icon={module.isDevMode ? 'tabler:code-off' : 'tabler:code'}
                 label={module.isDevMode ? 'devMode.disable' : 'devMode.enable'}
+                namespace="common.module-manager"
                 onClick={handleDevModeToggle}
               />
             )}
@@ -159,6 +160,7 @@ function ModuleItem({
               dangerous
               icon="tabler:trash"
               label="uninstall"
+              namespace="common.module-manager"
               onClick={handleUninstall}
             />
           </ContextMenu>
diff --git a/packages/ui/src/components/auth/WithMasterPassword/components/LockedScreen.tsx b/packages/ui/src/components/auth/WithMasterPassword/components/LockedScreen.tsx
index 3c048e833..9adcaaccf 100644
--- a/packages/ui/src/components/auth/WithMasterPassword/components/LockedScreen.tsx
+++ b/packages/ui/src/components/auth/WithMasterPassword/components/LockedScreen.tsx
@@ -22,7 +22,7 @@ export function LockedScreen({
   const [masterPassWordInputContent, setMasterPassWordInputContent] =
     useState<string>('')
 
-  const { t } = useTranslation('common.vault')
+  const { t } = useTranslation(['common.vault', 'common.fetch'])
 
   async function handleSubmit(): Promise<void> {
     if (masterPassWordInputContent.trim() === '') {
@@ -39,24 +39,24 @@ export function LockedScreen({
       } as never)
 
       if (data === true) {
-        toast.info(
-          t('fetch.success', {
-            action: t('fetch.unlock')
+        toast.success(
+          t('common.fetch:success', {
+            action: t('common.fetch:unlock')
           })
         )
         setMasterPassword(masterPassWordInputContent)
         setMasterPassWordInputContent('')
       } else {
         toast.error(
-          t('fetch.failure', {
-            action: t('fetch.unlock')
+          t('common.fetch:failure', {
+            action: t('common.fetch:unlock')
           })
         )
       }
     } catch {
       toast.error(
-        t('fetch.failure', {
-          action: t('fetch.unlock')
+        t('common.fetch:failure', {
+          action: t('common.fetch:unlock')
         })
       )
     }
diff --git a/packages/ui/src/components/navigation/sidebar/SidebarWrapper/index.tsx b/packages/ui/src/components/navigation/sidebar/SidebarWrapper/index.tsx
index 819003693..917986e16 100644
--- a/packages/ui/src/components/navigation/sidebar/SidebarWrapper/index.tsx
+++ b/packages/ui/src/components/navigation/sidebar/SidebarWrapper/index.tsx
@@ -22,15 +22,14 @@ export function SidebarWrapper({ children }: { children: React.ReactNode }) {
       r="lg"
       top="0"
       width={{ base: '100%', xl: '25%' }}
-      zIndex={isSidebarOpen ? '9990' : '0'}
+      zIndex={isSidebarOpen ? '250' : '0'}
     >
       <Scrollbar usePaddingRight={false}>
         <Flex
           align="center"
           display={{ base: 'flex', xl: 'none' }}
           justify="between"
-          px="2xl"
-          py="md"
+          p="md"
         >
           <GoBackButton onClick={() => setIsSidebarOpen(false)} />
         </Flex>
diff --git a/packages/ui/src/components/utilities/APIOnlineStatusWrapper/index.tsx b/packages/ui/src/components/utilities/APIOnlineStatusWrapper/index.tsx
index e24fb975e..9bed1d9fd 100644
--- a/packages/ui/src/components/utilities/APIOnlineStatusWrapper/index.tsx
+++ b/packages/ui/src/components/utilities/APIOnlineStatusWrapper/index.tsx
@@ -18,6 +18,7 @@ export function APIOnlineStatusWrapper({
       <EmptyStateScreen
         CTAButtonProps={{
           children: 'Retry',
+          namespace: false,
           onClick: retry,
           icon: 'tabler:refresh'
         }}