diff --git a/components/contacts/__tests__/contact-form.test.tsx b/components/contacts/__tests__/contact-form.test.tsx
index 8384c615..6037feff 100644
--- a/components/contacts/__tests__/contact-form.test.tsx
+++ b/components/contacts/__tests__/contact-form.test.tsx
@@ -67,7 +67,8 @@ describe('ContactForm', () => {
     render(<ContactForm onSave={onSave} onCancel={vi.fn()} />);
 
     const inputs = screen.getAllByRole('textbox');
-    fireEvent.change(inputs[0], { target: { value: 'Jane' } });
+    const givenNameInput = screen.getByPlaceholderText('given_name');
+    fireEvent.change(givenNameInput, { target: { value: 'Jane' } });
 
     fireEvent.submit(screen.getByText('save').closest('form')!);
 
diff --git a/locales/de/common.json b/locales/de/common.json
index bc810bf9..158e434a 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -65,6 +65,7 @@
     "loading_mailboxes": "Postfächer werden geladen...",
     "push_connected": "Echtzeit-Updates aktiv",
     "push_disconnected": "Echtzeit-Updates inaktiv",
+    "keyboard_shortcuts": "Keyboard Shortcuts",
     "theme": {
       "light": "Heller Modus",
       "dark": "Dunkler Modus",
@@ -551,7 +552,8 @@
       "folders": "Ordner",
       "keywords": "Schlüsselwörter",
       "security": "Sicherheit",
-      "files": "Dateien"
+      "files": "Dateien",
+      "contacts": "Contacts"
     },
     "tab_groups": {
       "general": "Allgemein",
@@ -598,6 +600,10 @@
         "description": "Wo die E-Mail-Aktionsschaltflächen angezeigt werden (Antworten, Archivieren, Löschen usw.)",
         "top": "Oben",
         "below_subject": "Unter dem Betreff"
+      },
+      "toolbar_labels": {
+        "label": "Show Toolbar Labels",
+        "description": "Display text labels next to toolbar icons. Disable to save space once you are familiar with the icons."
       }
     },
     "keywords": {
@@ -974,6 +980,14 @@
         "button": "Importieren"
       }
     },
+    "contacts": {
+      "title": "Contacts",
+      "description": "Import and export your contacts",
+      "import_label": "Import Contacts",
+      "import_description": "Import contacts from a vCard (.vcf) file",
+      "export_label": "Export Contacts",
+      "export_description": "Export all contacts as a vCard (.vcf) file"
+    },
     "filters": {
       "title": "E-Mail-Filter",
       "description": "Erstellen Sie Regeln, um eingehende E-Mails automatisch zu sortieren, zu kennzeichnen und zu verwalten",
@@ -1129,6 +1143,12 @@
         "title": "Anzeige",
         "description": "Konfigurieren Sie die Anzeige von Dateien und Ordnern"
       },
+      "folder_layout": {
+        "label": "Folder Navigation",
+        "description": "Choose how folders are displayed: inline with files or in a sidebar tree",
+        "inline": "Inline",
+        "sidebar": "Sidebar"
+      },
       "default_view": {
         "label": "Standardansicht",
         "description": "Wählen Sie zwischen Raster- und Listenansicht",
@@ -1960,6 +1980,10 @@
     "settings_show_thumbnails_desc": "Bildvorschauen statt Symbole für Bilddateien anzeigen",
     "settings_behavior": "Verhalten",
     "settings_show_hidden": "Versteckte Dateien anzeigen",
-    "settings_show_hidden_desc": "Dateien und Ordner anzeigen, die mit einem Punkt beginnen"
+    "settings_show_hidden_desc": "Dateien und Ordner anzeigen, die mit einem Punkt beginnen",
+    "settings_folder_layout": "Folder Navigation",
+    "settings_folder_layout_desc": "Choose how folders are displayed: inline with files or in a sidebar tree",
+    "settings_folder_layout_inline": "Inline",
+    "settings_folder_layout_sidebar": "Sidebar"
   }
 }
diff --git a/locales/es/common.json b/locales/es/common.json
index fedbef38..c77d445f 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -65,6 +65,7 @@
     "loading_mailboxes": "Cargando buzones...",
     "push_connected": "Actualizaciones en tiempo real activas",
     "push_disconnected": "Actualizaciones en tiempo real inactivas",
