diff --git a/src/assets/librechat.svg b/src/assets/librechat.svg
new file mode 100644
index 0000000..e2d7701
--- /dev/null
+++ b/src/assets/librechat.svg
@@ -0,0 +1,32 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="39.31 0 433.4 512.01">
+  <defs>
+    <linearGradient id="linearGradient22708">
+      <stop stop-color="#21facf" offset="0"/>
+      <stop stop-color="#0970ef" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient6949" x1="68.454" x2="198.59" y1="246.73" y2="96.35" gradientTransform="translate(-5.754,-56.594)" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#72004e" offset="0"/>
+      <stop stop-color="#0015b1" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient22718" x1="56.735" x2="155.2" y1="246.96" y2="58.575" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#4f00da" offset="0"/>
+      <stop stop-color="#e5311b" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient23463" x1="68.454" x2="198.59" y1="246.73" y2="96.35" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient22708"/>
+    <linearGradient id="linearGradient903" x1="54.478" x2="192.1" y1="247.56" y2="9.8095" gradientTransform="matrix(.87923 0 0 .87923 -9.551 48.787)" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#dc180d" offset="0"/>
+      <stop stop-color="#f96e20" offset=".5"/>
+      <stop stop-color="#f4ce41" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient918" x1="39.468" x2="154.99" y1="204.22" y2="124.47" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient22708"/>
+  </defs>
+  <g transform="matrix(2.473 0 0 2.473 -4.8978 -4.8812)">
+    <path transform="translate(-5.5496,-57.412)" d="m148.16 59.393c-7.7098 9.3985-19.951 42.888-20.696 49.204-0.16994 4.6737 1.3731 14.231 0.67182 15.805-0.71909 1.6134-5.117-9.4461-7.2151-6.3266-12.219 18.168-10.7 17.731-15.582 31.378-1.8357 5.1315-0.42447 21.99-1.5666 23.773-1.273 1.9866-3.962-12.31-6.8063-9.236-11.603 12.54-16.279 20.379-22.336 30.607-3.3589 5.6725-2.1817 23.33-3.506 24.674-1.3023 1.3215-3.8566-18.326-7.6437-14.309-8.5193 9.038-14.054 13.441-18.946 19.252-5.1981 6.1739-0.78251 17.584-5.0672 35.383l0.1448 0.22073c77.447-50.308 101.52-127.16 107.61-181.19-0.68051 63.93-29.41 142.78-105.33 184.65l0.1127 0.17141c20.241-2.181 22.307 10.458 44.562-4.2837 55.792-48.277 81.856-124.29 61.593-199.78z" display="none" fill="url(#linearGradient903)"/>
+    <path transform="translate(-5.5498,-57.412)" d="m148.16 59.393c-7.7098 9.3985-19.951 42.888-20.696 49.204-0.16994 4.6737 1.3731 14.231 0.67182 15.805-0.71909 1.6134-5.117-9.4461-7.2151-6.3266-12.219 18.168-10.7 17.731-15.582 31.378-1.8357 5.1315-0.42447 21.99-1.5666 23.773-1.273 1.9866-3.962-12.31-6.8063-9.236-11.603 12.54-16.279 20.379-22.336 30.607-3.3589 5.6725-2.1817 23.33-3.506 24.674-1.3023 1.3215-3.8566-18.326-7.6437-14.309-8.5193 9.038-14.054 13.441-18.946 19.252-5.1981 6.1739-0.78251 17.584-5.0672 35.383l0.1448 0.22073c77.447-50.308 101.52-127.16 107.61-181.19-0.68051 63.93-29.41 142.78-105.33 184.65l0.1127 0.17141c20.241-2.181 22.307 10.458 44.562-4.2837 55.792-48.277 81.856-124.29 61.593-199.78z" fill="url(#linearGradient918)"/>
+    <g transform="translate(0 2.0218e-5)">
+      <path transform="translate(-5.7543,-56.594)" d="m111.25 81.024c-48.394-1.5e-5 -87.625 39.231-87.625 87.625 0.0174 20.443 7.1818 40.236 20.253 55.954 0.2523-0.42224 0.53629-0.82423 0.85783-1.2061 4.892-5.8104 10.427-10.214 18.946-19.252 3.7871-4.0176 6.3412 15.63 7.6435 14.309 1.3243-1.3439 0.1473-19.001 3.5062-24.674 6.0563-10.228 10.733-18.067 22.336-30.607 2.8443-3.0741 5.5333 11.223 6.8063 9.2361 1.1421-1.7823-0.26941-18.641 1.5663-23.773 4.8819-13.647 3.3631-13.21 15.582-31.378 2.098-3.1195 6.496 7.9402 7.2151 6.3268 0.70126-1.5734-0.84173-11.131-0.67179-15.805 0.37161-3.1498 3.6036-13.059 7.7055-23.367-7.8432-2.2472-15.962-3.3881-24.12-3.3895zm43.142 11.356c5.5662 61.595-18.426 120.7-62.796 161.65 6.446 1.4857 13.04 2.2367 19.655 2.2386 48.394 1e-5 87.625-39.231 87.625-87.625-3.1e-4 -31.581-16.995-60.719-44.484-76.268z" display="none" fill="url(#linearGradient22718)"/>
+      <path transform="translate(-5.754,-56.594)" d="m111.25 81.024c-48.394-1.5e-5 -87.625 39.231-87.625 87.625 0.0174 20.443 7.1818 40.236 20.253 55.954 0.2523-0.42224 0.53629-0.82423 0.85783-1.2061 4.892-5.8104 10.427-10.214 18.946-19.252 3.7871-4.0176 6.3412 15.63 7.6435 14.309 1.3243-1.3439 0.1473-19.001 3.5062-24.674 6.0563-10.228 10.733-18.067 22.336-30.607 2.8443-3.0741 5.5333 11.223 6.8063 9.2361 1.1421-1.7823-0.26941-18.641 1.5663-23.773 4.8819-13.647 3.3631-13.21 15.582-31.378 2.098-3.1195 6.496 7.9402 7.2151 6.3268 0.70126-1.5734-0.84173-11.131-0.67179-15.805 0.37161-3.1498 3.6036-13.059 7.7055-23.367-7.8432-2.2472-15.962-3.3881-24.12-3.3895zm43.142 11.356c5.5662 61.595-18.426 120.7-62.796 161.65 6.446 1.4857 13.04 2.2367 19.655 2.2386 48.394 1e-5 87.625-39.231 87.625-87.625-3.1e-4 -31.581-16.995-60.719-44.484-76.268z" display="none" fill="url(#linearGradient23463)"/>
+      <path d="m105.5 24.43c-48.394-1.5e-5 -87.625 39.231-87.625 87.625 0.0174 20.443 7.1818 40.236 20.253 55.954 0.2523-0.42224 0.53629-0.82423 0.85783-1.2061 4.892-5.8104 10.427-10.214 18.946-19.252 3.7871-4.0176 6.3412 15.63 7.6435 14.309 1.3243-1.3439 0.1473-19.001 3.5062-24.674 6.0563-10.228 10.733-18.067 22.336-30.607 2.8443-3.0741 5.5333 11.223 6.8063 9.2361 1.1421-1.7823-0.26941-18.641 1.5663-23.773 4.8819-13.647 3.3631-13.21 15.582-31.378 2.098-3.1195 6.496 7.9402 7.2151 6.3268 0.70126-1.5734-0.84173-11.131-0.67179-15.805 0.37161-3.1498 3.6036-13.059 7.7055-23.367-7.8432-2.2472-15.962-3.3881-24.12-3.3895zm43.142 11.356c5.5662 61.595-18.426 120.7-62.796 161.65 6.446 1.4857 13.04 2.2367 19.655 2.2386 48.394 1e-5 87.625-39.231 87.625-87.625-3.1e-4 -31.581-16.995-60.719-44.484-76.268z" fill="url(#linearGradient6949)"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index e796798..0dd895c 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,7 +1,7 @@
 import type * as t from '@/types';
 import { useLocalize } from '@/hooks';
 
