diff --git a/webapp/static/clients/codemirror/index.html b/webapp/static/clients/codemirror/index.html
index 22c88d6..19487ee 100644
--- a/webapp/static/clients/codemirror/index.html
+++ b/webapp/static/clients/codemirror/index.html
@@ -20,15 +20,10 @@
           
             <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
                 <a class="navbar-brand">BaseX LSP client</a>
-                <button id="popcon" popovertarget="mypopover" class="btn btn-danger">
+                <button id="popcon" popovertarget="popConnect" class="btn btn-danger">
                     <i class="bi bi-router"></i>
                 </button>
-                <div id="mypopover" popover>
-                    <h2>Connect to LSP</h2>
-                    <div id="state">🔴</div>
-                    <input id="iServer" type="text" value="ws://localhost:3000/ws/lsp" style="width:25em" />
-                    <button id="connect">connect</button>
-                </div>
+               
             </div>
             <a href="/dba/logs" target="dba">#</a>
             <div class="row">
@@ -59,7 +54,11 @@
                             </button>
                         </div>
                         <div class="btn-group" role="group" aria-label="Third group">
-                            <button type="button" class="btn btn-light"><i class="bi bi-justify-left"></i></button>
+                            <button type="button" class="btn btn-light" title="Format"><i class="bi bi-justify-left"></i></button>
+
+                            <button type="button" class="btn btn-light" 
+                            popovertarget="popSettings" title="Settings">
+                                <i class="bi bi-gear"></i></button>
                         </div>
                     </div>
 
@@ -107,7 +106,18 @@
             </div>
         </div>
     </div>
+    <!-- Popovers -->
+    <div id="popConnect" popover>
+        <h2>Connect to LSP</h2>
+        <div id="state">🔴</div>
+        <input id="iServer" type="text" value="ws://localhost:3000/ws/lsp" style="width:25em" />
+        <button id="connect">connect</button>
+    </div>
 
+    <div id="popSettings" popover>
+        <h2>Settings</h2>
+        <div>TODO</div>
+    </div>
     <!-- CodeMirror 6 -->
     <script src="./lsp.bundle.js"></script>
     <script src="./script.js"></script>
diff --git a/webapp/static/clients/codemirror/script.js b/webapp/static/clients/codemirror/script.js
index 7d2281d..479278c 100644
--- a/webapp/static/clients/codemirror/script.js
+++ b/webapp/static/clients/codemirror/script.js
@@ -68,7 +68,7 @@ function connect() {
             transport.socket.onclose = (event) => connectStatus(false);
             transport.socket.oneror = (event) => $("msg").innerText = "sock error!";
             client = new lsp.LSPClient().connect(transport);
-            $("mypopover").hidePopover(); 
+            $("popConnect").hidePopover(); 
             connectStatus(true);
             let extLsp = lsp.languageServerSupport(client, file, "xquery");
             extLint = lsp.linter(null,{ autoPanel: true });