+    "keyboard_shortcuts": "Keyboard Shortcuts",
     "theme": {
       "light": "Modo claro",
       "dark": "Modo oscuro",
@@ -551,7 +552,8 @@
       "folders": "Carpetas",
       "keywords": "Palabras clave",
       "security": "Seguridad",
-      "files": "Archivos"
+      "files": "Archivos",
+      "contacts": "Contacts"
     },
     "tab_groups": {
       "general": "General",
@@ -598,6 +600,10 @@
         "description": "Dónde mostrar los botones de acción del correo (Responder, Archivar, Eliminar, etc.)",
         "top": "Arriba",
         "below_subject": "Debajo del asunto"
+      },
+      "toolbar_labels": {
+        "label": "Show Toolbar Labels",
+        "description": "Display text labels next to toolbar icons. Disable to save space once you are familiar with the icons."
       }
     },
     "keywords": {
@@ -974,6 +980,14 @@
         "button": "Importar"
       }
     },
+    "contacts": {
+      "title": "Contacts",
+      "description": "Import and export your contacts",
+      "import_label": "Import Contacts",
+      "import_description": "Import contacts from a vCard (.vcf) file",
+      "export_label": "Export Contacts",
+      "export_description": "Export all contacts as a vCard (.vcf) file"
+    },
     "filters": {
       "title": "Filtros de correo",
       "description": "Cree reglas para ordenar, etiquetar y gestionar automáticamente los correos entrantes",
@@ -1129,6 +1143,12 @@
         "title": "Visualización",
         "description": "Configura cómo se muestran los archivos y carpetas"
       },
+      "folder_layout": {
+        "label": "Folder Navigation",
+        "description": "Choose how folders are displayed: inline with files or in a sidebar tree",
+        "inline": "Inline",
+        "sidebar": "Sidebar"
+      },
       "default_view": {
         "label": "Vista predeterminada",
         "description": "Elige entre diseño de cuadrícula y lista",
@@ -1960,6 +1980,10 @@
     "settings_show_thumbnails_desc": "Mostrar vistas previas de imágenes en lugar de iconos",
     "settings_behavior": "Comportamiento",
     "settings_show_hidden": "Mostrar archivos ocultos",
-    "settings_show_hidden_desc": "Mostrar archivos y carpetas que comienzan con un punto"
+    "settings_show_hidden_desc": "Mostrar archivos y carpetas que comienzan con un punto",
+    "settings_folder_layout": "Folder Navigation",
+    "settings_folder_layout_desc": "Choose how folders are displayed: inline with files or in a sidebar tree",
+    "settings_folder_layout_inline": "Inline",
+    "settings_folder_layout_sidebar": "Sidebar"
   }
 }
diff --git a/locales/fr/common.json b/locales/fr/common.json
index b6899c81..6b587381 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -65,6 +65,7 @@
     "loading_mailboxes": "Chargement des boîtes mail...",
     "push_connected": "Mises à jour en temps réel actives",
     "push_disconnected": "Mises à jour en temps réel inactives",
+    "keyboard_shortcuts": "Keyboard Shortcuts",
     "theme": {
       "light": "Mode clair",
       "dark": "Mode sombre",
@@ -551,7 +552,8 @@
       "folders": "Dossiers",
       "keywords": "Mots-clés",
       "security": "Sécurité",
-      "files": "Fichiers"
+      "files": "Fichiers",
+      "contacts": "Contacts"
     },
     "tab_groups": {
       "general": "Général",
@@ -598,6 +600,10 @@
         "description": "Où afficher les boutons d'action des e-mails (Répondre, Archiver, Supprimer, etc.)",
         "top": "En haut",
         "below_subject": "Sous l'objet"
+      },
+      "toolbar_labels": {
+        "label": "Show Toolbar Labels",
+        "description": "Display text labels next to toolbar icons. Disable to save space once you are familiar with the icons."
       }
     },
     "keywords": {
@@ -974,6 +980,14 @@
         "button": "Importer"
       }
     },
+    "contacts": {
+      "title": "Contacts",
+      "description": "Import and export your contacts",
+      "import_label": "Import Contacts",
+      "import_description": "Import contacts from a vCard (.vcf) file",
+      "export_label": "Export Contacts",
+      "export_description": "Export all contacts as a vCard (.vcf) file"
+    },
     "filters": {
       "title": "Filtres de courrier",
       "description": "Créez des règles pour trier, étiqueter et gérer automatiquement les courriers entrants",
@@ -1129,6 +1143,12 @@
         "title": "Affichage",
         "description": "Configurez l'affichage des fichiers et dossiers"
       },