-export default function Header({ title, description, onSearchClick, children }: t.HeaderProps) {
+export function Header({ title, onSearchClick, children }: t.HeaderProps) {
   const localize = useLocalize();
   const isMac =
     typeof navigator !== 'undefined' && /Mac|iPod|iPhone|iPad/.test(navigator.userAgent);
@@ -16,9 +16,6 @@ export default function Header({ title, description, onSearchClick, children }:
           ) : (
             <div />
           )}
-          {description && (
-            <p className="text-xs text-(--cui-color-text-muted)">{description}</p>
-          )}
         </div>
         <div className="flex min-w-0 flex-1 items-center justify-end gap-2">
           {children}
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index f138840..3d3e909 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -3,7 +3,7 @@ import { Icon, Dropdown } from '@clickhouse/click-ui';
 import { Link, useRouter } from '@tanstack/react-router';
 import type * as t from '@/types';
 import { useStripAriaExpanded, useCapabilities, useLocalize } from '@/hooks';
-import { SidebarIcon } from '@/components/shared';
+import libreChatLogo from '@/assets/librechat.svg';
 import { SettingsDialog } from './SettingsDialog';
 import { SystemCapabilities } from '@/constants';
 import { getInitials, cn } from '@/utils';
@@ -79,31 +79,24 @@ export function Sidebar({ user, collapsed, onToggle }: t.SidebarProps) {
         aria-label={localize('com_a11y_admin_panel')}
         className={cn(
           'sticky top-0 z-(--z-floating) flex h-screen shrink-0 flex-col overflow-hidden border-r border-(--cui-color-stroke-default) bg-(--cui-color-background-panel) transition-[width] duration-200',
-          collapsed ? 'w-14' : 'w-46',
+          collapsed ? 'w-14' : 'w-63',
         )}
       >
-        <div className="shrink-0 px-2 py-2 pt-4">
-          <button
-            type="button"
-            onClick={onToggle}
-            aria-label={localize(collapsed ? 'com_nav_expand_sidebar' : 'com_nav_collapse_sidebar')}
-            title={localize(collapsed ? 'com_nav_expand_sidebar' : 'com_nav_collapse_sidebar')}
-            className={cn(
-              'flex h-9 cursor-pointer items-center rounded-lg border-none bg-transparent text-(--cui-color-text-muted) transition-colors hover:bg-(--cui-color-background-hover) hover:text-(--cui-color-text-default)',
-              collapsed ? 'w-9 justify-center' : 'gap-3 pr-2.5 pl-2',
-            )}
+        <div className="flex h-14 shrink-0 items-center px-2">
+          <div
+            className={cn('flex items-center', collapsed ? 'w-9 justify-center' : 'gap-2.5 px-1.5')}
           >
-            <span aria-hidden="true" className="shrink-0">
-              <SidebarIcon className="h-5 w-5" />
-            </span>
+            <img src={libreChatLogo} alt="LibreChat" className="h-6 w-6 shrink-0" />
             {!collapsed && (
-              <span className="truncate text-sm">{localize('com_nav_collapse_sidebar')}</span>
+              <span className="flex-1 truncate text-sm font-semibold text-(--cui-color-text-default)">
+                Admin Panel
+              </span>
             )}
-          </button>
+          </div>
         </div>
 
-        <nav className="flex-1 overflow-y-auto px-2 pt-2" role="navigation">
-          <div className="flex flex-col gap-1">
+        <nav className="flex-1 overflow-y-auto px-2 py-2" role="navigation">
+          <div className="flex flex-col gap-0.5">
             {visibleItems.map((item) => (
               <Link
                 key={item.path}
@@ -112,8 +105,8 @@ export function Sidebar({ user, collapsed, onToggle }: t.SidebarProps) {
                 aria-label={collapsed ? localize(item.labelKey) : undefined}
                 title={collapsed ? localize(item.labelKey) : undefined}
                 className={cn(
-                  'flex h-9 items-center rounded-lg text-sm no-underline transition-colors duration-100',
-                  collapsed ? 'w-9 justify-center' : 'gap-3 px-2.5',
+                  'flex h-8 items-center rounded-md text-sm no-underline transition-colors duration-100',
+                  collapsed ? 'w-9 justify-center' : 'gap-2.5 px-2.5',
                   isActive(item.path)
                     ? 'bg-(--cui-color-background-active) font-medium text-(--cui-color-text-default)'
                     : 'font-normal text-(--cui-color-text-muted) hover:bg-(--cui-color-background-hover) hover:text-(--cui-color-text-default)',
@@ -129,68 +122,80 @@ export function Sidebar({ user, collapsed, onToggle }: t.SidebarProps) {
         </nav>
 
         {initials && (
-          <div
-            className={cn(
-              'flex shrink-0 items-center border-t border-(--cui-color-stroke-default) py-3',
-              collapsed ? 'justify-center' : 'px-3',
-            )}
-          >
-            <Dropdown>
-              <Dropdown.Trigger>
-                <button
-                  ref={userMenuRef}
-                  type="button"
-                  className="flex h-8 w-8 shrink-0 cursor-pointer items-center justify-center rounded-full border border-(--cui-color-stroke-default) bg-(--cui-color-background-default) transition-colors hover:border-(--cui-color-stroke-intense) hover:bg-(--cui-color-background-hover)"
-                  aria-label={`${localize('com_nav_user_menu')}, ${user?.name || user?.email || ''}`}
-                  aria-haspopup="true"
-                  title={user?.name || user?.email || ''}
-                >
-                  <span
-                    aria-hidden="true"
-                    className="text-xs font-medium text-(--cui-color-text-muted)"
+          <div className="flex shrink-0 items-center border-t border-(--cui-color-stroke-default) px-2 py-3">
+            <div
+              className={cn(
+                'flex items-center',
+                collapsed ? 'w-9 justify-center' : 'gap-2.5 px-0.5',
+              )}
+            >
+              <Dropdown>
+                <Dropdown.Trigger>
+                  <button
+                    ref={userMenuRef}
+                    type="button"
+                    className="flex h-8 w-8 shrink-0 cursor-pointer items-center justify-center rounded-full border border-(--cui-color-stroke-default) bg-(--cui-color-background-default) transition-colors hover:border-(--cui-color-stroke-intense) hover:bg-(--cui-color-background-hover)"
+                    aria-label={`${localize('com_nav_user_menu')}, ${user?.name || user?.email || ''}`}
+                    aria-haspopup="true"
+                    title={user?.name || user?.email || ''}
                   >
-                    {initials}
-                  </span>
-                </button>
-              </Dropdown.Trigger>
-              <Dropdown.Content>
-                <div className="user-dropdown flex min-w-45 flex-col select-none">
-                  {user && (
-                    <div className="px-3 pt-3 pb-2">
-                      <span className="block text-sm leading-tight font-medium text-(--cui-color-text-default)">
-                        {user.name || ''}
-                      </span>
-                      {user.email && (
-                        <span className="mt-0.5 block text-xs leading-tight text-(--cui-color-text-muted)">
-                          {user.email}
+                    <span
+                      aria-hidden="true"
+                      className="text-xs font-medium text-(--cui-color-text-muted)"
+                    >
+                      {initials}
+                    </span>
+                  </button>
+                </Dropdown.Trigger>
+                <Dropdown.Content>
+                  <div className="user-dropdown flex min-w-45 flex-col select-none">
+                    {user && (
+                      <div className="px-3 pt-3 pb-2">
+                        <span className="block text-sm leading-tight font-medium text-(--cui-color-text-default)">
+                          {user.name || ''}
                         </span>
-                      )}
-                    </div>
+                        {user.email && (
+                          <span className="mt-0.5 block text-xs leading-tight text-(--cui-color-text-muted)">
+                            {user.email}
+                          </span>
+                        )}
+                      </div>
+                    )}
+                    <div className="border-t border-(--cui-color-stroke-default)" />
+                    <Dropdown.Item icon="settings" onClick={() => setSettingsOpen(true)}>
+                      {localize('com_ui_settings')}
+                    </Dropdown.Item>
+                    <Dropdown.Item icon="slide-out" onClick={handleLogout} disabled={isLoggingOut}>
+                      {isLoggingOut ? localize('com_ui_signing_out') : localize('com_ui_sign_out')}
+                    </Dropdown.Item>
+                  </div>
+                </Dropdown.Content>
+              </Dropdown>
+              {!collapsed && user && (
+                <div className="min-w-0 flex-1">
+                  <span className="block truncate text-sm leading-tight font-medium text-(--cui-color-text-default)">
+                    {user.name || ''}
+                  </span>
+                  {user.email && (
+                    <span className="block truncate text-xs leading-tight text-(--cui-color-text-muted)">
+                      {user.email}
+                    </span>
                   )}
-                  <div className="border-t border-(--cui-color-stroke-default)" />
-                  <Dropdown.Item icon="settings" onClick={() => setSettingsOpen(true)}>
-                    {localize('com_ui_settings')}
-                  </Dropdown.Item>
-                  <Dropdown.Item icon="slide-out" onClick={handleLogout} disabled={isLoggingOut}>
-                    {isLoggingOut ? localize('com_ui_signing_out') : localize('com_ui_sign_out')}
-                  </Dropdown.Item>
                 </div>
-              </Dropdown.Content>
-            </Dropdown>
-            {!collapsed && user && (
-              <div className="ml-2 min-w-0 flex-1">
-                <span className="block truncate text-sm leading-tight font-medium text-(--cui-color-text-default)">
-                  {user.name || ''}
-                </span>
-                {user.email && (
-                  <span className="block truncate text-xs leading-tight text-(--cui-color-text-muted)">
-                    {user.email}
-                  </span>
-                )}
-              </div>
-            )}
+              )}
+            </div>
           </div>
         )}
+
+        <button
+          type="button"
+          onClick={onToggle}
+          aria-label={localize(collapsed ? 'com_nav_expand_sidebar' : 'com_nav_collapse_sidebar')}
+          title={localize(collapsed ? 'com_nav_expand_sidebar' : 'com_nav_collapse_sidebar')}
+          className="flex w-full shrink-0 cursor-pointer items-center justify-center border-t border-(--cui-color-stroke-default) bg-transparent py-3 text-(--cui-color-text-muted) transition-colors hover:bg-(--cui-color-background-hover) hover:text-(--cui-color-text-default)"
+        >
+          <Icon name={collapsed ? 'slide-in' : 'slide-out'} size="sm" />
+        </button>
       </aside>
 
       <SettingsDialog open={settingsOpen} onClose={() => setSettingsOpen(false)} />
diff --git a/src/components/configuration/ConfigPage.tsx b/src/components/configuration/ConfigPage.tsx
index 39a6aad..2bad3af 100644
--- a/src/components/configuration/ConfigPage.tsx
+++ b/src/components/configuration/ConfigPage.tsx
@@ -26,8 +26,8 @@ import {
   getTabsWithPermission,
 } from '@/utils';
 import { useLocalize, useHighlightRef, useActiveSection, useCapabilities } from '@/hooks';
-import { ScopeSelector, ScopeTriggerButton } from './ScopeSelector';
 import { CONFIG_TABS, OTHER_TAB, SECTION_META, HIDDEN_SECTIONS } from './configMeta';
+import { ScopeSelector, ScopeTriggerButton } from './ScopeSelector';
 import { ConfigTableOfContents } from './ConfigTableOfContents';
 import { ConfirmSaveDialog } from './ConfirmSaveDialog';
 import { StickyActionBar } from '@/components/shared';
diff --git a/src/components/configuration/ConfigTabContent.tsx b/src/components/configuration/ConfigTabContent.tsx
index aac6fe3..3163758 100644
--- a/src/components/configuration/ConfigTabContent.tsx
+++ b/src/components/configuration/ConfigTabContent.tsx
@@ -1,8 +1,9 @@
 import { useMemo } from 'react';
+import { MultiAccordion } from '@clickhouse/click-ui';
 import type * as t from '@/types';
+import { SECTION_RENDERERS, SELF_CONTAINED_SECTION_RENDERERS } from './sections';
 import { FieldRenderer, SingleFieldRenderer } from './FieldRenderer';
 import { ConfigSection } from './ConfigSection';
-import { SECTION_RENDERERS } from './sections';
 import { CodeField } from './fields/CodeField';
 import { isSectionDisabled } from '@/utils';
 import { InfoBanner } from './InfoBanner';
@@ -150,8 +151,6 @@ export function ConfigTabContent({
     );
   }
 
-  const isSoloTab = sections.length === 1;
-
   const renderSectionContent = (section: t.ConfigSectionConfig) => {
     const dataKey = section.schemaKey ?? section.id;
     const sectionValue = configValues?.[dataKey];
@@ -230,44 +229,88 @@ export function ConfigTabContent({
     );
   };
 
+  const isInlineSection = (section: t.ConfigSectionConfig): boolean =>
+    Boolean(
+      (section.sectionField && isSimpleScalar(section.sectionField)) ||
+        (section.fields.length === 1 && isSimpleScalar(section.fields[0])),
+    );
+
+  type SectionGroup =
+    | { kind: 'inline'; section: t.ConfigSectionConfig }
+    | { kind: 'accordion'; sections: t.ConfigSectionConfig[] }
+    | { kind: 'flat'; section: t.ConfigSectionConfig };
+
+  const groups = visibleSections.reduce<SectionGroup[]>((acc, section) => {
+    if (SELF_CONTAINED_SECTION_RENDERERS.has(section.id)) {
+      acc.push({ kind: 'flat', section });
+      return acc;
+    }
+    if (isInlineSection(section)) {
+      acc.push({ kind: 'inline', section });
+      return acc;
+    }
+    const last = acc[acc.length - 1];
+    if (last?.kind === 'accordion') {
+      last.sections.push(section);
+    } else {
+      acc.push({ kind: 'accordion', sections: [section] });
+    }
+    return acc;
+  }, []);
+
   return (
     <form
       aria-label={localize('com_nav_configuration')}
       onSubmit={(e) => e.preventDefault()}
       className="flex flex-col gap-6 py-4"
     >
-      {visibleSections.map((section) => {
-        if (isSoloTab) {
+      {groups.map((group) => {
+        if (group.kind === 'flat') {
           return (
-            <div
+            <div key={group.section.id} id={`section-${group.section.id}`}>
+              {renderSectionContent(group.section)}
+            </div>
+          );
+        }
+        if (group.kind === 'inline') {
+          const { section } = group;
+          const counts = countsById[section.id];
+          return (
+            <ConfigSection
               key={section.id}
-              id={`section-${section.id}`}
-              data-section-id={`section-${section.id}`}
+              sectionId={section.id}
+              title={localize(section.titleKey)}
+              description={section.descriptionKey ? localize(section.descriptionKey) : undefined}
+              learnMoreUrl={section.learnMoreUrl}
+              configuredCount={counts?.configured ?? 0}
+              totalCount={counts?.total ?? 0}
+              inline
+              showConfiguredOnly={showConfiguredOnly}
             >
               {renderSectionContent(section)}
-            </div>
+            </ConfigSection>
           );
         }
-
-        const counts = countsById[section.id];
-        const isInline =
-          (section.sectionField && isSimpleScalar(section.sectionField)) ||
-          (section.fields.length === 1 && isSimpleScalar(section.fields[0]));
-
         return (
-          <ConfigSection
-            key={section.id}
-            sectionId={section.id}
-            title={localize(section.titleKey)}
-            description={section.descriptionKey ? localize(section.descriptionKey) : undefined}
-            learnMoreUrl={section.learnMoreUrl}
-            configuredCount={counts?.configured ?? 0}
-            totalCount={counts?.total ?? 0}
-            inline={isInline}
-            showConfiguredOnly={showConfiguredOnly}
+          <MultiAccordion
+            key={group.sections[0].id}
+            type="multiple"
+            showBorder
+            showCheck={false}
+            fillWidth
+            defaultValue={group.sections.map((s) => s.id)}
+            data-top-level-accordion
           >
-            {renderSectionContent(section)}
-          </ConfigSection>
+            {group.sections.map((section) => (
+              <MultiAccordion.Item
+                key={section.id}
+                value={section.id}
+                title={localize(section.titleKey)}
+              >
+                {renderSectionContent(section)}
+              </MultiAccordion.Item>
+            ))}
+          </MultiAccordion>
         );
       })}
     </form>
diff --git a/src/components/configuration/ContentToolbar.tsx b/src/components/configuration/ContentToolbar.tsx
index 9a83fa6..dd32e45 100644
--- a/src/components/configuration/ContentToolbar.tsx
+++ b/src/components/configuration/ContentToolbar.tsx
@@ -1,27 +1,33 @@
 import { Icon } from '@clickhouse/click-ui';
-import { useState, useCallback, useRef } from 'react';
+import { useState, useCallback } from 'react';
 import type * as t from '@/types';
 import { useLocalize } from '@/hooks';
 
 const BTN =
   'flex cursor-pointer items-center gap-1 rounded border-none bg-transparent px-1.5 py-0.5 text-xs text-(--cui-color-text-muted) transition-colors hover:bg-(--cui-color-background-hover) hover:text-(--cui-color-text-default)';
 
-function dispatchExpandAll(container: HTMLElement, abortRef: { current: boolean }, wave = 0) {
-  if (abortRef.current || wave > 5) return;
-  const closed = container.querySelectorAll('.config-section-grid-closed');
-  if (closed.length === 0) return;
-  for (const grid of closed) {
-    const section = grid.closest('section');
-    if (section) section.dispatchEvent(new Event('config:expand'));
+function clickAccordionTrigger(item: Element) {
+  const trigger = item.querySelector<HTMLButtonElement>(':scope > button');
+  if (trigger) {
+    trigger.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
   }
-  setTimeout(() => dispatchExpandAll(container, abortRef, wave + 1), 300);
 }
 
-function dispatchCollapseAll(container: HTMLElement) {
-  const open = container.querySelectorAll('.config-section-grid-open');
-  for (const grid of open) {
-    const section = grid.closest('section');
-    if (section) section.dispatchEvent(new Event('config:collapse'));
+function expandTopLevelAccordions(container: HTMLElement) {
+  const roots = container.querySelectorAll('[data-top-level-accordion]');
+  for (const root of roots) {
+    for (const item of root.querySelectorAll(':scope > [data-state="closed"]')) {
+      clickAccordionTrigger(item);
+    }
+  }
+}
+
+function collapseTopLevelAccordions(container: HTMLElement) {
+  const roots = container.querySelectorAll('[data-top-level-accordion]');
+  for (const root of roots) {
+    for (const item of root.querySelectorAll(':scope > [data-state="open"]')) {
+      clickAccordionTrigger(item);
+    }
   }
 }
 
@@ -33,18 +39,15 @@ export function ContentToolbar({
 }: t.ContentToolbarProps) {
   const localize = useLocalize();
   const [collapsed, setCollapsed] = useState(false);
-  const expandAbortRef = useRef(false);
 
   const handleExpandAll = useCallback(() => {
     if (!scrollContainer) return;
-    expandAbortRef.current = false;
-    dispatchExpandAll(scrollContainer, expandAbortRef);
+    expandTopLevelAccordions(scrollContainer);
   }, [scrollContainer]);
 
   const handleCollapseAll = useCallback(() => {
     if (!scrollContainer) return;
-    expandAbortRef.current = true;
-    dispatchCollapseAll(scrollContainer);
+    collapseTopLevelAccordions(scrollContainer);
     scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
   }, [scrollContainer]);
 
diff --git a/src/components/configuration/ImportYamlDialog.tsx b/src/components/configuration/ImportYamlDialog.tsx
index 6e79805..4f67130 100644
--- a/src/components/configuration/ImportYamlDialog.tsx
+++ b/src/components/configuration/ImportYamlDialog.tsx
@@ -221,7 +221,7 @@ export function ImportYamlDialog({
                   <Tabs.Trigger value="paste">{localize('com_config_import_paste')}</Tabs.Trigger>
                 </Tabs.TriggersList>
 
-                <Tabs.Content value="upload">
+                <Tabs.Content value="upload" tabIndex={-1}>
                   <div className="flex flex-col gap-3 pt-3">
                     <input
                       ref={fileInputRef}
@@ -254,7 +254,7 @@ export function ImportYamlDialog({
                   </div>
                 </Tabs.Content>
 
-                <Tabs.Content value="paste">
+                <Tabs.Content value="paste" tabIndex={-1}>
                   <div className="pt-3">
                     <textarea
                       value={yamlText}
diff --git a/src/components/configuration/localization.test.ts b/src/components/configuration/localization.test.ts
index d4d7236..9319f1c 100644
--- a/src/components/configuration/localization.test.ts
+++ b/src/components/configuration/localization.test.ts
@@ -5,8 +5,8 @@
  */
 import { describe, it, expect } from 'vitest';
 import { configSchema } from 'librechat-data-provider';
-import { extractSchemaTree, flattenTree } from '@/server/config';
 import type { ZodSchemaLike } from '@/types/config';
+import { extractSchemaTree, flattenTree } from '@/server/config';
 import translation from '@/locales/en/translation.json';
 
 const localeKeys = new Set(Object.keys(translation));
diff --git a/src/components/configuration/sections/EndpointsRenderer.tsx b/src/components/configuration/sections/EndpointsRenderer.tsx
index 40044ed..e1f19e0 100644
--- a/src/components/configuration/sections/EndpointsRenderer.tsx
+++ b/src/components/configuration/sections/EndpointsRenderer.tsx
@@ -15,7 +15,7 @@
  */
 
 import { useMemo, useState } from 'react';
-import { Icon } from '@clickhouse/click-ui';
+import { Icon, MultiAccordion } from '@clickhouse/click-ui';
 import type { ReactNode } from 'react';
 import type * as t from '@/types';
 import { FieldRenderer, NestedGroup, renderInlineField } from '../FieldRenderer';
@@ -105,87 +105,11 @@ function withRequired(field: t.SchemaField): t.SchemaField {
 }
 
 // ---------------------------------------------------------------------------
-// CollapsibleEndpointSection — shared header + collapsible wrapper
+// Shared props type
 // ---------------------------------------------------------------------------
 
 type SharedProps = Omit<t.FieldRendererProps, 'fields' | 'parentPath'>;
 
-function CollapsibleEndpointSection({
-  sectionId,
-  label,
-  total,
-  configured,
-  defaultExpanded,
-  onAdd,
-  addLabel,
-  children,
-}: {
-  sectionId: string;
-  label: string;
-  total: number;
-  configured: number;
-  defaultExpanded: boolean;
-  /** When provided, renders a "+ Add entry" button in the header. */
-  onAdd?: () => void;
-  addLabel?: string;
-  children: React.ReactNode;
-}) {
-  const localize = useLocalize();
-  const hasConfigured = configured > 0;
-
-  const { isExpanded, hasEverExpanded, sectionRef, toggle, handleAddClick } = useCollapsibleSection(
-    { defaultExpanded, onAdd },
-  );
-
-  return (
-    <section ref={sectionRef} id={sectionId} aria-label={label} className="flex w-full flex-col">
-      <div className="sticky top-0 z-(--z-sticky) flex w-full items-center gap-4 rounded-lg bg-(--cui-color-background-panel) px-0">
-        <button
-          type="button"
-          aria-expanded={isExpanded}
-          data-section-id={sectionId}
-          onClick={toggle}
-          className="flex flex-1 cursor-pointer items-center gap-2 rounded-lg border-none bg-transparent py-2.5 pr-0 pl-1 text-left transition-colors outline-none select-none hover:bg-(--cui-color-background-hover) focus-visible:bg-(--cui-color-background-hover)"
-        >
-          <span
-            className={cn(
-              'flex shrink-0 items-center justify-center transition-transform duration-200',
-              isExpanded && 'rotate-90',
-            )}
-          >
-            <Icon name="chevron-right" size="sm" />
-          </span>
-          <span className="text-sm font-semibold text-(--cui-color-text-default)">{label}</span>
-          {total > 0 && (
-            <span
-              className={cn(
-                'config-count-badge',
-                hasConfigured ? 'config-count-badge-active' : 'config-count-badge-muted',
-              )}
-            >
-              {configured}/{total}
-            </span>
-          )}
-        </button>
-        {onAdd && (
-          <button
-            type="button"
-            onClick={handleAddClick}
-            aria-label={addLabel ?? localize('com_a11y_add_item', { name: label })}
-            className="config-add-btn"
-          >
-            <Icon name="plus" size="sm" />
-            <span>
-              {addLabel ?? localize('com_ui_add_item', { item: localize('com_ui_entry') })}
-            </span>
-          </button>
-        )}
-      </div>
-      {renderCollapsible(isExpanded, hasEverExpanded, children)}
-    </section>
-  );
-}
-
 // ---------------------------------------------------------------------------
 // GroupedFieldRenderer — renders fields organized into collapsible groups
 // ---------------------------------------------------------------------------
@@ -600,7 +524,6 @@ function ProviderSection({
   }, 0);
 
   const label = localize(`com_config_field_${field.key}`);
-  const sectionId = `section-${path}`;
 
   const rendererProps: Omit<t.FieldRendererProps, 'fields'> = {
     parentValue: providerValue,
@@ -624,43 +547,42 @@ function ProviderSection({
     showChangedOnly,
   };
 
-  if (!hasPrioritySplit) {
-    return (
-      <CollapsibleEndpointSection
-        sectionId={sectionId}
-        label={label}
-        total={total}
-        configured={configured}
-        defaultExpanded={configured > 0}
-      >
-        <FieldRenderer fields={children} {...rendererProps} />
-      </CollapsibleEndpointSection>
-    );
-  }
+  const title = (
+    <span className="flex items-center gap-2">
+      {label}
+      {total > 0 && (
+        <span
+          className={cn(
+            'config-count-badge',
+            configured > 0 ? 'config-count-badge-active' : 'config-count-badge-muted',
+          )}
+        >
+          {configured}/{total}
+        </span>
+      )}
+    </span>
+  );
 
   return (
-    <CollapsibleEndpointSection
-      sectionId={sectionId}
-      label={label}
-      total={total}
-      configured={configured}
-      defaultExpanded={configured > 0}
-    >
-      {/* Priority fields — always rendered at the top */}
-      <FieldRenderer fields={priorityChildren} {...rendererProps} alwaysShowLabels />
-
-      {/* Remaining fields — lazily revealed under "More settings" */}
-      {restChildren.length > 0 && (
-        <NestedGroup
-          label={localize('com_config_more_settings')}
-          totalCount={restChildren.length}
-          configuredCount={restConfigured}
-          depth={2}
-        >
-          <FieldRenderer fields={restChildren} {...rendererProps} />
-        </NestedGroup>
+    <MultiAccordion.Item id={`section-${path}`} value={path} title={title}>
+      {hasPrioritySplit ? (
+        <>
+          <FieldRenderer fields={priorityChildren} {...rendererProps} alwaysShowLabels />
+          {restChildren.length > 0 && (
+            <NestedGroup
+              label={localize('com_config_more_settings')}
+              totalCount={restChildren.length}
+              configuredCount={restConfigured}
+              depth={2}
+            >
+              <FieldRenderer fields={restChildren} {...rendererProps} />
+            </NestedGroup>
+          )}
+        </>
+      ) : (
+        <FieldRenderer fields={children} {...rendererProps} />
       )}
-    </CollapsibleEndpointSection>
+    </MultiAccordion.Item>
   );
 }
 
@@ -798,11 +720,31 @@ export function ProvidersRenderer(props: t.FieldRendererProps) {
       })
     : providerFields;
 
+  const defaultOpen = visibleProviders
+    .filter((f) => {
+      const { configured } = countConfigured(
+        f.children ?? [],
+        `${parentPath}.${f.key}`,
+        configuredPaths,
+      );
+      return configured > 0;
+    })
+    .map((f) => `${parentPath}.${f.key}`);
+
   return (
     <div className="flex flex-col gap-2">
-      {visibleProviders.map((field) => (
-        <ProviderSection key={field.key} field={field} {...sharedProps} />
-      ))}
+      <MultiAccordion
+        type="multiple"
+        showBorder
+        showCheck={false}
+        fillWidth
+        defaultValue={defaultOpen}
+        data-top-level-accordion
+      >
+        {visibleProviders.map((field) => (
+          <ProviderSection key={field.key} field={field} {...sharedProps} />
+        ))}
+      </MultiAccordion>
 
       {otherFields.length > 0 && <FieldRenderer fields={otherFields} {...sharedProps} />}
     </div>
diff --git a/src/components/configuration/sections/index.ts b/src/components/configuration/sections/index.ts
index 6c36595..f3837de 100644
--- a/src/components/configuration/sections/index.ts
+++ b/src/components/configuration/sections/index.ts
@@ -20,3 +20,7 @@ export const SECTION_RENDERERS: Partial<Record<string, React.ComponentType<t.Fie
     endpointsProviders: ProvidersRenderer,
     mcpServers: McpServersRenderer,
   };
+
+/** Sections whose custom renderer handles its own accordion — they are rendered
+ *  directly in ConfigTabContent without an outer MultiAccordion.Item wrapper. */
+export const SELF_CONTAINED_SECTION_RENDERERS = new Set(['endpointsProviders']);
diff --git a/src/components/dashboard/DashboardPage.tsx b/src/components/dashboard/DashboardPage.tsx
index 3037c0c..3650731 100644
--- a/src/components/dashboard/DashboardPage.tsx
+++ b/src/components/dashboard/DashboardPage.tsx
@@ -86,7 +86,7 @@ export function DashboardPage() {
 
       <section
         aria-label={localize('com_dash_nav_tips')}
-        className="max-w-lg rounded-lg border border-(--cui-color-stroke-default) bg-(--cui-color-background-panel) p-5"
+        className="rounded-lg border border-(--cui-color-stroke-default) bg-(--cui-color-background-panel) p-5"
       >
         <h3 className="mb-3 text-sm font-medium text-(--cui-color-text-default)">
           {localize('com_dash_nav_tips')}
diff --git a/src/components/help/HelpPage.tsx b/src/components/help/HelpPage.tsx
index 6bfc444..7e14b95 100644
--- a/src/components/help/HelpPage.tsx
+++ b/src/components/help/HelpPage.tsx
@@ -41,7 +41,7 @@ export function HelpPage() {
         <h3 className="mb-3 text-sm font-medium text-(--cui-color-title-muted)">
           {localize('com_help_resources')}
         </h3>
-        <div className="grid grid-cols-[repeat(auto-fill,minmax(260px,1fr))] gap-3">
+        <div className="flex flex-col gap-3">
           {RESOURCES.map((resource) => (
             <a
               key={resource.titleKey}
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index e81c923..c58fe46 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -878,7 +878,7 @@
   "com_perm_VIEW_GROUPS": "View groups",
   "com_perm_VIEW_ROLES": "View roles",
   "com_perm_SHARE_PUBLIC": "Share publicly",
-  "com_help_title": "Help & support",
+  "com_help_title": "Help",
   "com_help_subtitle": "Documentation, guides, and support resources",
   "com_help_resources": "Resources",
   "com_help_docs_title": "Documentation",
@@ -1003,7 +1003,7 @@
   "com_dash_help_desc": "Links to documentation, community resources, and support channels to help you get the most out of LibreChat.",
   "com_dash_nav_tips": "Getting around",
   "com_dash_tip_sidebar": "The sidebar gives you access to every page: Configuration, Access, Grants, and Help. Toggle it open to see labels or collapse it down to just icons.",
-  "com_dash_tip_cmdk": "The command menu lets you search for and jump to any page, configuration section, or config tab. You can also switch between light, dark, and system themes without navigating away.",
+  "com_dash_tip_cmdk": "The command menu lets you search for and jump to any page, configuration section, or config tab. You can also switch between light, dark, and system themes within the menu.",
   "com_grants_title": "System grants",
   "com_grants_subtitle": "Manage system-level capabilities by role",
   "com_grants_tab_management": "Management",
diff --git a/src/routes/_app.tsx b/src/routes/_app.tsx
index a5258c5..4080ddb 100644
--- a/src/routes/_app.tsx
+++ b/src/routes/_app.tsx
@@ -8,7 +8,7 @@ import { AccessDenied } from '@/components/shared';
 import { SystemCapabilities } from '@/constants';
 import { Sidebar } from '@/components/Sidebar';
 import { verifyAdminTokenFn } from '@/server';
-import Header from '@/components/Header';
+import { Header } from '@/components/Header';
 
 const ROUTE_TITLE_KEYS: Record<string, string> = {
   '/': 'com_dash_title',
@@ -19,14 +19,6 @@ const ROUTE_TITLE_KEYS: Record<string, string> = {
   '/help': 'com_help_title',
 };
 
-const ROUTE_DESCRIPTION_KEYS: Record<string, string> = {
-  '/': 'com_dash_subtitle',
-  '/configuration': 'com_config_subtitle',
-  '/users': 'com_users_subtitle',
-  '/access': 'com_access_subtitle',
-  '/grants': 'com_grants_subtitle',
-  '/help': 'com_help_subtitle',
-};
 
 export const Route = createFileRoute('/_app')({
   beforeLoad: async ({ location }) => {
@@ -52,7 +44,10 @@ function AppLayout() {
   const router = useRouter();
   const localize = useLocalize();
   const { open, setOpen } = useCommandMenu();
-  const [sidebarCollapsed, setSidebarCollapsed] = useState(true);
+  const [sidebarCollapsed, setSidebarCollapsed] = useState(() => {
+    const stored = localStorage.getItem('admin-panel:sidebar-collapsed');
+    return stored !== null ? stored === 'true' : true;
+  });
   const pathname = router.state.location.pathname;
 
   if (!isLoading && !isError && !hasCapability(SystemCapabilities.ACCESS_ADMIN)) {
@@ -63,12 +58,13 @@ function AppLayout() {
     route === '/' ? pathname === '/' : pathname.startsWith(route),
   );
   const title = matchedKey ? localize(ROUTE_TITLE_KEYS[matchedKey]) : undefined;
-  const description =
-    matchedKey && ROUTE_DESCRIPTION_KEYS[matchedKey]
-      ? localize(ROUTE_DESCRIPTION_KEYS[matchedKey])
-      : undefined;
 
-  const toggleSidebar = () => setSidebarCollapsed((prev) => !prev);
+  const toggleSidebar = () =>
+    setSidebarCollapsed((prev) => {
+      const next = !prev;
+      localStorage.setItem('admin-panel:sidebar-collapsed', String(next));
+      return next;
+    });
 
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
@@ -85,7 +81,7 @@ function AppLayout() {
     <div className="flex h-screen overflow-hidden">
       <Sidebar user={user} collapsed={sidebarCollapsed} onToggle={toggleSidebar} />
       <div className="flex min-w-0 flex-1 flex-col">
-        <Header title={title} description={description} onSearchClick={() => setOpen(true)} />
+        <Header title={title} onSearchClick={() => setOpen(true)} />
         <main className="flex min-h-0 flex-1 flex-col overflow-auto">
           <Outlet />
         </main>
diff --git a/src/types/layout.ts b/src/types/layout.ts
index 6593a2e..7563e57 100644
--- a/src/types/layout.ts
+++ b/src/types/layout.ts
@@ -19,7 +19,6 @@ export interface NavItem {
 
 export interface HeaderProps {
   title?: string;
-  description?: string;
   onSearchClick?: () => void;
   children?: ReactNode;
 }