diff --git a/apps/web/src/components/SortableGroup.tsx b/apps/web/src/components/SortableGroup.tsx
index c0dd3d7..97ece43 100644
--- a/apps/web/src/components/SortableGroup.tsx
+++ b/apps/web/src/components/SortableGroup.tsx
@@ -4,6 +4,7 @@
  */
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
+import { useLingui } from "@lingui/react/macro";
 import { createContext, memo, useContext, useMemo } from "react";
 
 interface SortableGroupProps {
@@ -30,13 +31,14 @@ export const ProjectDragGrip = memo(function ProjectDragGrip({
   className?: string;
   children: React.ReactNode;
 }) {
+  const { t } = useLingui();
   const handle = useSortableGroupHandle();
   return (
     <button
       type="button"
       ref={handle?.setActivatorNodeRef}
       className={className}
-      aria-label="Drag to reorder"
+      aria-label={t`Drag to reorder`}
       {...handle?.attributes}
       {...handle?.listeners}
     >
diff --git a/apps/web/src/locales/de/messages.po b/apps/web/src/locales/de/messages.po
index 866ca49..6bea333 100644
--- a/apps/web/src/locales/de/messages.po
+++ b/apps/web/src/locales/de/messages.po
@@ -2100,6 +2100,10 @@ msgstr "Skill-Entwurf"
 msgid "Drafting the spec…"
 msgstr "Entwerfe die Spezifikation…"
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr "Ziehen zum Umsortieren"
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "Bild ziehen, ablegen oder einfügen"
diff --git a/apps/web/src/locales/en/messages.po b/apps/web/src/locales/en/messages.po
index 8079236..4cc014b 100644
--- a/apps/web/src/locales/en/messages.po
+++ b/apps/web/src/locales/en/messages.po
@@ -2100,6 +2100,10 @@ msgstr "Draft skill"
 msgid "Drafting the spec…"
 msgstr "Drafting the spec…"
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr "Drag to reorder"
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "Drag, drop, or paste an image"
diff --git a/apps/web/src/locales/es/messages.po b/apps/web/src/locales/es/messages.po
index 47838ae..b053216 100644
--- a/apps/web/src/locales/es/messages.po
+++ b/apps/web/src/locales/es/messages.po
@@ -2100,6 +2100,10 @@ msgstr "Habilidad en borrador"
 msgid "Drafting the spec…"
 msgstr ""
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr ""
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "Arrastra, suelta o pega una imagen"
diff --git a/apps/web/src/locales/hi/messages.po b/apps/web/src/locales/hi/messages.po
index c5ffae2..e29b22d 100644
--- a/apps/web/src/locales/hi/messages.po
+++ b/apps/web/src/locales/hi/messages.po
@@ -2100,6 +2100,10 @@ msgstr "ड्राफ़्ट स्किल"
 msgid "Drafting the spec…"
 msgstr ""
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr ""
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "छवि खींचें, छोड़ें या पेस्ट करें"
diff --git a/apps/web/src/locales/ko/messages.po b/apps/web/src/locales/ko/messages.po
index fae0c11..63efe4b 100644
--- a/apps/web/src/locales/ko/messages.po
+++ b/apps/web/src/locales/ko/messages.po
@@ -2100,6 +2100,10 @@ msgstr "작업 기술 초안"
 msgid "Drafting the spec…"
 msgstr ""
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr ""
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "이미지를 끌어다 놓거나 붙여넣으세요"
diff --git a/apps/web/src/locales/pt-BR/messages.po b/apps/web/src/locales/pt-BR/messages.po
index 999a86b..f39dadb 100644
--- a/apps/web/src/locales/pt-BR/messages.po
+++ b/apps/web/src/locales/pt-BR/messages.po
@@ -2100,6 +2100,10 @@ msgstr "Habilidade de rascunho"
 msgid "Drafting the spec…"
 msgstr ""
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr ""
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "Arraste, solte ou cole uma imagem"
diff --git a/apps/web/src/locales/ru/messages.po b/apps/web/src/locales/ru/messages.po
index 4fd95f9..c708afe 100644
--- a/apps/web/src/locales/ru/messages.po
+++ b/apps/web/src/locales/ru/messages.po
@@ -2100,6 +2100,10 @@ msgstr "Черновик навыка"
 msgid "Drafting the spec…"
 msgstr ""
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr ""
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "Перетащите или вставьте изображение"
diff --git a/apps/web/src/locales/tr/messages.po b/apps/web/src/locales/tr/messages.po
index 316c1ce..a0c39f2 100644
--- a/apps/web/src/locales/tr/messages.po
+++ b/apps/web/src/locales/tr/messages.po
@@ -2100,6 +2100,10 @@ msgstr "Taslak beceri"
 msgid "Drafting the spec…"
 msgstr ""
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr ""
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "Görüntüyü sürükleyip bırakın veya yapıştırın"
diff --git a/apps/web/src/locales/zh-CN/messages.po b/apps/web/src/locales/zh-CN/messages.po
index 62d2810..f119a92 100644
--- a/apps/web/src/locales/zh-CN/messages.po
+++ b/apps/web/src/locales/zh-CN/messages.po
@@ -2100,6 +2100,10 @@ msgstr "技能草稿"
 msgid "Drafting the spec…"
 msgstr ""
 
+#: src/components/SortableGroup.tsx
+msgid "Drag to reorder"
+msgstr ""
+
 #: src/pages/shell/avatar-studio-popover.tsx
 msgid "Drag, drop, or paste an image"
 msgstr "拖放或粘贴图片"
diff --git a/apps/web/src/pages/Shell.tsx b/apps/web/src/pages/Shell.tsx
index 7ebf9cf..b78cecd 100644
--- a/apps/web/src/pages/Shell.tsx
+++ b/apps/web/src/pages/Shell.tsx
@@ -1,10 +1,5 @@
-import { closestCenter, DndContext, DragOverlay } from "@dnd-kit/core";
-import {
-  SortableContext,
-  sortableKeyboardCoordinates,
-  verticalListSortingStrategy,
-} from "@dnd-kit/sortable";
-import { CSS as DndCSS } from "@dnd-kit/utilities";
+import { closestCenter, DndContext } from "@dnd-kit/core";
+import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import { Trans, useLingui } from "@lingui/react/macro";
 import type {
   Bot,
@@ -72,13 +67,10 @@ import {
   ArrowLeft,
   Calendar,
   Globe,
-  LayoutGrid,
   PanelRight,
   Pencil,
   Plus,
-  RefreshCw,
   Search,
-  Settings,
   Trash2,
   X,
 } from "lucide-react";
@@ -1320,9 +1312,7 @@ export function ShellPage() {
     mainConversationEntry,
     projectSidebarGroups,
     sensors,
-    setDraggedProjectId,
     handleProjectDragEnd,
-    handleProjectDragStart,
   } = useSidebarModel({
     query,
     spaces,
@@ -2943,8 +2933,6 @@ export function ShellPage() {
                     sensors={sensors}
                     collisionDetection={closestCenter}
                     onDragEnd={handleProjectDragEnd}
-                    onDragStart={handleProjectDragStart}
-                    onDragCancel={() => setDraggedProjectId(null)}
                   >
                     <SortableContext
                       items={projectSidebarGroups.filter((g) => g.title).map((g) => g.spaceId)}
@@ -3544,44 +3532,6 @@ export function ShellPage() {
                 onImport={(manifest) => importBot(manifest)}
               />
             ) : null}
-            {/* Centered Create Bot Modal */}
-            {showCreateBotModal &&
-              createPortal(
-                <div className="fixed inset-0 z-50 flex items-center justify-center">
-                  <button
-                    type="button"
-                    className="absolute inset-0 bg-overlay"
-                    aria-label={t`Close`}
-                    onClick={() => setShowCreateBotModal(false)}
-                  />
-                  <div className="relative z-10 max-h-[90vh] w-[480px] overflow-y-auto rounded-2xl border border-border bg-popover p-6 text-popover-foreground shadow-2xl">
-                    <div className="mb-4 flex items-center justify-between">
-                      <h2 className="text-lg font-semibold text-foreground">
-                        <Trans>Create new Bot</Trans>
-                      </h2>
-                      <button
-                        type="button"
-                        onClick={() => setShowCreateBotModal(false)}
-                        className="text-muted-foreground hover:text-foreground"
-                        aria-label={t`Close`}
-                      >
-                        <X strokeWidth={1.8} className="size-icon-md" />
-                      </button>
-                    </div>
-                    <CreateBotForm
-                      onCancel={() => setShowCreateBotModal(false)}
-                      onCreate={async (input) => {
-                        await createBot(input);
-                      }}
-                      onImport={async (manifest) => {
-                        await importBot(manifest);
-                        setShowCreateBotModal(false);
-                      }}
-                    />
-                  </div>
-                </div>,
-                document.body,
-              )}
             {panel === "settings" && active ? (
               <BotSettings
                 key={active.id}
@@ -3773,6 +3723,44 @@ export function ShellPage() {
           </div>
         ) : null}
       </aside>
+      {/* Centered Create Bot Modal */}
+      {showCreateBotModal &&
+        createPortal(
+          <div className="fixed inset-0 z-50 flex items-center justify-center">
+            <button
+              type="button"
+              className="absolute inset-0 bg-overlay"
+              aria-label={t`Close`}
+              onClick={() => setShowCreateBotModal(false)}
+            />
+            <div className="relative z-10 max-h-[90vh] w-[480px] overflow-y-auto rounded-2xl border border-border bg-popover p-6 text-popover-foreground shadow-2xl">
+              <div className="mb-4 flex items-center justify-between">
+                <h2 className="text-lg font-semibold text-foreground">
+                  <Trans>Create new Bot</Trans>
+                </h2>
+                <button
+                  type="button"
+                  onClick={() => setShowCreateBotModal(false)}
+                  className="text-muted-foreground hover:text-foreground"
+                  aria-label={t`Close`}
+                >
+                  <X strokeWidth={1.8} className="size-icon-md" />
+                </button>
+              </div>
+              <CreateBotForm
+                onCancel={() => setShowCreateBotModal(false)}
+                onCreate={async (input) => {
+                  await createBot(input);
+                }}
+                onImport={async (manifest) => {
+                  await importBot(manifest);
+                  setShowCreateBotModal(false);
+                }}
+              />
+            </div>
+          </div>,
+          document.body,
+        )}
 
       <Suspense fallback={null}>
         {contextChat && botMenu ? (
diff --git a/apps/web/src/pages/shell/use-sidebar-model.ts b/apps/web/src/pages/shell/use-sidebar-model.ts
index d1f864c..847506f 100644
--- a/apps/web/src/pages/shell/use-sidebar-model.ts
+++ b/apps/web/src/pages/shell/use-sidebar-model.ts
@@ -32,7 +32,6 @@ export function useSidebarModel({
     setProjectOrder(orderedIds);
     writeProjectSidebarOrder(orderedIds);
   }, []);
-  const [draggedProjectId, setDraggedProjectId] = useState<string | null>(null);
   const sensors = useSensors(
     useSensor(MouseSensor, { activationConstraint: { distance: 8 } }),
     useSensor(TouchSensor, { activationConstraint: { distance: 8 } }),
@@ -242,9 +241,6 @@ export function useSidebarModel({
     },
     [projectSidebarGroups, handleReorderProjects],
   );
-  const handleProjectDragStart = useCallback((event: { active: { id: string | number } }) => {
-    setDraggedProjectId(String(event.active.id));
-  }, []);
 
   return {
     homeSpaceBots,
@@ -252,8 +248,6 @@ export function useSidebarModel({
     mainConversationEntry,
     projectSidebarGroups,
     sensors,
-    setDraggedProjectId,
     handleProjectDragEnd,
-    handleProjectDragStart,
   };
 }