+      "folder_layout": {
+        "label": "Folder Navigation",
+        "description": "Choose how folders are displayed: inline with files or in a sidebar tree",
+        "inline": "Inline",
+        "sidebar": "Sidebar"
+      },
       "default_view": {
         "label": "Vue par défaut",
         "description": "Choisissez entre la disposition en grille et en liste",
@@ -1960,6 +1980,10 @@
     "settings_show_thumbnails_desc": "Afficher les aperçus d'images au lieu des icônes",
     "settings_behavior": "Comportement",
     "settings_show_hidden": "Afficher les fichiers cachés",
-    "settings_show_hidden_desc": "Afficher les fichiers et dossiers commençant par un point"
+    "settings_show_hidden_desc": "Afficher les fichiers et dossiers commençant par un point",
+    "settings_folder_layout": "Folder Navigation",
+    "settings_folder_layout_desc": "Choose how folders are displayed: inline with files or in a sidebar tree",
+    "settings_folder_layout_inline": "Inline",
+    "settings_folder_layout_sidebar": "Sidebar"
   }
 }
diff --git a/locales/it/common.json b/locales/it/common.json
index a9b84140..16951ce0 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -65,6 +65,7 @@
     "loading_mailboxes": "Caricamento caselle di posta...",
     "push_connected": "Aggiornamenti in tempo reale attivi",
     "push_disconnected": "Aggiornamenti in tempo reale non attivi",
+    "keyboard_shortcuts": "Keyboard Shortcuts",
     "theme": {
       "light": "Tema chiaro",
       "dark": "Tema scuro",
@@ -551,7 +552,8 @@
       "folders": "Cartelle",
       "keywords": "Parole chiave",
       "security": "Sicurezza",
-      "files": "File"
+      "files": "File",
+      "contacts": "Contacts"
     },
     "tab_groups": {
       "general": "Generale",
@@ -598,6 +600,10 @@
         "description": "Dove mostrare i pulsanti azione e-mail (Rispondi, Archivia, Elimina, ecc.)",
         "top": "In alto",
         "below_subject": "Sotto l'oggetto"
+      },
+      "toolbar_labels": {
+        "label": "Show Toolbar Labels",
+        "description": "Display text labels next to toolbar icons. Disable to save space once you are familiar with the icons."
       }
     },
     "keywords": {
@@ -974,6 +980,14 @@
         "button": "Importa"
       }
     },
+    "contacts": {
+      "title": "Contacts",
+      "description": "Import and export your contacts",
+      "import_label": "Import Contacts",
+      "import_description": "Import contacts from a vCard (.vcf) file",
+      "export_label": "Export Contacts",
+      "export_description": "Export all contacts as a vCard (.vcf) file"
+    },
     "filters": {
       "title": "Filtri email",
       "description": "Crea regole per ordinare, etichettare e gestire automaticamente le email in arrivo",
@@ -1129,6 +1143,12 @@
         "title": "Visualizzazione",
         "description": "Configura come vengono visualizzati file e cartelle"
       },
+      "folder_layout": {
+        "label": "Folder Navigation",
+        "description": "Choose how folders are displayed: inline with files or in a sidebar tree",
+        "inline": "Inline",
+        "sidebar": "Sidebar"
+      },
       "default_view": {
         "label": "Vista predefinita",
         "description": "Scegli tra layout a griglia e a lista",
@@ -1960,6 +1980,10 @@
     "settings_show_thumbnails_desc": "Mostra anteprime delle immagini al posto delle icone",
     "settings_behavior": "Comportamento",
     "settings_show_hidden": "Mostra file nascosti",
-    "settings_show_hidden_desc": "Visualizza file e cartelle che iniziano con un punto"
+    "settings_show_hidden_desc": "Visualizza file e cartelle che iniziano con un punto",
+    "settings_folder_layout": "Folder Navigation",
+    "settings_folder_layout_desc": "Choose how folders are displayed: inline with files or in a sidebar tree",
+    "settings_folder_layout_inline": "Inline",
+    "settings_folder_layout_sidebar": "Sidebar"
   }
 }
diff --git a/locales/ja/common.json b/locales/ja/common.json
index a0697f14..9bdd27f5 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -65,6 +65,7 @@
     "loading_mailboxes": "メールボックスを読み込み中...",
     "push_connected": "リアルタイム更新が有効",
     "push_disconnected": "リアルタイム更新が無効",
