diff --git a/ui/client-app/src/components/FileSystemNavigator.js b/ui/client-app/src/components/FileSystemNavigator.js
index 2266e35..7de06e2 100644
--- a/ui/client-app/src/components/FileSystemNavigator.js
+++ b/ui/client-app/src/components/FileSystemNavigator.js
@@ -13,6 +13,7 @@
     const [selectedFile, setSelectedFile] = useState(null); // { path, content }
     const [isEditing, setIsEditing] = useState(false);
     const [newItemModal, setNewItemModal] = useState(null); // { parentPath, isDir }
+    const [deleteModal, setDeleteModal] = useState(null); // path
     const [operationLoading, setOperationLoading] = useState(false);
 
     const fetchLevel = useCallback(async (path) => {
@@ -55,13 +56,21 @@
     const handleCreateFinal = async (name) => {
         if (!name || !newItemModal) return;
         const { parentPath, isDir } = newItemModal;
-        const fullPath = parentPath === "." ? name : `${parentPath}/${name}`;
+
+        // Ensure parentPath is correctly handled for the root
+        let fullPath;
+        if (parentPath === "." || parentPath === "" || !parentPath) {
+            fullPath = name;
+        } else {
+            fullPath = `${parentPath}/${name}`;
+        }
+
         setOperationLoading(true);
         setError(null);
         try {
             await nodeFsTouch(nodeId, fullPath, "", isDir);
             setNewItemModal(null);
-            loadRoot(); // Refresh
+            setTimeout(loadRoot, 500); // Small delay to let gRPC propagate
         } catch (err) {
             setError(`Failed to create: ${err.message}`);
         } finally {
@@ -69,13 +78,15 @@
         }
     };
 
-    const handleDelete = async (path) => {
-        if (!window.confirm(`Delete ${path}?`)) return;
+    const handleDeleteFinal = async () => {
+        if (!deleteModal) return;
+        const path = deleteModal;
         setOperationLoading(true);
         setError(null);
         try {
             await nodeFsRm(nodeId, path);
-            loadRoot(); // Refresh
+            setDeleteModal(null);
+            setTimeout(loadRoot, 500);
         } catch (err) {
             setError(`Failed to delete: ${err.message}`);
         } finally {
@@ -142,8 +153,8 @@
                     >
                         {!node.is_dir && (
                             <span
-                                className={`w-1.5 h-1.5 rounded-full mr-2 shrink-0 ${node.is_synced ? 'bg-green-500 shadow-[0_0_5px_rgba(34,197,94,0.5)]' : 'bg-gray-300 dark:bg-gray-600'}`}
-                                title={node.is_synced ? "Synced to Cloud" : "Local Only"}
+                                className={`w-1.5 h-1.5 rounded-full mr-2 shrink-0 ${node.is_synced ? 'bg-green-500 shadow-[0_0_5px_rgba(34,197,94,0.5)]' : 'bg-yellow-400 animate-pulse'}`}
+                                title={node.is_synced ? "Synced to Cloud" : "Syncing to Cloud..."}
                             />
                         )}
                         {node.name}
@@ -160,7 +171,7 @@
                                 </button>
                             </>
                         )}
-                        <button onClick={(e) => { e.stopPropagation(); handleDelete(node.path); }} className="p-0.5 hover:bg-gray-200 dark:hover:bg-gray-600 rounded text-gray-400 hover:text-red-500" title="Delete">
+                        <button onClick={(e) => { e.stopPropagation(); setDeleteModal(node.path); }} className="p-0.5 hover:bg-gray-200 dark:hover:bg-gray-600 rounded text-gray-400 hover:text-red-500" title="Delete">
                             <svg className="w-3 h-3" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" /></svg>
                         </button>
                     </div>
@@ -288,6 +299,38 @@
                     </div>
                 </div>
             )}
+
+            {/* Delete Confirmation Modal */}
+            {deleteModal && (
+                <div className="fixed inset-0 z-[80] flex items-center justify-center p-4 bg-black/60 backdrop-blur-sm">
+                    <div className="bg-white dark:bg-gray-900 rounded-2xl w-full max-w-sm shadow-2xl border dark:border-gray-700 overflow-hidden">
+                        <div className="p-6 text-center">
+                            <div className="w-12 h-12 bg-red-100 dark:bg-red-900/30 rounded-full flex items-center justify-center mx-auto mb-4 text-red-600">
+                                <svg className="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" /></svg>
+                            </div>
+                            <h4 className="text-lg font-bold text-gray-900 dark:text-white mb-2">Confirm Delete</h4>
+                            <p className="text-sm text-gray-500 dark:text-gray-400 break-all mb-6">
+                                Are you sure you want to delete <span className="font-mono text-red-500">{deleteModal}</span>? This action cannot be undone.
+                            </p>
+                            <div className="flex space-x-3">
+                                <button
+                                    onClick={() => setDeleteModal(null)}
+                                    className="flex-1 px-4 py-2 text-xs font-bold text-gray-500 bg-gray-100 dark:bg-gray-800 dark:text-gray-400 rounded-xl hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors"
+                                >
+                                    Cancel
+                                </button>
+                                <button
+                                    onClick={handleDeleteFinal}
+                                    disabled={operationLoading}
+                                    className="flex-1 px-4 py-2 bg-red-600 hover:bg-red-700 text-white rounded-xl text-xs font-black shadow-lg shadow-red-500/20 transition-all disabled:opacity-50"
+                                >
+                                    {operationLoading ? 'Deleting...' : 'Delete Forever'}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            )}
         </div>
     );
 };