diff --git a/AgentCompany-New/src/main/services/organization-service.ts b/AgentCompany-New/src/main/services/organization-service.ts
index 8b395001..7d88fd3b 100644
--- a/AgentCompany-New/src/main/services/organization-service.ts
+++ b/AgentCompany-New/src/main/services/organization-service.ts
@@ -116,14 +116,14 @@ export class OrganizationService {
       .get(orgId) as { id: string } | undefined;
     if (!row) throw new Error("Organization was not found.");
     this.db.prepare("delete from organizations where id = ?").run(orgId);
-    const fallback = this.db.prepare("select id from organizations order by created_at asc limit 1")
+    const nextActive = this.db.prepare("select id from organizations order by created_at asc limit 1")
       .get() as { id: string } | undefined;
     const now = new Date().toISOString();
     this.db.prepare(`
       insert into app_state(id, active_org_id, updated_at)
       values (1, ?, ?)
       on conflict(id) do update set active_org_id = excluded.active_org_id, updated_at = excluded.updated_at
-    `).run(fallback?.id ?? null, now);
+    `).run(nextActive?.id ?? null, now);
   }
 
   createAgent(input: CreateAgentInput): string {
diff --git a/AgentCompany-New/src/renderer/src/main.tsx b/AgentCompany-New/src/renderer/src/main.tsx
index c00ce859..1601748a 100644
--- a/AgentCompany-New/src/renderer/src/main.tsx
+++ b/AgentCompany-New/src/renderer/src/main.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import ReactDOM from "react-dom/client";
 import { App } from "./app/App";
 import "./styles.css";
+import "./overlays.css";
 
 ReactDOM.createRoot(document.getElementById("root")!).render(
   <React.StrictMode>
diff --git a/AgentCompany-New/src/renderer/src/overlays.css b/AgentCompany-New/src/renderer/src/overlays.css
new file mode 100644
index 00000000..b3cdbcdb
--- /dev/null
+++ b/AgentCompany-New/src/renderer/src/overlays.css
@@ -0,0 +1,95 @@
+.modal-backdrop {
+  position: fixed;
+  inset: 0;
+  z-index: 40;
+  background: rgba(9, 9, 11, 0.22);
+  display: grid;
+  place-items: center;
+  padding: 24px;
+}
+.modal {
+  width: min(520px, 100%);
+  max-height: min(760px, 100%);
+  overflow: auto;
+  border: 1px solid var(--border);
+  border-radius: 14px;
+  background: var(--panel);
+  box-shadow: 0 20px 60px rgba(9, 9, 11, 0.18);
+  padding: 20px;
+}
+.modal-title { margin: 0 0 14px; font-size: 16px; font-weight: 620; letter-spacing: -0.01em; }
+.modal-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 18px; }
+
+.onboarding-shell {
+  width: 100%;
+  min-height: 100%;
+  display: grid;
+  grid-template-columns: minmax(0, 1.05fr) minmax(420px, 0.95fr);
+  background: var(--bg);
+}
+.onboarding-hero {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding: 58px;
+  border-right: 1px solid var(--border-soft);
+}
+.onboarding-panel {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding: 48px;
+  background: var(--panel);
+}
+.onboarding-steps { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 28px; }
+.step-chip {
+  height: 24px;
+  border: 1px solid var(--border);
+  border-radius: 999px;
+  padding: 0 9px;
+  display: inline-flex;
+  align-items: center;
+  color: var(--text-3);
+  background: var(--panel);
+  font-size: 11px;
+}
+.step-chip.active { color: var(--text-1); border-color: var(--text-1); }
+.form-grid { display: grid; gap: 14px; }
+.option-grid { display: grid; gap: 8px; }
+.option-card {
+  border: 1px solid var(--border);
+  border-radius: var(--r-md);
+  background: var(--panel);
+  padding: 14px;
+  text-align: left;
+  cursor: pointer;
+  width: 100%;
+}
+.option-card:hover { border-color: var(--border-strong); }
+.option-card.active { border-color: var(--text-1); box-shadow: inset 0 0 0 1px var(--text-1); }
+.option-card .opt-title { font-size: 13.5px; font-weight: 540; }
+.option-card .opt-sub { font-size: 12px; color: var(--text-3); margin-top: 4px; }
+
+::-webkit-scrollbar { width: 8px; height: 8px; }
+::-webkit-scrollbar-thumb { background: var(--border-strong); border-radius: 4px; }
+::-webkit-scrollbar-track { background: transparent; }
+
+@media (max-width: 1100px) {
+  .content { padding: 24px 24px 36px; }
+}
+@media (max-width: 980px) {
+  .sidebar { width: 64px; }
+  .sidebar .brand-name,
+  .sidebar .nav-item span:not(.nav-badge),
+  .sidebar-foot-name,
+  .sidebar .search-bar > span:not(.search-kbd) { display: none; }
+  .sidebar .search-bar { justify-content: center; padding: 6px; }
+  .sidebar .search-kbd { display: none; }
+  .content { padding: 20px 18px 32px; }
+  .secondary-pane { width: 180px; }
+  .onboarding-shell { grid-template-columns: 1fr; }
+  .onboarding-hero { padding: 28px; border-right: 0; border-bottom: 1px solid var(--border-soft); }
+  .onboarding-panel { padding: 28px; justify-content: flex-start; }
+}
diff --git a/AgentCompany-New/src/renderer/src/pages/ChatPage.tsx b/AgentCompany-New/src/renderer/src/pages/ChatPage.tsx
index 4cdca104..d8b4532d 100644
--- a/AgentCompany-New/src/renderer/src/pages/ChatPage.tsx
+++ b/AgentCompany-New/src/renderer/src/pages/ChatPage.tsx
@@ -41,10 +41,10 @@ export function ChatPage({ snapshot, actions }: PageProps) {
   const [attachmentFileId, setAttachmentFileId] = useState<string>("");
   const composerRef = useRef<HTMLTextAreaElement | null>(null);
 
-  const fallbackSpaceId = channels[0]?.id ?? directs[0]?.id ?? null;
+  const firstAvailableSpaceId = channels[0]?.id ?? directs[0]?.id ?? null;
   const activeSpaceId = selectedSpaceId && spaces.some((space) => space.id === selectedSpaceId)
     ? selectedSpaceId
-    : fallbackSpaceId;
+    : firstAvailableSpaceId;
   const activeSpace = spaces.find((space) => space.id === activeSpaceId) ?? null;
   const latestActiveMessageId = useMemo(() => {
     if (!activeSpaceId) return null;
diff --git a/AgentCompany-New/src/renderer/src/shared/ui.tsx b/AgentCompany-New/src/renderer/src/shared/ui.tsx
index 8cbb146a..fcb27e2a 100644
--- a/AgentCompany-New/src/renderer/src/shared/ui.tsx
+++ b/AgentCompany-New/src/renderer/src/shared/ui.tsx
@@ -19,9 +19,10 @@ function hashName(value: string): number {
 }
 
 function paletteFor(name: string): readonly [string, string] {
-  const fallback = palette[0];
-  if (!fallback) throw new Error("Avatar palette is empty.");
-  return palette[hashName(name) % palette.length] ?? fallback;
+  if (palette.length === 0) throw new Error("Avatar palette is empty.");
+  const selected = palette[hashName(name) % palette.length];
+  if (!selected) throw new Error("Avatar palette selection failed.");
+  return selected;
 }
 
 function initials(name: string): string {
diff --git a/AgentCompany-New/src/renderer/src/styles.css b/AgentCompany-New/src/renderer/src/styles.css
index 37085440..ee93a492 100644
--- a/AgentCompany-New/src/renderer/src/styles.css
+++ b/AgentCompany-New/src/renderer/src/styles.css
@@ -488,28 +488,6 @@ textarea.input { min-height: 84px; resize: vertical; line-height: 1.5; }
 }
 .table-row:last-child { border-bottom: 0; }
 
-.modal-backdrop {
-  position: fixed;
-  inset: 0;
-  z-index: 40;
-  background: rgba(9, 9, 11, 0.22);
-  display: grid;
-  place-items: center;
-  padding: 24px;
-}
-.modal {
-  width: min(520px, 100%);
-  max-height: min(760px, 100%);
-  overflow: auto;
-  border: 1px solid var(--border);
-  border-radius: 14px;
-  background: var(--panel);
-  box-shadow: 0 20px 60px rgba(9, 9, 11, 0.18);
-  padding: 20px;
-}
-.modal-title { margin: 0 0 14px; font-size: 16px; font-weight: 620; letter-spacing: -0.01em; }
-.modal-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 18px; }
-
 .split-main { display: flex; flex-direction: row; min-height: 0; flex: 1; }
 .secondary-pane {
   width: 240px;
@@ -522,77 +500,3 @@ textarea.input { min-height: 84px; resize: vertical; line-height: 1.5; }
   gap: 2px;
   min-height: 0;
 }
-
-.onboarding-shell {
-  width: 100%;
-  min-height: 100%;
-  display: grid;
-  grid-template-columns: minmax(0, 1.05fr) minmax(420px, 0.95fr);
-  background: var(--bg);
-}
-.onboarding-hero {
-  min-width: 0;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  padding: 58px;
-  border-right: 1px solid var(--border-soft);
-}
-.onboarding-panel {
-  min-width: 0;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  padding: 48px;
-  background: var(--panel);
-}
-.onboarding-steps { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 28px; }
-.step-chip {
-  height: 24px;
-  border: 1px solid var(--border);
-  border-radius: 999px;
-  padding: 0 9px;
-  display: inline-flex;
-  align-items: center;
-  color: var(--text-3);
-  background: var(--panel);
-  font-size: 11px;
-}
-.step-chip.active { color: var(--text-1); border-color: var(--text-1); }
-.form-grid { display: grid; gap: 14px; }
-.option-grid { display: grid; gap: 8px; }
-.option-card {
-  border: 1px solid var(--border);
-  border-radius: var(--r-md);
-  background: var(--panel);
-  padding: 14px;
-  text-align: left;
-  cursor: pointer;
-  width: 100%;
-}
-.option-card:hover { border-color: var(--border-strong); }
-.option-card.active { border-color: var(--text-1); box-shadow: inset 0 0 0 1px var(--text-1); }
-.option-card .opt-title { font-size: 13.5px; font-weight: 540; }
-.option-card .opt-sub { font-size: 12px; color: var(--text-3); margin-top: 4px; }
-
-::-webkit-scrollbar { width: 8px; height: 8px; }
-::-webkit-scrollbar-thumb { background: var(--border-strong); border-radius: 4px; }
-::-webkit-scrollbar-track { background: transparent; }
-
-@media (max-width: 1100px) {
-  .content { padding: 24px 24px 36px; }
-}
-@media (max-width: 980px) {
-  .sidebar { width: 64px; }
-  .sidebar .brand-name,
-  .sidebar .nav-item span:not(.nav-badge),
-  .sidebar-foot-name,
-  .sidebar .search-bar > span:not(.search-kbd) { display: none; }
-  .sidebar .search-bar { justify-content: center; padding: 6px; }
-  .sidebar .search-kbd { display: none; }
-  .content { padding: 20px 18px 32px; }
-  .secondary-pane { width: 180px; }
-  .onboarding-shell { grid-template-columns: 1fr; }
-  .onboarding-hero { padding: 28px; border-right: 0; border-bottom: 1px solid var(--border-soft); }
-  .onboarding-panel { padding: 28px; justify-content: flex-start; }
-}