+    "keyboard_shortcuts": "Keyboard Shortcuts",
     "theme": {
       "light": "ライトモード",
       "dark": "ダークモード",
@@ -551,7 +552,8 @@
       "folders": "フォルダー",
       "keywords": "キーワード",
       "security": "セキュリティ",
-      "files": "ファイル"
+      "files": "ファイル",
+      "contacts": "Contacts"
     },
     "tab_groups": {
       "general": "一般",
@@ -598,6 +600,10 @@
         "description": "メールアクションボタン（返信、アーカイブ、削除など）の表示位置",
         "top": "上部",
         "below_subject": "件名の下"
+      },
+      "toolbar_labels": {
+        "label": "Show Toolbar Labels",
+        "description": "Display text labels next to toolbar icons. Disable to save space once you are familiar with the icons."
       }
     },
     "keywords": {
@@ -974,6 +980,14 @@
         "button": "インポート"
       }
     },
+    "contacts": {
+      "title": "Contacts",
+      "description": "Import and export your contacts",
+      "import_label": "Import Contacts",
+      "import_description": "Import contacts from a vCard (.vcf) file",
+      "export_label": "Export Contacts",
+      "export_description": "Export all contacts as a vCard (.vcf) file"
+    },
     "filters": {
       "title": "メールフィルター",
       "description": "受信メールを自動で振り分け、ラベル付け、管理するルールを作成します",
@@ -1129,6 +1143,12 @@
         "title": "表示",
         "description": "ファイルとフォルダーの表示方法を設定します"
       },
+      "folder_layout": {
+        "label": "Folder Navigation",
+        "description": "Choose how folders are displayed: inline with files or in a sidebar tree",
+        "inline": "Inline",
+        "sidebar": "Sidebar"
+      },
       "default_view": {
         "label": "デフォルトビュー",
         "description": "グリッドまたはリストレイアウトを選択します",
@@ -1960,6 +1980,10 @@
     "settings_show_thumbnails_desc": "画像ファイルのアイコンの代わりにプレビューを表示します",
     "settings_behavior": "動作",
     "settings_show_hidden": "隠しファイルを表示",
-    "settings_show_hidden_desc": "ドットで始まるファイルとフォルダーを表示します"
+    "settings_show_hidden_desc": "ドットで始まるファイルとフォルダーを表示します",
+    "settings_folder_layout": "Folder Navigation",
+    "settings_folder_layout_desc": "Choose how folders are displayed: inline with files or in a sidebar tree",
+    "settings_folder_layout_inline": "Inline",
+    "settings_folder_layout_sidebar": "Sidebar"
   }
 }
diff --git a/locales/nl/common.json b/locales/nl/common.json
index c92429f2..317d08d8 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -65,6 +65,7 @@
     "loading_mailboxes": "Mappen laden...",
     "push_connected": "Real-time updates actief",
     "push_disconnected": "Real-time updates inactief",
+    "keyboard_shortcuts": "Keyboard Shortcuts",
     "theme": {
       "light": "Lichte modus",
       "dark": "Donkere modus",
@@ -551,7 +552,8 @@
       "folders": "Mappen",
       "keywords": "Sleutelwoorden",
       "security": "Beveiliging",
-      "files": "Bestanden"
+      "files": "Bestanden",
+      "contacts": "Contacts"
     },
     "tab_groups": {
       "general": "Algemeen",
@@ -598,6 +600,10 @@
         "description": "Waar de e-mailactieknoppen worden weergegeven (Beantwoorden, Archiveren, Verwijderen, enz.)",
         "top": "Bovenaan",
         "below_subject": "Onder het onderwerp"
+      },
+      "toolbar_labels": {
+        "label": "Show Toolbar Labels",
+        "description": "Display text labels next to toolbar icons. Disable to save space once you are familiar with the icons."
       }
     },
     "keywords": {
@@ -974,6 +980,14 @@
         "button": "Importeren"
       }
     },
+    "contacts": {
+      "title": "Contacts",
+      "description": "Import and export your contacts",
+      "import_label": "Import Contacts",
+      "import_description": "Import contacts from a vCard (.vcf) file",
+      "export_label": "Export Contacts",
+      "export_description": "Export all contacts as a vCard (.vcf) file"
+    },
     "filters": {
       "title": "E-mailfilters",
       "description": "Maak regels om inkomende e-mails automatisch te sorteren, labelen en beheren",
@@ -1129,6 +1143,12 @@
         "title": "Weergave",
         "description": "Configureer hoe bestanden en mappen worden weergegeven"
       },
