diff --git a/ui/client-app/src/pages/NodesPage.js b/ui/client-app/src/pages/NodesPage.js
index 75362a5..cf1d679 100644
--- a/ui/client-app/src/pages/NodesPage.js
+++ b/ui/client-app/src/pages/NodesPage.js
@@ -1,7 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import {
     getAdminNodes, adminCreateNode, adminUpdateNode, adminDeleteNode,
-    adminGrantNodeAccess, adminRevokeNodeAccess,
     adminDownloadNodeBundle, getUserAccessibleNodes,
     getAdminGroups, getNodeStreamUrl
 } from '../services/apiService';
@@ -9,7 +8,6 @@
 import FileSystemNavigator from '../components/FileSystemNavigator';
 
 const NodesPage = ({ user }) => {
-    const [activeTab, setActiveTab] = useState(user?.role === 'admin' ? 'manage' : 'status');
     const [nodes, setNodes] = useState([]);
     const [groups, setGroups] = useState([]);
     const [loading, setLoading] = useState(true);
@@ -70,7 +68,6 @@
                 });
                 setMeshStatus(statusMap);
             } else if (['task_start', 'task_complete', 'task_error', 'info'].includes(msg.event)) {
-                // Add to recent events log
                 setRecentEvents(prev => [msg, ...prev].slice(0, 50));
             }
         };
@@ -128,7 +125,8 @@
     };
 
     const NodeHealthMetrics = ({ nodeId, stats, compact = false }) => {
-        const isOnline = meshStatus[nodeId]?.status === 'online' || meshStatus[nodeId]?.status === 'idle' || meshStatus[nodeId]?.status === 'busy';
+        const live = meshStatus[nodeId];
+        const isOnline = live?.status === 'online' || live?.status === 'idle' || live?.status === 'busy';
         if (!isOnline && compact) return null;
 
         const cpu = stats?.cpu_usage_percent || 0;
@@ -199,24 +197,6 @@
                         )}
                     </div>
                 </div>
-
-                {/* Tabs */}
-                <div className="flex space-x-8 mt-8 border-b dark:border-gray-700">
-                    {isAdmin && (
-                        <button
-                            onClick={() => setActiveTab('manage')}
-                            className={`pb-4 px-1 text-sm font-medium transition-colors border-b-2 ${activeTab === 'manage' ? 'border-indigo-500 text-indigo-600 dark:text-indigo-400' : 'border-transparent text-gray-500 hover:text-gray-700 dark:hover:text-gray-300'}`}
-                        >
-                            Management
-                        </button>
-                    )}
-                    <button
-                        onClick={() => setActiveTab('status')}
-                        className={`pb-4 px-1 text-sm font-medium transition-colors border-b-2 ${activeTab === 'status' ? 'border-indigo-500 text-indigo-600 dark:text-indigo-400' : 'border-transparent text-gray-500 hover:text-gray-700 dark:hover:text-gray-300'}`}
-                    >
-                        Live Monitor
-                    </button>
-                </div>
             </header>
 
             {/* Main Content */}
@@ -229,47 +209,48 @@
                     <div className="bg-red-50 dark:bg-red-900/20 text-red-600 p-4 rounded-xl border border-red-200 dark:border-red-800">
                         Error: {error}
                     </div>
