diff --git a/app/templates/_page_editor_content.html b/app/templates/_page_editor_content.html
index 54d25d9..045b764 100644
--- a/app/templates/_page_editor_content.html
+++ b/app/templates/_page_editor_content.html
@@ -743,7 +743,7 @@
         </button>
         <button
             class="gs-pill"
-            @click="createForm()"
+            @click="openFormModal()"
         >
             <span class="gs-icon">{{ fd_icon("copy",14) }}</span> Form
         </button>
@@ -753,41 +753,7 @@
         >
             <span class="gs-icon">{{ fd_icon("file",14) }}</span> Templates
         </button>
-        <div style="position: relative">
-            <button class="gs-pill" @click="gsMoreOpen = !gsMoreOpen">
-                <span>⋯</span>
-            </button>
-            <div
-                class="gs-more-dropdown"
-                x-show="gsMoreOpen"
-                @click.outside="gsMoreOpen = false"
-                x-transition
-            >
-                <div class="gs-more-item" @click="gsMoreOpen=false">
-                    {{ fd_icon("bar-chart",14) }} Table
-                </div>
-                <div class="gs-more-item" @click="gsMoreOpen=false">
-                    {{ fd_icon("copy",14) }} Board
-                </div>
-                <div class="gs-more-item" @click="gsMoreOpen=false">
-                    {{ fd_icon('list',14) }} List
-                </div>
-                <div class="gs-more-item" @click="gsMoreOpen=false">
-                    {{ fd_icon("calendar",14) }} Timeline
-                </div>
-                <div class="gs-more-item" @click="gsMoreOpen=false">
-                    {{ fd_icon("calendar",14) }} Calendar
-                </div>
-                <div class="gs-more-item" @click="gsMoreOpen=false">
-                    {{ fd_icon("image",14) }} Gallery
-                </div>
-                <div class="gs-more-sep"></div>
-                <div class="gs-more-item" @click="gsMoreOpen=false">
-                    {{ fd_icon("download",14) }} Import
-                </div>
-            </div>
         </div>
-    </div>
 
     <div class="editor-statusbar">
         <span x-show="saving">Saving...</span>
@@ -1010,4 +976,27 @@
                 </div>
             </div>
 
-        </div>
+                    <!-- ═══════════ Get Started Form name modal ═══════════ -->
+                    <div class="flowdeck-modal-overlay"
+                         x-show="formOpen"
+                         style="position:fixed;inset:0;background:rgba(0,0,0,.55);z-index:2100;display:flex;align-items:center;justify-content:center;padding:20px;"
+                         @click.self="formOpen = false"
+                         x-transition.opacity>
+                        <div class="flowdeck-modal" @keydown.escape="formOpen = false">
+                            <div class="flowdeck-modal-header">
+                                <h3>{{ fd_icon("copy",16) }} Create form</h3>
+                                <button class="flowdeck-modal-close" @click="formOpen = false">&times;</button>
+                            </div>
+                            <div class="flowdeck-modal-body">
+                                <p>Enter a name for the new form.</p>
+                                <input class="flowdeck-modal-input" type="text" x-model="formName" x-ref="formNameInput"
+                                       placeholder="Form name" @keydown.enter="confirmCreateForm()">
+                            </div>
+                            <div class="flowdeck-modal-footer">
+                                <button class="flowdeck-modal-btn cancel" @click="formOpen = false">Cancel</button>
+                                <button class="flowdeck-modal-btn confirm" @click="confirmCreateForm()">Create</button>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
diff --git a/app/templates/base.html b/app/templates/base.html
index f735648..70e9b8f 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -2613,8 +2613,10 @@
           .then(html => {
             const ul = document.getElementById('sidebar-workspace-items');
             if (!ul) return;
-            // Preserve the "Manage Workspaces" link (last <li>)
-            const manageLink = ul.querySelector('li:last-child');
+            // Preserve the "Manage Workspaces" link (direct last <li> child only —
+                        // plain 'li:last-child' grabs the last file of a nested folder sublist
+                        // when the tree has folders, splicing it back in → duplicated entry)
+                        const manageLink = ul.querySelector(':scope > li:last-child');
             ul.innerHTML = html;
             if (manageLink) ul.appendChild(manageLink);
             // Le HTML injecté porte des directives Alpine (@contextmenu,
diff --git a/static/js/page_editor_scripts.js b/static/js/page_editor_scripts.js
index 8b61da4..72caa94 100644
--- a/static/js/page_editor_scripts.js
+++ b/static/js/page_editor_scripts.js
@@ -1480,6 +1480,7 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
         _commentSel:{range:null,bid:null,start:0,end:0},
         _notifiedMentions:{},
         undoStack:[],redoStack:[],_histCap:100,_histLock:false,
+        inlineDBs: [], formOpen: false, formName: '',
         // ── Cover & icon (v5.10+) ──
         coverUrl:'',
         coverOpen:false,
@@ -2727,14 +2728,21 @@ applyAIBlocks(text){
           }catch(e){}
           return this.blocks.length;
         },
-        async createForm(){
-          const name=prompt('Form name:','New Form');
-          if(!name||!name.trim())return;
+        openFormModal(){
+          this.formName='New Form';
+          this.formOpen=true;
+          this.$nextTick(()=>{ const el=this.$refs.formNameInput; if(el) el.focus(); });
+        },
+        closeFormModal(){ this.formOpen=false; },
+        async confirmCreateForm(){
+          const name=this.formName.trim();
+          if(!name){ this.showToast('Form name required','error'); return; }
+          this.formOpen=false;
           const csrf = getCsrf();;
           try{
             const r=await fetch('/db/inline/api',{
               method:'POST',headers:{'Content-Type':'application/json','X-CSRF-Token':csrf},
-              body:JSON.stringify({name:name.trim(),parent_page_id:this.pid})
+              body:JSON.stringify({name:name,parent_page_id:this.pid})
             });
             const d=await r.json();
             if(d.id){