+      "folder_layout": {
+        "label": "Folder Navigation",
+        "description": "Choose how folders are displayed: inline with files or in a sidebar tree",
+        "inline": "Inline",
+        "sidebar": "Sidebar"
+      },
       "default_view": {
         "label": "Standaardweergave",
         "description": "Kies tussen raster- en lijstweergave",
@@ -1960,6 +1980,10 @@
     "settings_show_thumbnails_desc": "Toon afbeeldingsvoorbeelden in plaats van pictogrammen",
     "settings_behavior": "Gedrag",
     "settings_show_hidden": "Verborgen bestanden tonen",
-    "settings_show_hidden_desc": "Bestanden en mappen weergeven die beginnen met een punt"
+    "settings_show_hidden_desc": "Bestanden en mappen weergeven die beginnen met een punt",
+    "settings_folder_layout": "Folder Navigation",
+    "settings_folder_layout_desc": "Choose how folders are displayed: inline with files or in a sidebar tree",
+    "settings_folder_layout_inline": "Inline",
+    "settings_folder_layout_sidebar": "Sidebar"
   }
 }
diff --git a/locales/pt/common.json b/locales/pt/common.json
index d235f6c2..a6e9a492 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -65,6 +65,7 @@
     "loading_mailboxes": "Carregando caixas de entrada...",
     "push_connected": "Atualizações em tempo real ativas",
     "push_disconnected": "Atualizações em tempo real inativas",
+    "keyboard_shortcuts": "Keyboard Shortcuts",
     "theme": {
       "light": "Modo claro",
       "dark": "Modo escuro",
@@ -551,7 +552,8 @@
       "folders": "Pastas",
       "keywords": "Palavras-chave",
       "security": "Segurança",
-      "files": "Arquivos"
+      "files": "Arquivos",
+      "contacts": "Contacts"
     },
     "tab_groups": {
       "general": "Geral",
@@ -598,6 +600,10 @@
         "description": "Onde mostrar os botões de ação do e-mail (Responder, Arquivar, Excluir, etc.)",
         "top": "Topo",
         "below_subject": "Abaixo do assunto"
+      },
+      "toolbar_labels": {
+        "label": "Show Toolbar Labels",
+        "description": "Display text labels next to toolbar icons. Disable to save space once you are familiar with the icons."
       }
     },
     "keywords": {
@@ -974,6 +980,14 @@
         "button": "Importar"
       }
     },
+    "contacts": {
+      "title": "Contacts",
+      "description": "Import and export your contacts",
+      "import_label": "Import Contacts",
+      "import_description": "Import contacts from a vCard (.vcf) file",
+      "export_label": "Export Contacts",
+      "export_description": "Export all contacts as a vCard (.vcf) file"
+    },
     "filters": {
       "title": "Filtros de e-mail",
       "description": "Crie regras para classificar, rotular e gerenciar automaticamente os e-mails recebidos",
@@ -1129,6 +1143,12 @@
         "title": "Exibição",
         "description": "Configure como arquivos e pastas são exibidos"
       },
+      "folder_layout": {
+        "label": "Folder Navigation",
+        "description": "Choose how folders are displayed: inline with files or in a sidebar tree",
+        "inline": "Inline",
+        "sidebar": "Sidebar"
+      },
       "default_view": {
         "label": "Visualização padrão",
         "description": "Escolha entre layout em grade e lista",
@@ -1960,6 +1980,10 @@
     "settings_show_thumbnails_desc": "Exibir pré-visualizações de imagens em vez de ícones",
     "settings_behavior": "Comportamento",
     "settings_show_hidden": "Mostrar arquivos ocultos",
-    "settings_show_hidden_desc": "Exibir arquivos e pastas que começam com um ponto"
+    "settings_show_hidden_desc": "Exibir arquivos e pastas que começam com um ponto",
+    "settings_folder_layout": "Folder Navigation",
+    "settings_folder_layout_desc": "Choose how folders are displayed: inline with files or in a sidebar tree",
+    "settings_folder_layout_inline": "Inline",
+    "settings_folder_layout_sidebar": "Sidebar"
   }
 }
diff --git a/vitest.config.ts b/vitest.config.ts
index 6294e792..e6de1b87 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -8,7 +8,7 @@ export default defineConfig({
     environment: 'jsdom',
     globals: true,
     setupFiles: ['./vitest.setup.ts'],
-    exclude: ['e2e/**', 'node_modules/**'],
+    exclude: ['e2e/**', 'node_modules/**', '.next/**'],
   },
   resolve: {
     alias: {