-                ) : activeTab === 'manage' ? (
-                    /* ADMIN MANAGEMENT VIEW */
-                    <div className="space-y-6">
+                ) : (
+                    <div className="space-y-12">
                         <div className="grid grid-cols-1 gap-6">
                             {nodes.map(node => (
                                 <div key={node.node_id} className="bg-white dark:bg-gray-800 rounded-2xl shadow-sm border dark:border-gray-700 overflow-hidden transition-all duration-300">
                                     {/* Top Row: Basic Info & Actions */}
                                     <div className="p-5 flex items-center justify-between hover:bg-gray-50 dark:hover:bg-gray-800/50 transition-colors">
                                         <div className="flex items-center space-x-4 flex-1 min-w-0">
-                                            <div className={`p-2 rounded-xl flex-shrink-0 ${node.is_active ? 'bg-green-100 text-green-600' : 'bg-gray-100 text-gray-400'}`}>
-                                                <svg className="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-7 0V4" />
-                                                </svg>
-                                            </div>
                                             <div className="min-w-0 truncate">
-                                                <div className="flex items-center space-x-3">
+                                                <div className="flex items-center space-x-3 mb-1">
+                                                    <div className="flex items-center space-x-2">
+                                                        <div className={`w-2 h-2 rounded-full ${meshStatus[node.node_id]?.status === 'online' || meshStatus[node.node_id]?.status === 'idle' || meshStatus[node.node_id]?.status === 'busy' ? 'bg-green-500 animate-pulse shadow-[0_0_5px_rgba(34,197,94,0.5)]' : 'bg-gray-400 opacity-50'}`}></div>
+                                                        <span className={`text-[10px] font-black uppercase tracking-tighter ${meshStatus[node.node_id]?.status === 'online' || meshStatus[node.node_id]?.status === 'idle' || meshStatus[node.node_id]?.status === 'busy' ? 'text-green-500' : 'text-gray-500'}`}>
+                                                            {meshStatus[node.node_id]?.status || node.last_status || 'offline'}
+                                                        </span>
+                                                    </div>
                                                     <h3 className="text-base font-bold text-gray-900 dark:text-white truncate">{node.display_name}</h3>
                                                     <NodeHealthMetrics nodeId={node.node_id} stats={meshStatus[node.node_id]?.stats} compact={true} />
                                                 </div>
-                                                <div className="flex items-center space-x-2 mt-0.5">
-                                                    <span className={`text-[10px] font-bold uppercase tracking-widest ${node.is_active ? 'text-green-500' : 'text-gray-400'}`}>
-                                                        {node.is_active ? 'Active' : 'Disabled'}
-                                                    </span>
-                                                    <span className="text-gray-300 dark:text-gray-600">•</span>
-                                                    <span className="text-[10px] font-mono text-gray-500 truncate">{node.node_id}</span>
+                                                <div className="flex items-center space-x-2">
+                                                    <span className="text-[10px] font-mono text-gray-400 truncate opacity-70">ID: {node.node_id}</span>
                                                 </div>
                                             </div>
                                         </div>
 
-                                        <div className="flex items-center space-x-2 ml-4">
-                                            <button
-                                                onClick={() => toggleNodeActive(node)}
-                                                className={`p-2 rounded-lg transition-colors ${node.is_active ? 'text-yellow-500 hover:bg-yellow-50' : 'text-green-500 hover:bg-green-50'}`}
-                                                title={node.is_active ? 'Disable Node' : 'Enable Node'}
-                                            >
-                                                {node.is_active ? (
-                                                    <svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10 9v6m4-6v6m-9-4h18" /></svg>
-                                                ) : (
-                                                    <svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M14.752 11.168l-3.197-2.132A1 1 0 0010 9.87v4.263a1 1 0 001.555.832l3.197-2.132a1 1 0 000-1.664z" /><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-                                                )}
-                                            </button>
+                                        <div className="flex items-center space-x-3 ml-4">
+                                            {/* Active Toggle Switch */}
+                                            <div className="flex items-center bg-gray-100 dark:bg-gray-900/50 p-1 rounded-full border dark:border-gray-700 mr-2 shadow-inner">
+                                                <button
+                                                    onClick={() => toggleNodeActive(node)}
+                                                    className={`px-3 py-1 rounded-full text-[9px] font-black uppercase tracking-widest transition-all duration-200 ${node.is_active ? 'bg-indigo-600 text-white shadow-lg shadow-indigo-500/30' : 'text-gray-400 hover:text-gray-600'}`}
+                                                >
+                                                    Active
+                                                </button>
+                                                <button
+                                                    onClick={() => toggleNodeActive(node)}
+                                                    className={`px-3 py-1 rounded-full text-[9px] font-black uppercase tracking-widest transition-all duration-200 ${!node.is_active ? 'bg-red-500 text-white shadow-lg shadow-red-500/30' : 'text-gray-400 hover:text-gray-600'}`}
+                                                >
+                                                    Disabled
+                                                </button>
+                                            </div>
+
                                             <button
                                                 onClick={() => setExpandedTerminals(prev => ({ ...prev, [node.node_id]: !prev[node.node_id] }))}
                                                 className={`p-2 rounded-lg transition-colors ${expandedTerminals[node.node_id] ? 'bg-indigo-50 text-indigo-600' : 'text-gray-500 hover:text-indigo-600 hover:bg-gray-100'}`}
@@ -307,10 +288,8 @@
                                     {/* Expanded Panels */}
                                     {(expandedNodes[node.node_id] || expandedTerminals[node.node_id] || expandedFiles[node.node_id]) && (
                                         <div className="border-t dark:border-gray-700 bg-gray-50/50 dark:bg-gray-800/30 p-5 space-y-6">
-                                            {/* Settings Content */}
                                             {expandedNodes[node.node_id] && (
                                                 <div className="grid grid-cols-1 lg:grid-cols-2 gap-8">
-                                                    {/* Left: General Settings */}
                                                     <div className="space-y-5">
                                                         <div className="flex justify-between items-center mb-1">
                                                             <h4 className="text-xs font-black uppercase tracking-widest text-gray-500">General Configuration</h4>
@@ -323,7 +302,6 @@
                                                                 </div>
                                                             )}
                                                         </div>
-
                                                         <div className="space-y-4">
                                                             <div>
                                                                 <label className="block text-[10px] font-bold text-gray-400 uppercase mb-1 px-1">Node Display Name</label>
@@ -355,8 +333,6 @@
                                                             </div>
                                                         </div>
                                                     </div>
-
-                                                    {/* Right: Skills & Hardware */}
                                                     <div className="space-y-5">
                                                         <h4 className="text-xs font-black uppercase tracking-widest text-gray-500">Skills & Resources</h4>
                                                         <div className="bg-white dark:bg-gray-800/50 rounded-xl border dark:border-gray-700 p-4 space-y-4 shadow-sm">
@@ -372,23 +348,8 @@
                                                                     {node.skill_config?.shell?.enabled ? 'Active' : 'Disabled'}
                                                                 </span>
                                                             </div>
-
-                                                            {editingNodeId === node.node_id && (
-                                                                <div className="pt-2 mt-2 border-t dark:border-gray-700 space-y-2">
-                                                                    {Object.entries(editForm.skill_config).map(([skill, cfg]) => (
-                                                                        <div key={skill} className="flex items-center justify-between cursor-pointer group" onClick={() => setEditForm({
-                                                                            ...editForm,
-                                                                            skill_config: { ...editForm.skill_config, [skill]: { ...cfg, enabled: !cfg.enabled } }
-                                                                        })}>
-                                                                            <span className="text-[11px] text-gray-500 uppercase font-bold group-hover:text-indigo-500 transition-colors">{skill}</span>
-                                                                            <div className={`w-2.5 h-2.5 rounded-full transition-all ${cfg?.enabled ? 'bg-indigo-500 shadow-[0_0_8px_rgba(99,102,241,0.6)] scale-110' : 'bg-gray-300'}`}></div>
-                                                                        </div>
-                                                                    ))}
-                                                                </div>
-                                                            )}
-                                                            <p className="text-[10px] text-gray-400 mt-3 italic">* Changes to sandbox policy require node reconnection or sync.</p>
+                                                            <p className="text-[10px] text-gray-400 mt-3 italic">* Skills are defined via the Node Manifest in the bundle.</p>
                                                         </div>
-
                                                         <div className="pt-2 border-t dark:border-gray-700 flex flex-wrap gap-2">
                                                             <button
                                                                 onClick={() => adminDownloadNodeBundle(node.node_id)}
@@ -402,17 +363,10 @@
                                                 </div>
                                             )}
 
-                                            {/* File System Explorer Section (Modular Navigator) */}
                                             {expandedFiles[node.node_id] && (
-                                                <div className="pt-5 border-t dark:border-gray-700 animate-in fade-in slide-in-from-top-4 duration-300">
+                                                <div className="pt-5 border-t dark:border-gray-700">
                                                     <div className="flex items-center justify-between mb-4">
-                                                        <div className="flex items-center">
-                                                            <h4 className="text-xs font-black uppercase tracking-widest text-amber-500">Node File Explorer</h4>
-                                                            <div className="ml-3 flex items-center px-2 py-0.5 bg-green-500/10 border border-green-500/20 rounded-full">
-                                                                <div className="w-1 h-1 bg-green-500 rounded-full mr-1.5 animate-pulse"></div>
-                                                                <span className="text-[9px] font-bold text-green-600 dark:text-green-400 uppercase tracking-tighter">Live gRPC</span>
-                                                            </div>
-                                                        </div>
+                                                        <h4 className="text-xs font-black uppercase tracking-widest text-amber-500">Node File Explorer</h4>
                                                         <p className="text-[10px] text-gray-400 font-mono italic">Browse & synchronize files</p>
                                                     </div>
                                                     <div className="h-[450px]">
@@ -421,9 +375,8 @@
                                                 </div>
                                             )}
 
-                                            {/* Terminal Section */}
                                             {expandedTerminals[node.node_id] && (
-                                                <div className="pt-5 border-t dark:border-gray-700 animate-in fade-in slide-in-from-top-4 duration-300">
+                                                <div className="pt-5 border-t dark:border-gray-700">
                                                     <div className="flex justify-between items-center mb-4">
                                                         <h4 className="text-xs font-black uppercase tracking-widest text-indigo-500">Node Interactive Shell</h4>
                                                         <span className="text-[10px] font-mono text-gray-400">Direct gRPC Proxy</span>
@@ -436,68 +389,27 @@
                                 </div>
                             ))}
                         </div>
-                    </div>
-                ) : (
-                    /* LIVE MONITOR VIEW (M6) */
-                    <div className="grid grid-cols-1 lg:grid-cols-3 gap-8">
-                        {/* Status Cards */}
-                        <div className="lg:col-span-2 grid grid-cols-1 md:grid-cols-2 gap-6 content-start">
-                            {nodes.map(node => {
-                                const live = meshStatus[node.node_id];
-                                const isOnline = live?.status === 'online' || live?.status === 'idle' || live?.status === 'busy';
 
-                                return (
-                                    <div key={node.node_id} className="bg-white dark:bg-gray-800 rounded-2xl p-6 shadow-sm border dark:border-gray-700 relative overflow-hidden group hover:shadow-md transition-shadow">
-                                        <div className={`absolute top-0 left-0 w-1 h-full ${isOnline ? 'bg-green-500' : 'bg-gray-300'}`}></div>
-
-                                        <div className="flex justify-between items-start">
-                                            <div>
-                                                <h4 className="font-bold text-gray-900 dark:text-white uppercase tracking-tight">{node.display_name}</h4>
-                                                <p className="text-[10px] text-gray-400 font-mono">{node.node_id}</p>
-                                            </div>
-                                            <div className="flex items-center">
-                                                <span className={`w-2 h-2 rounded-full mr-2 ${isOnline ? 'bg-green-500 animate-pulse' : 'bg-gray-400'}`}></span>
-                                                <span className={`text-[10px] font-bold uppercase tracking-wider ${isOnline ? 'text-green-600' : 'text-gray-500'}`}>
-                                                    {live?.status || (node.last_status || 'offline')}
-                                                </span>
-                                            </div>
-                                        </div>
-
-                                        <div className="mt-6 flex justify-between items-end">
-                                            <div className="space-y-1">
-                                                <div className="text-[10px] text-gray-500 font-bold uppercase">Tasks Running</div>
-                                                <div className="text-2xl font-black text-gray-900 dark:text-white">{live?.stats?.active_worker_count || 0}</div>
-                                            </div>
-                                            <div className="space-y-1 text-right">
-                                                <div className="text-[10px] text-gray-500 font-bold uppercase">Uptime Score</div>
-                                                <div className="text-xl font-bold text-indigo-500">{(live?.stats?.success_rate ? (live.stats.success_rate * 100).toFixed(1) : "100")}%</div>
-                                            </div>
-                                        </div>
-
-                                        <NodeHealthMetrics nodeId={node.node_id} stats={live?.stats} />
-                                    </div>
-                                );
-                            })}
-                        </div>
-
-                        {/* Event Timeline */}
-                        <div className="bg-white dark:bg-gray-800 rounded-2xl shadow-sm border dark:border-gray-700 overflow-hidden flex flex-col h-[600px]">
-                            <div className="p-4 border-b dark:border-gray-700 bg-gray-50 dark:bg-gray-800/50">
-                                <h4 className="text-xs font-black uppercase tracking-widest text-gray-500 flex items-center">
+                        {/* Event Timeline (Execution Live Bus) */}
+                        <div className="bg-white dark:bg-gray-800 rounded-2xl shadow-sm border dark:border-gray-700 overflow-hidden flex flex-col mt-4 mb-8 h-[300px]">
+                            <div className="p-4 border-b dark:border-gray-700 bg-gray-50 dark:bg-gray-800/50 flex justify-between items-center">
+                                <h4 className="text-[10px] font-black uppercase tracking-widest text-gray-500 flex items-center">
                                     <span className="w-2 h-2 rounded-full bg-indigo-500 mr-2 shadow-[0_0_8px_rgba(99,102,241,0.6)] animate-pulse"></span>
                                     Execution Live Bus
                                 </h4>
+                                <span className="text-[10px] text-gray-400 font-mono italic">Subscribed to task stream...</span>
                             </div>
-                            <div className="flex-1 overflow-y-auto p-4 space-y-3 font-mono text-[11px] scrollbar-thin scrollbar-thumb-gray-200 dark:scrollbar-thumb-gray-700">
+                            <div className="flex-1 overflow-y-auto p-4 space-y-3 font-mono text-[11px] scrollbar-thin scrollbar-thumb-gray-200 dark:scrollbar-thumb-gray-700 bg-gray-50/30 dark:bg-black/20">
                                 {recentEvents.length === 0 && (
                                     <div className="text-gray-400 text-center py-8 italic">Listening for mesh events...</div>
                                 )}
                                 {recentEvents.map((evt, i) => (
-                                    <div key={i} className="flex space-x-2 animate-in slide-in-from-left duration-300">
-                                        <span className="text-indigo-400 flex-shrink-0 font-bold">[{evt.timestamp?.split('T')[1].split('.')[0]}]</span>
-                                        <span className="text-gray-500 flex-shrink-0">{evt.node_id?.slice(0, 8)}</span>
-                                        <span className={`flex-grow break-all ${evt.event === 'task_error' ? 'text-red-500' : 'text-gray-700 dark:text-gray-300'}`}>
-                                            {evt.label || evt.event}: {JSON.stringify(evt.data)}
+                                    <div key={i} className="flex space-x-3 items-center py-1 border-b border-gray-100 dark:border-gray-800 last:border-0 hover:bg-gray-100/50 dark:hover:bg-white/5 transition-colors">
+                                        <span className="text-indigo-400 flex-shrink-0 font-bold opacity-70">[{evt.timestamp?.split('T')[1].split('.')[0]}]</span>
+                                        <span className="px-1.5 py-0.5 bg-gray-100 dark:bg-gray-700 rounded text-[9px] text-gray-500 font-bold">{evt.node_id?.slice(0, 8)}</span>
+                                        <span className={`flex-grow break-all ${evt.event === 'task_error' ? 'text-red-500' : 'text-gray-700 dark:text-gray-200'}`}>
+                                            <span className="font-black uppercase text-[9px] mr-2 opactiy-50">{evt.label || evt.event}:</span>
+                                            {JSON.stringify(evt.data)}
                                         </span>
                                     </div>
                                 ))}