feat: rollout

2025-10-21 23:00:52 +02:00
26 changed files with 1294 additions and 4447 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,11 +0,0 @@
 .git
 .gitignore
 .cursor
 *.md
 node_modules
 README.md
 docs
 test
 openapitools.json
 *.backup
--- a/41
+++ b/41
@@ -1,41 +0,0 @@
 # Build stage
 FROM node:20-alpine AS builder
 WORKDIR /app
 # Copy package files
 COPY package*.json ./
 # Install dependencies
 RUN npm ci --only=production
 # Runtime stage
 FROM node:20-alpine
 # Install wget for health checks
 RUN apk --no-cache add wget
 WORKDIR /app
 # Copy dependencies from builder
 COPY --from=builder /app/node_modules ./node_modules
 # Copy application files
 COPY package*.json ./
 COPY index.js index-standalone.js ./
 COPY public ./public
 COPY src ./src
 # Create non-root user (let Alpine assign available GID/UID)
 RUN addgroup spore && \
    adduser -D -s /bin/sh -G spore spore && \
    chown -R spore:spore /app
 USER spore
 # Expose port
 EXPOSE 3000
 # Run the application
 CMD ["node", "index.js"]
--- a/docs/FIRMWARE_REGISTRY_INTEGRATION.md
+++ b/docs/FIRMWARE_REGISTRY_INTEGRATION.md
--- a/54
+++ b/54
@@ -1,54 +0,0 @@
 .PHONY: install build run clean docker-build docker-run docker-push docker-build-multiarch docker-push-multiarch
 # Install dependencies
 install:
 	npm install
 # Build the application (if needed)
 build: install
 # Run the application
 run:
 	node index.js
 # Start in development mode
 dev:
 	node index.js
 # Clean build artifacts
 clean:
 	rm -rf node_modules
 	rm -f package-lock.json
 # Docker variables
 DOCKER_REGISTRY ?= 
 IMAGE_NAME = wirelos/spore-ui
 IMAGE_TAG ?= latest
 FULL_IMAGE_NAME = $(if $(DOCKER_REGISTRY),$(DOCKER_REGISTRY)/$(IMAGE_NAME),$(IMAGE_NAME)):$(IMAGE_TAG)
 # Build Docker image
 docker-build:
 	docker build -t $(FULL_IMAGE_NAME) .
 # Run Docker container
 docker-run:
 	docker run -p 3000:3000 --rm $(FULL_IMAGE_NAME)
 # Push Docker image
 docker-push:
 	docker push $(FULL_IMAGE_NAME)
 # Build multiarch Docker image
 docker-build-multiarch:
 	docker buildx build --platform linux/amd64,linux/arm64 \
 		-t $(FULL_IMAGE_NAME) \
 		--push \
 		.
 # Push multiarch Docker image (if not pushed during build)
 docker-push-multiarch:
 	docker buildx build --platform linux/amd64,linux/arm64 \
 		-t $(FULL_IMAGE_NAME) \
 		--push \
 		.
--- a/README.md
+++ b/README.md
@@ -23,9 +23,6 @@ This frontend server works together with the **SPORE Gateway** (spore-gateway) b
 ![UI](./assets/cluster.png)
 ### Topology
 ![UI](./assets/topology.png)
 ### Events
 ![UI](./assets/events.png)
 ![UI](./assets/events-messages.png)
 ### Monitoring
 ![UI](./assets/monitoring.png)
 ### Firmware
--- a/assets/events-messages.png
+++ b/assets/events-messages.png
--- a/assets/events.png
+++ b/assets/events.png
--- a/assets/firmware.png
+++ b/assets/firmware.png
--- a/docs/Events.md
+++ b/docs/Events.md
@@ -1,518 +0,0 @@
 # Events Feature
 ## Overview
 The Events feature provides real-time visualization of WebSocket events streaming through the SPORE cluster. It displays events as an interactive force-directed graph, showing the flow and relationships between different event topics.
 ![Events View](./assets/events.png)
 ## Features
 ### Real-Time Event Visualization
 - **Interactive Graph**: Events are visualized as a force-directed graph using D3.js
 - **Topic Chain Visualization**: Multi-part topics (e.g., `cluster/event/api/neopattern`) are broken down into chains showing hierarchical relationships
 - **Event Counting**: Each event type is tracked with occurrence counts displayed on connections
 - **Animated Transitions**: New events trigger visual animations showing data flow through the graph
 ### User Interactions
 #### Drag to Reposition Nodes
 - **Center Node**: Dragging the center (blue) node moves the entire graph together
 - **Topic Nodes**: Individual topic nodes (green) can be repositioned independently
 - **Fixed Positioning**: Once dragged, nodes maintain their positions to prevent layout disruption
 #### Zoom Controls
 - **Mouse Wheel**: Zoom in and out using the mouse wheel
 - **Scale Range**: Zoom level constrained between 0.5x and 5x
 - **Pan**: Click and drag the canvas to pan around the graph
 #### Rearrange Layout
 - **Rearrange Button**: Click the button in the top-left corner to reset node positions
 - **Automatic Layout**: Clears fixed positions and lets the force simulation reposition nodes
 ### Visual Elements
 #### Node Types
 - **Center Node** (Blue):
  - Represents the central event hub
  - Always visible in the graph
  - Acts as the root node for all event chains
  - Larger size (18px radius)
 - **Topic Nodes** (Green):
  - Represent individual topic segments
  - Examples: `cluster`, `event`, `api`, `neopattern`
  - Smaller size (14px radius)
  - Positioned dynamically based on event frequency
 #### Link Types
 - **Center Links** (Blue):
  - Connect the center node to root topic nodes
  - Thicker lines (2.5px)
  - Examples: center → `cluster`, center → `event`
 - **Topic Links** (Green):
  - Connect adjacent topics in event chains
  - Line thickness proportional to event frequency
  - Examples: `cluster` → `event`, `api` → `neopattern`
 #### Hover Interactions
 - **Link Hover**: Links become thicker and more opaque when hovered
 - **Event Frequency**: Line thickness dynamically adjusts based on event occurrence counts
 ## Architecture
 ### Component Structure
 ```12:37:spore-ui/public/scripts/components/EventComponent.js
 // Events Component - Visualizes websocket events as a graph
 class EventComponent extends Component {
    constructor(container, viewModel, eventBus) {
        super(container, viewModel, eventBus);
        this.svg = null;
        this.simulation = null;
        this.zoom = null;
        this.width = 0;
        this.height = 0;
        this.isInitialized = false;
        // Center node data - will be initialized with proper coordinates later
        this.centerNode = { id: 'center', type: 'center', label: '', x: 0, y: 0 };
        // Track nodes for D3
        this.graphNodes = [];
        this.graphLinks = [];
        // Track recent events to trigger animations
        this.lastSeenEvents = new Set();
    }
 ```
 ### ViewModel
 The `EventViewModel` manages the state and WebSocket connections:
 ```1241:1253:spore-ui/public/scripts/view-models.js
 // Events View Model for websocket event visualization
 class EventViewModel extends ViewModel {
    constructor() {
        super();
        this.setMultiple({
            events: new Map(), // Map of topic -> { parts: [], count: number, lastSeen: timestamp }
            isLoading: false,
            error: null,
            lastUpdateTime: null
        });
        // Set up WebSocket listeners for real-time updates
        this.setupWebSocketListeners();
    }
 ```
 ### Event Tracking
 Events are tracked with the following metadata:
 - **Topic**: The full event topic path (e.g., `cluster/event/api/neopattern`)
 - **Parts**: Array of topic segments split by `/`
 - **Count**: Total occurrences of this event
 - **First Seen**: ISO timestamp of first occurrence
 - **Last Seen**: ISO timestamp of most recent occurrence
 - **Last Data**: The most recent event payload
 ### Event Addition Logic
 The view model handles nested events specially:
 ```1283:1329:spore-ui/public/scripts/view-models.js
    // Add a topic (parsed by "/" separator)
    addTopic(topic, data = null) {
        // Get current events as a new Map to ensure change detection
        const events = new Map(this.get('events'));
        // Handle nested events from cluster/event
        let fullTopic = topic;
        if (topic === 'cluster/event' && data && data.data) {
            try {
                const parsedData = typeof data.data === 'string' ? JSON.parse(data.data) : data.data;
                if (parsedData && parsedData.event) {
                    // Create nested topic chain: cluster/event/api/neopattern
                    fullTopic = `${topic}/${parsedData.event}`;
                }
            } catch (e) {
                // If parsing fails, just use the original topic
            }
        }
        const parts = fullTopic.split('/').filter(p => p);
        if (events.has(fullTopic)) {
            // Update existing event - create new object to ensure change detection
            const existing = events.get(fullTopic);
            events.set(fullTopic, {
                topic: existing.topic,
                parts: existing.parts,
                count: existing.count + 1,
                firstSeen: existing.firstSeen,
                lastSeen: new Date().toISOString(),
                lastData: data
            });
        } else {
            // Create new event entry
            events.set(fullTopic, {
                topic: fullTopic,
                parts: parts,
                count: 1,
                firstSeen: new Date().toISOString(),
                lastSeen: new Date().toISOString(),
                lastData: data
            });
        }
        // Use set to trigger change notification
        this.set('events', events);
        this.set('lastUpdateTime', new Date().toISOString());
    }
 ```
 ## Graph Construction
 ### Node Creation
 The graph construction process follows two passes:
 1. **First Pass - Node Creation**:
   - Creates nodes for each unique topic segment
   - Preserves existing node positions if they've been dragged
   - New nodes are positioned near their parent in the hierarchy
 2. **Second Pass - Event Counting**:
   - Counts occurrences of each topic segment
   - Updates node counts to reflect event frequency
 ### Link Construction
 Links are created as chains representing complete topic paths:
 ```283:342:spore-ui/public/scripts/components/EventComponent.js
        // Build links as chains for each topic
        // For "cluster/update", create: center -> cluster -> update
        this.graphLinks = [];
        const linkSet = new Set(); // Track links to avoid duplicates
        if (events && events.size > 0) {
            for (const [topic, data] of events) {
                const parts = data.parts;
                if (parts.length === 0) continue;
                // Connect center to first part
                const firstPart = parts[0];
                const centerToFirst = `center-${firstPart}`;
                if (!linkSet.has(centerToFirst)) {
                    this.graphLinks.push({
                        source: 'center',
                        target: firstPart,
                        type: 'center-link',
                        count: data.count,
                        topic: topic
                    });
                    linkSet.add(centerToFirst);
                } else {
                    // Update count for existing link
                    const existingLink = this.graphLinks.find(l => 
                        `${l.source}-${l.target}` === centerToFirst
                    );
                    if (existingLink) {
                        existingLink.count += data.count;
                    }
                }
                // Connect each part to the next (creating a chain)
                for (let i = 0; i < parts.length - 1; i++) {
                    const source = parts[i];
                    const target = parts[i + 1];
                    const linkKey = `${source}-${target}`;
                    if (!linkSet.has(linkKey)) {
                        this.graphLinks.push({
                            source: source,
                            target: target,
                            type: 'topic-link',
                            topic: topic,
                            count: data.count
                        });
                        linkSet.add(linkKey);
                    } else {
                        // Update count for existing link
                        const existingLink = this.graphLinks.find(l => 
                            `${l.source}-${l.target}` === linkKey
                        );
                        if (existingLink) {
                            existingLink.count += data.count;
                        }
                    }
                }
            }
        }
 ```
 ## Force Simulation
 The D3.js force simulation provides the physics-based layout:
 ```103:111:spore-ui/public/scripts/components/EventComponent.js
        // Initialize simulation
        this.simulation = d3.forceSimulation()
            .force('link', d3.forceLink().id(d => d.id).distance(100))
            .force('charge', d3.forceManyBody().strength(-300))
            .force('center', d3.forceCenter(this.width / 2, this.height / 2))
            .force('collision', d3.forceCollide().radius(35))
            .alphaDecay(0.0228) // Slower decay to allow simulation to run longer
            .velocityDecay(0.4); // Higher velocity decay for smoother, less jumpy movement
 ```
 ### Force Parameters
 - **Link Force**: Maintains 100px distance between connected nodes
 - **Charge Force**: -300 strength creates repulsion between nodes
 - **Center Force**: Keeps the graph centered in the viewport
 - **Collision Detection**: Prevents nodes from overlapping (35px collision radius)
 - **Decay Rate**: Slow decay (0.0228) keeps the simulation running smoothly
 - **Velocity Decay**: High decay (0.4) prevents excessive movement
 ## Animation System
 ### Event Arrival Animation
 When a new event arrives, a golden animation dot travels along the event chain:
 ```725:809:spore-ui/public/scripts/components/EventComponent.js
    animateEventMessage(topic, data) {
        const g = this.svg.select('g');
        if (g.empty()) return;
        const parts = data.parts || topic.split('/').filter(p => p);
        if (parts.length === 0) return;
        // Wait for the next tick to ensure nodes exist
        setTimeout(() => {
            // Build the chain: center -> first -> second -> ... -> last
            const chain = ['center', ...parts];
            // Animate along each segment of the chain
            let delay = 0;
            for (let i = 0; i < chain.length - 1; i++) {
                const sourceId = chain[i];
                const targetId = chain[i + 1];
                const sourceNode = this.graphNodes.find(n => n.id === sourceId);
                const targetNode = this.graphNodes.find(n => n.id === targetId);
                if (!sourceNode || !targetNode) continue;
                setTimeout(() => {
                    this.animateDotAlongLink(sourceNode, targetNode, g);
                }, delay);
                // Add delay between segments (staggered animation)
                delay += 400; // Duration (300ms) + small gap (100ms)
            }
        }, 100);
    }
    animateDotAlongLink(sourceNode, targetNode, g) {
        if (!sourceNode || !targetNode || !g) return;
        // Calculate positions
        const dx = targetNode.x - sourceNode.x;
        const dy = targetNode.y - sourceNode.y;
        const length = Math.sqrt(dx * dx + dy * dy);
        if (length === 0) return;
        // Normalize direction
        const nx = dx / length;
        const ny = dy / length;
        // Calculate node radii
        const sourceRadius = sourceNode.type === 'center' ? 18 : 14;
        const targetRadius = targetNode.type === 'center' ? 18 : 14;
        // Start from edge of source node
        const startX = sourceNode.x + nx * sourceRadius;
        const startY = sourceNode.y + ny * sourceRadius;
        // End at edge of target node
        const endX = targetNode.x - nx * targetRadius;
        const endY = targetNode.y - ny * targetRadius;
        // Create animation dot
        const animationGroup = g.append('g').attr('class', 'animation-group');
        const dot = animationGroup.append('circle')
            .attr('r', 4)
            .attr('fill', '#FFD700')
            .attr('stroke', '#fff')
            .attr('stroke-width', 2)
            .attr('cx', startX)
            .attr('cy', startY);
        // Animate the dot along the path
        dot.transition()
            .duration(300)
            .ease(d3.easeLinear)
            .attr('cx', endX)
            .attr('cy', endY)
            .on('end', function() {
                // Fade out after reaching destination
                dot.transition()
                    .duration(100)
                    .style('opacity', 0)
                    .remove();
                animationGroup.remove();
            });
    }
 ```
 ### Animation Characteristics
 - **Golden Dot**: Visual indicator traveling along event chains
 - **Staggered Timing**: Each segment of a multi-part topic animates sequentially
 - **Duration**: 300ms per segment with 100ms delay between segments
 - **Smooth Motion**: Linear easing for consistent speed
 ## WebSocket Integration
 The Events view subscribes to all WebSocket messages through the gateway:
 ```1256:1280:spore-ui/public/scripts/view-models.js
    // Set up WebSocket event listeners
    setupWebSocketListeners() {
        if (!window.wsClient) {
            // Retry after a short delay to allow wsClient to initialize
            setTimeout(() => this.setupWebSocketListeners(), 1000);
            return;
        }
        // Listen for all websocket messages
        window.wsClient.on('message', (data) => {
            const topic = data.topic || data.type;
            if (topic) {
                this.addTopic(topic, data);
            }
        });
        // Listen for connection status changes
        window.wsClient.on('connected', () => {
            logger.info('EventViewModel: WebSocket connected');
        });
        window.wsClient.on('disconnected', () => {
            logger.debug('EventViewModel: WebSocket disconnected');
        });
    }
 ```
 ### Event Types Tracked
 All WebSocket messages are captured and displayed, including:
 - **cluster/update**: Node discovery and cluster membership changes
 - **cluster/event**: Arbitrary events from cluster members
 - **api/tasks**: Task execution notifications
 - **api/config**: Configuration updates
 - **node/***: Node-specific events
 - Any custom topics sent by SPORE nodes
 ## Empty State
 When no events have been received, the view displays a helpful message:
 ```604:632:spore-ui/public/scripts/components/EventComponent.js
    showEmptyState() {
        if (!this.isInitialized || !this.svg) return;
        const g = this.svg.select('g');
        if (g.empty()) return;
        // Remove any existing message
        g.selectAll('.empty-state').remove();
        // Account for the initial zoom transform (scale(1.4) translate(-200, -150))
        // We need to place the text in the center of the transformed coordinate space
        const transformX = -200;
        const transformY = -150;
        const scale = 1.4;
        // Calculate centered position in transformed space
        const x = ((this.width / 2) - transformX) / scale;
        const y = ((this.height / 2) - transformY) / scale;
        const emptyMsg = g.append('text')
            .attr('class', 'empty-state')
            .attr('x', x)
            .attr('y', y)
            .attr('text-anchor', 'middle')
            .attr('font-size', '18px')
            .attr('fill', 'var(--text-secondary)')
            .attr('font-weight', '500')
            .text('Waiting for websocket events...');
    }
 ```
 ## Best Practices
 ### Performance Considerations
 1. **Event Accumulation**: Events accumulate over time; consider clearing the view for long-running sessions
 2. **Many Events**: With hundreds of unique topics, the graph may become cluttered
 3. **Animation**: Rapid event bursts may cause overlapping animations
 ### Usage Tips
 1. **Rearrange Regularly**: Use the rearrange button to clean up the layout after many events
 2. **Drag Center Node**: Move the entire graph to see different areas of the visualization
 3. **Zoom Out**: Zoom out to see the overall event pattern across the cluster
 4. **Interactive Exploration**: Hover over links to see event frequencies
 ## Troubleshooting
 ### No Events Showing
 - **Check WebSocket Connection**: Verify the gateway WebSocket is connected
 - **Check Node Activity**: Ensure SPORE nodes are actively sending events
 - **Browser Console**: Check for any JavaScript errors
 ### Graph Not Updating
 - **Force Refresh**: Reload the page to reinitialize the WebSocket connection
 - **Check Gateway**: Verify the SPORE Gateway is running and accessible
 ### Performance Issues
 - **Clear Events**: Reload the page to clear accumulated events
 - **Reduce Events**: Limit the event rate in your SPORE nodes
 - **Browser Settings**: Ensure hardware acceleration is enabled
 ## Technical Details
 ### Dependencies
 - **D3.js v7**: Force-directed graph simulation and SVG manipulation
 - **SPORE Gateway**: WebSocket connection to cluster event stream
 - **Component Framework**: Built on the SPORE UI component architecture
 ### Browser Compatibility
 - **Modern Browsers**: Chrome, Firefox, Safari, Edge (latest versions)
 - **SVG Support**: Requires modern browser with full SVG support
 - **WebSocket Support**: Native WebSocket API required
 ### View Structure
 ```254:262:spore-ui/public/index.html
        <div id="events-view" class="view-content">
            <div class="view-section" style="height: 100%; display: flex; flex-direction: column;">
                <div id="events-graph-container" style="flex: 1; min-height: 0;">
                    <div class="loading">
                        <div>Waiting for websocket events...</div>
                    </div>
                </div>
            </div>
        </div>
 ```
 The Events view provides a unique perspective on cluster activity, making it easy to observe the flow of events through the SPORE system in real-time.
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,78 +0,0 @@
 # SPORE UI Documentation
 This directory contains detailed documentation for the SPORE UI frontend application.
 ## Documentation Index
 ### Core Documentation
 - **[Framework](./FRAMEWORK_README.md)**: Component-based architecture, View Models, Event Bus, and framework conventions
 - **[Discovery](./DISCOVERY.md)**: Node discovery system and cluster management
 - **[Topology WebSocket Update](./TOPOLOGY_WEBSOCKET_UPDATE.md)**: Real-time topology visualization updates
 - **[Logging](./LOGGING.md)**: Logging system and debugging utilities
 ### Feature Documentation
 - **[Events](./Events.md)**: Real-time WebSocket event visualization with interactive force-directed graph
 - **[Firmware Registry Integration](./FIRMWARE_REGISTRY_INTEGRATION.md)**: Integration with the firmware registry system
 ## Feature Overview
 ### Events Feature
 The Events feature provides real-time visualization of WebSocket events streaming through the SPORE cluster. It displays events as an interactive force-directed graph, showing the flow and relationships between different event topics.
 **Key Capabilities:**
 - Real-time event tracking and visualization
 - Interactive force-directed graph layout
 - Event counting and frequency visualization
 - Animated event flow visualization
 - Topic hierarchy display
 See [Events.md](./Events.md) for complete documentation.
 ### Framework Architecture
 The SPORE UI uses a component-based architecture with:
 - View Models for state management
 - Components for UI rendering
 - Event Bus for pub/sub communication
 - API Client for backend integration
 See [FRAMEWORK_README.md](./FRAMEWORK_README.md) for architecture details.
 ### Discovery System
 The discovery system enables automatic detection of SPORE nodes on the network, maintaining a real-time view of cluster members.
 See [DISCOVERY.md](./DISCOVERY.md) for implementation details.
 ### Topology Visualization
 The topology view provides an interactive network graph showing relationships between cluster nodes in real-time.
 See [TOPOLOGY_WEBSOCKET_UPDATE.md](./TOPOLOGY_WEBSOCKET_UPDATE.md) for detailed documentation.
 ## Quick Reference
 ### Most Popular Pages
 1. [Framework Architecture](./FRAMEWORK_README.md) - Start here for understanding the codebase
 2. [Events Feature](./Events.md) - Real-time event visualization
 3. [Firmware Registry Integration](./FIRMWARE_REGISTRY_INTEGRATION.md) - Firmware management
 ### Developer Resources
 - Component development: See [FRAMEWORK_README.md](./FRAMEWORK_README.md)
 - Debugging: See [LOGGING.md](./LOGGING.md)
 - Testing: See individual component documentation
 ## Contributing
 When adding new features or documentation:
 1. Follow the existing documentation structure
 2. Include code examples and diagrams where helpful
 3. Update this README when adding new documentation files
 4. Maintain consistency with existing documentation style
 ## Related Documentation
 For information about other SPORE components:
 - **SPORE Gateway**: See `spore-gateway/README.md`
 - **SPORE Registry**: See `spore-registry/README.md`
 - **SPORE Embedded**: See `spore/README.md`
--- a/docs/TOPOLOGY_WEBSOCKET_UPDATE.md
+++ b/docs/TOPOLOGY_WEBSOCKET_UPDATE.md
@@ -1,248 +0,0 @@
 # Topology Component WebSocket Integration
 ## Summary
 Enhanced the topology graph component to support real-time node additions and removals via WebSocket connections. The topology view now automatically updates when nodes join or leave the cluster without requiring manual refresh. Existing nodes update their properties (status, labels) smoothly in place without being removed and re-added.
 ## Changes Made
 ### 1. TopologyViewModel (`spore-ui/public/scripts/view-models.js`)
 Added `setupWebSocketListeners()` method to the TopologyViewModel class:
 - **Listens to `clusterUpdate` events**: When cluster membership changes, the topology graph is automatically rebuilt with the new node data
 - **Listens to `nodeDiscovery` events**: When a new node is discovered or becomes stale, triggers a topology update
 - **Listens to connection status**: Automatically refreshes topology when WebSocket reconnects
 - **Async graph updates**: Rebuilds graph data asynchronously from WebSocket data to avoid blocking the UI
 Enhanced `buildEnhancedGraphData()` method to preserve node state:
 - **Position preservation**: Existing nodes retain their x, y coordinates across updates
 - **Velocity preservation**: D3 simulation velocity (vx, vy) is maintained for smooth physics
 - **Fixed position preservation**: Manually dragged nodes (fx, fy) stay in place
 - **New nodes only**: Only newly discovered nodes get random initial positions
 - **Result**: Nodes no longer "jump" or get removed/re-added when their properties update
 ### 2. TopologyGraphComponent (`spore-ui/public/scripts/components/TopologyGraphComponent.js`)
 #### Added WebSocket Setup
 - Added `setupWebSocketListeners()` method that calls the view model's WebSocket setup during component initialization
 - Integrated into the `initialize()` lifecycle method
 #### Improved Dynamic Updates (D3.js Enter/Exit Pattern)
 Refactored the graph rendering to use D3's data binding patterns for smooth transitions:
 - **`updateLinks()`**: Uses enter/exit pattern to add/remove links with fade transitions
 - **`updateNodes()`**: Uses enter/exit pattern to add/remove nodes with fade transitions
  - New nodes fade in (300ms transition)
  - Removed nodes fade out (300ms transition)
  - Existing nodes smoothly update their properties
 - **`updateLinkLabels()`**: Dynamically updates link latency labels
 - **`updateSimulation()`**: Handles D3 force simulation updates
  - Creates new simulation on first render
  - Updates existing simulation with new node/link data on subsequent renders
  - Maintains smooth physics-based layout
 - **`addLegend()`**: Fixed to prevent duplicate legend creation
 #### Key Improvements
 - **Incremental updates**: Instead of recreating the entire graph, only modified nodes/links are added or removed
 - **Smooth animations**: 300ms fade transitions for adding/removing elements
 - **In-place updates**: Existing nodes update their properties without being removed/re-added
 - **Preserved interactions**: Click, hover, and drag interactions work seamlessly with dynamic updates
 - **Efficient rendering**: D3's data binding with key functions ensures optimal DOM updates
 - **Intelligent simulation**: Uses different alpha values (0.1 for updates, 0.3 for additions/removals) to minimize disruption
 - **Drag-aware updates**: WebSocket updates are deferred while dragging and applied after drag completes
 - **Uninterrupted dragging**: Drag operations are never interrupted by incoming updates
 - **Rearrange button**: Convenient UI control to reset node layout and clear manual positioning
 ## How It Works
 ### Data Flow
 ```
 WebSocket Server (spore-ui backend)
  ↓ (cluster_update / node_discovery events)
 WebSocketClient (api-client.js)
  ↓ (emits clusterUpdate / nodeDiscovery events)
 TopologyViewModel.setupWebSocketListeners()
  ↓ (builds graph data, updates state)
 TopologyGraphComponent subscriptions
  ↓ (renderGraph() called automatically)
  ├─ If dragging: queue update in pendingUpdate
  └─ If not dragging: apply update immediately
 D3.js enter/exit pattern
  ↓ (smooth visual updates)
 Updated Topology Graph
 ```
 ### Simplified Update Architecture
 **Core Principle**: The D3 simulation is the single source of truth for positions.
 #### How It Works:
 1. **Drag Deferral**:
   - `isDragging` flag blocks updates during drag
   - Updates queued in `pendingUpdate` and applied after drag ends
   - Dragged positions saved in `draggedNodePositions` Map for persistence
 2. **Position Merging** (in `updateNodes()`):
   - When simulation exists: copy live positions from simulation nodes to new data
   - This preserves ongoing animations and velocities
   - Then apply dragged positions (if any) as overrides
   - Result: Always use most current position state
 3. **Smart Simulation Updates** (in `updateSimulation()`):
   - **Structural changes** (nodes added/removed): restart with alpha=0.3
   - **Property changes** (status, labels): DON'T restart - just update data
   - Simulation continues naturally for property-only changes
   - No unnecessary disruptions to ongoing animations
 This ensures:
 - ✅ Simulation is authoritative for positions
 - ✅ No position jumping during animations
 - ✅ Property updates don't disrupt node movement
 - ✅ Dragged positions always respected
 - ✅ Simple, clean logic with one source of truth
 ### WebSocket Events Handled
 1. **`clusterUpdate`** (from `cluster_update` message type)
   - Payload: `{ members: [...], primaryNode: string, totalNodes: number, timestamp: string }`
   - Action: Rebuilds graph with current cluster state
 2. **`nodeDiscovery`** (from `node_discovery` message type)
   - Payload: `{ action: 'discovered' | 'stale', nodeIp: string, timestamp: string }`
   - Action: Triggers topology refresh after 500ms delay
 3. **`connected`** (WebSocket connection established)
   - Action: Triggers topology refresh after 1000ms delay
 4. **`disconnected`** (WebSocket connection lost)
   - Action: Logs disconnection (no action taken)
 ## Benefits
 1. **Real-time Updates**: Topology reflects cluster state changes immediately
 2. **Smooth Transitions**: Nodes and links fade in/out gracefully
 3. **Better UX**: No manual refresh needed
 4. **Efficient**: Only updates changed elements, not entire graph
 5. **Resilient**: Automatically refreshes on reconnection
 6. **Consistent**: Uses same WebSocket infrastructure as ClusterStatusComponent
 ## Testing
 To test the WebSocket integration:
 1. **Start the application**:
   ```bash
   cd spore-ui
   node index-standalone.js
   ```
 2. **Open the UI** and navigate to the Topology view
 3. **Add a node**: Start a new SPORE device on the network
   - Watch it appear in the topology graph within seconds
   - Node should fade in smoothly
 4. **Remove a node**: Stop a SPORE device
   - Watch it fade out from the topology graph
   - Connected links should also disappear
 5. **Status changes**: Change node status (active → inactive → dead)
   - Node colors should update automatically
   - Status indicators should change
 6. **Drag during updates**:
   - Start dragging a node
   - While dragging, trigger a cluster update (add/remove/change another node)
   - Drag should continue smoothly without interruption
   - After releasing, the update should be applied immediately
   - **Important**: The dragged node should stay at its final position, not revert
 7. **Position persistence after drag**:
   - Drag a node to a new position and release
   - Trigger multiple WebSocket updates (status changes, new nodes, etc.)
   - The dragged node should remain in its new position through all updates
   - Only when the node is removed should its position be forgotten
 8. **Update during animation**:
   - Let the graph settle (simulation running, nodes animating to stable positions)
   - While nodes are still moving, trigger a WebSocket update (status change)
   - **Expected**: Nodes should continue their smooth animation without jumping
   - **No flickering**: Positions should not snap back and forth
   - Animation should feel continuous and natural
 9. **Single node scenario**:
   - Start with multiple nodes in the topology
   - Remove nodes one by one until only one remains
   - **Expected**: Single node stays visible, no "loading" message
   - Graph should render correctly with just one node
   - Remove the last node
   - **Expected**: "No cluster members found" message appears
 10. **Rearrange nodes**:
   - Drag nodes to custom positions manually
   - Click the "Rearrange" button in the top-left corner
   - **Expected**: All nodes reset to physics-based positions
   - Dragged positions cleared, simulation restarts
   - Nodes animate to a clean, evenly distributed layout
 11. **WebSocket reconnection**: 
   - Disconnect from network briefly
   - Reconnect
   - Topology should refresh automatically
 ## Technical Notes
 ### Architecture
 - **Single Source of Truth**: D3 simulation manages all position state
 - **Key Functions**: D3 data binding uses node IPs as keys to track identity
 - **Transition Duration**: 300ms for fade in/out animations
 ### Position Management (Simplified!)
 - **updateNodes()**: Copies live positions from simulation to new data before binding
 - **No complex syncing**: Simulation state flows naturally to new data
 - **Dragged positions**: Override via `draggedNodePositions` Map (always respected)
 ### Simulation Behavior
 - **Structural changes** (add/remove nodes): Restart with alpha=0.3
 - **Property changes** (status, labels): No restart - data updated in-place
 - **Drag operations**: Simulation updates blocked entirely
 - **Result**: Smooth animations for property updates, controlled restart for structure changes
 ### Drag Management
 - **isDragging flag**: Blocks all updates during drag
 - **pendingUpdate**: Queues one update, applied 50ms after drag ends
 - **draggedNodePositions Map**: Persists manual positions across all updates
 - **Cleanup**: Map entries removed when nodes deleted
 ### Performance
 - **No unnecessary restarts**: Property-only updates don't disrupt simulation
 - **Efficient merging**: Position data copied via Map lookup (O(n))
 - **Memory efficient**: Only active nodes tracked, old entries cleaned up
 - **Smooth animations**: Velocity and momentum preserved across updates
 ### Edge Cases Handled
 - **Single node**: Graph renders correctly with just one node
 - **Transient states**: Loading/no-data states don't clear existing SVG
 - **Update races**: SVG preserved even if loading state triggered during render
 - **Empty to non-empty**: Smooth transition from loading to first node
 ## Future Enhancements
 Possible improvements for future iterations:
 1. **Diff-based updates**: Only rebuild graph when node/link structure actually changes
 2. **Visual indicators**: Show "new node" or "leaving node" badges temporarily
 3. **Connection health**: Real-time latency updates on links without full rebuild
 4. **Throttling**: Debounce rapid successive updates
 5. **Persistent layout**: Save and restore user-arranged topology layouts
 6. **Zoom to node**: Auto-zoom to newly added nodes with animation
 ## Related Files
 - `spore-ui/public/scripts/view-models.js` - TopologyViewModel class
 - `spore-ui/public/scripts/components/TopologyGraphComponent.js` - Topology visualization component
 - `spore-ui/public/scripts/api-client.js` - WebSocketClient class
 - `spore-ui/index-standalone.js` - WebSocket server implementation
--- a/index-standalone.js
+++ b/index-standalone.js
@@ -70,34 +70,14 @@ udpServer.on('message', (msg, rinfo) => {
    console.log(`📨 UDP message received from ${sourceIp}:${sourcePort}: "${message}"`);
-    // Extract topic by splitting on first ":"
+    if (message.startsWith('CLUSTER_HEARTBEAT:')) {
-    const parts = message.split(':', 2);
+      // Handle heartbeat messages that update member list
-    if (parts.length < 2) {
+      const hostname = message.substring('CLUSTER_HEARTBEAT:'.length);
-      console.log(`Invalid message format from ${sourceIp}:${sourcePort}: "${message}"`);
+      updateNodeFromHeartbeat(sourceIp, sourcePort, hostname);
-      return;
+    } else if (message.startsWith('NODE_UPDATE:')) {
-    }
+      // Handle node update messages that provide detailed node info
-
+      handleNodeUpdate(sourceIp, message);
-    const topic = parts[0] + ':';
+    } else if (!message.startsWith('RAW:')) {
    const payload = parts[1];
    // Handler map for different UDP message types
    const handlers = {
      'cluster/heartbeat:': (payload, sourceIp, sourcePort) => {
        updateNodeFromHeartbeat(sourceIp, sourcePort, payload);
      },
      'node/update:': (payload, sourceIp) => {
        handleNodeUpdate(sourceIp, 'node/update:' + payload);
      },
      'raw:': () => {
        // Ignore raw messages
      }
    };
    // Look up and execute handler
    const handler = handlers[topic];
    if (handler) {
      handler(payload, sourceIp, sourcePort);
    } else {
      console.log(`Received unknown message from ${sourceIp}:${sourcePort}: "${message}"`);
    }
  } catch (error) {
@@ -939,7 +919,7 @@ function broadcastClusterUpdate() {
    // Get cluster members asynchronously
    getCurrentClusterMembers().then(members => {
      const clusterData = {
-        topic: 'cluster/update',
+        type: 'cluster_update',
        members: members,
        primaryNode: primaryNodeIp,
        totalNodes: discoveredNodes.size,
@@ -966,7 +946,7 @@ function broadcastNodeDiscovery(nodeIp, action) {
  if (wsClients.size === 0 || !wss) return;
  const eventData = {
-    topic: 'node/discovery',
+    type: 'node_discovery',
    action: action, // 'discovered' or 'stale'
    nodeIp: nodeIp,
    timestamp: new Date().toISOString()
@@ -1142,7 +1122,7 @@ const server = app.listen(PORT, '0.0.0.0', () => {
  initializeWebSocketServer(server);
  console.log('WebSocket server ready for real-time updates');
-  console.log('Waiting for cluster/heartbeat and node/update messages from SPORE nodes...');
+  console.log('Waiting for CLUSTER_HEARTBEAT and NODE_UPDATE messages from SPORE nodes...');
 });
 // Graceful shutdown handling
--- a/index.js
+++ b/index.js
@@ -19,7 +19,12 @@ const PORT = process.env.PORT || 3000;
 // Serve static files from public directory
 app.use(express.static(path.join(__dirname, 'public')));
-// Health check endpoint (before catch-all route)
+// Serve the main HTML page
 app.get('/', (req, res) => {
  res.sendFile(path.join(__dirname, 'public', 'index.html'));
 });
 // Health check endpoint
 app.get('/health', (req, res) => {
  res.json({
    status: 'healthy',
@@ -29,13 +34,6 @@ app.get('/health', (req, res) => {
  });
 });
 // SPA catch-all route - serves index.html for all routes
 // This allows client-side routing to work properly
 // Using regex pattern for Express 5 compatibility
 app.get(/^\/(?!health$).*/, (req, res) => {
  res.sendFile(path.join(__dirname, 'public', 'index.html'));
 });
 // Start the server
 app.listen(PORT, '0.0.0.0', () => {
  console.log(`SPORE UI Frontend Server is running on http://0.0.0.0:${PORT}`);
--- a/public/index.html
+++ b/public/index.html
@@ -18,7 +18,7 @@
                </svg>
            </button>
            <div class="nav-left">
-                <a href="/cluster" class="nav-tab active" data-view="cluster">
+                <button class="nav-tab active" data-view="cluster">
                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16" style="margin-right:6px;">
                        <circle cx="12" cy="12" r="9"/>
                        <circle cx="8" cy="10" r="1.5"/>
@@ -27,8 +27,8 @@
                        <path d="M9 11l3 3M9 11l6-3"/>
                    </svg>
                    Cluster
-                </a>
+                </button>
-                <a href="/topology" class="nav-tab" data-view="topology">
+                <button class="nav-tab" data-view="topology">
                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16" style="margin-right:6px;">
                        <circle cx="12" cy="4" r="1.6"/>
                        <circle cx="19" cy="9" r="1.6"/>
@@ -38,42 +38,22 @@
                        <path d="M12 4L16 18M16 18L5 9M5 9L19 9M19 9L8 18M8 18L12 4"/>
                    </svg>
                    Topology
-                </a>
+                </button>
-                <a href="/events" class="nav-tab" data-view="events">
+                <button class="nav-tab" data-view="monitoring">
                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16" style="margin-right:6px;">
                        <circle cx="5" cy="12" r="1.5" fill="currentColor"/>
                        <circle cx="18" cy="6" r="1.5" fill="currentColor"/>
                        <circle cx="18" cy="12" r="1.5" fill="currentColor"/>
                        <circle cx="18" cy="18" r="1.5" fill="currentColor"/>
                        <line x1="6.5" y1="12" x2="16.5" y2="6"/>
                        <line x1="6.5" y1="12" x2="16.5" y2="12"/>
                        <line x1="6.5" y1="12" x2="16.5" y2="18"/>
                    </svg>
                    Events
                </a>
                <a href="/monitoring" class="nav-tab" data-view="monitoring">
                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16" style="margin-right:6px;">
                        <path d="M3 12h3l2 7 4-14 3 10 2-6h4"/>
                    </svg>
                    Monitoring
-                </a>
+                </button>
-                <a href="/firmware" class="nav-tab" data-view="firmware">
+                <button class="nav-tab" data-view="firmware">
                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16" style="margin-right:6px;">
                        <path d="M4 7l8-4 8 4v10l-8 4-8-4z"/>
                        <path d="M12 8v8"/>
                    </svg>
                    Firmware
-                </a>
+                </button>
            </div>
            <div class="nav-right">
                <div class="random-primary-switcher">
                    <button class="random-primary-toggle" id="random-primary-toggle" title="Select random primary node">
                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="20" height="20">
                            <path d="M1 4v6h6M23 20v-6h-6" />
                            <path d="M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15" />
                        </svg>
                    </button>
                </div>
                <div class="theme-switcher">
                    <button class="theme-toggle" id="theme-toggle" title="Toggle theme">
                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
@@ -250,16 +230,6 @@
                </div>
            </div>
        </div>
        <div id="events-view" class="view-content">
            <div class="view-section" style="height: 100%; display: flex; flex-direction: column;">
                <div id="events-graph-container" style="flex: 1; min-height: 0;">
                    <div class="loading">
                        <div>Waiting for websocket events...</div>
                    </div>
                </div>
            </div>
        </div>
    </div>
    <script src="./vendor/d3.v7.min.js"></script>
@@ -286,7 +256,6 @@
    <script src="./scripts/components/ClusterStatusComponent.js"></script>
    <script src="./scripts/components/TopologyGraphComponent.js"></script>
    <script src="./scripts/components/MonitoringViewComponent.js"></script>
    <script src="./scripts/components/EventComponent.js"></script>
    <script src="./scripts/components/ComponentsLoader.js"></script>
    <script src="./scripts/theme-manager.js"></script>
    <script src="./scripts/app.js"></script>
--- a/public/scripts/api-client.js
+++ b/public/scripts/api-client.js
@@ -72,13 +72,6 @@ class ApiClient {
        });
    }
    async setPrimaryNode(ip) {
        return this.request(`/api/discovery/primary/${encodeURIComponent(ip)}`, {
            method: 'POST',
            body: { timestamp: new Date().toISOString() }
        });
    }
    async getNodeStatus(ip) {
        return this.request(`/api/node/status/${encodeURIComponent(ip)}`, { method: 'GET' });
    }
@@ -156,9 +149,7 @@ class ApiClient {
        return this.request('/api/registry/firmware', {
            method: 'POST',
-            body: formData,
+            body: formData
            isForm: true,
            headers: {}
        });
    }
@@ -189,12 +180,6 @@ class ApiClient {
        return response.blob();
    }
    async deleteFirmwareFromRegistry(name, version) {
        return this.request(`/api/registry/firmware/${encodeURIComponent(name)}/${encodeURIComponent(version)}`, {
            method: 'DELETE'
        });
    }
    // Rollout API methods
    async getClusterNodeVersions() {
        return this.request('/api/cluster/node/versions', { method: 'GET' });
@@ -263,8 +248,7 @@ class WebSocketClient {
            try {
                const data = JSON.parse(event.data);
                logger.debug('WebSocket message received:', data);
-                const messageTopic = data.topic || data.type;
+                logger.debug('WebSocket message type:', data.type);
                logger.debug('WebSocket message topic:', messageTopic);
                this.emit('message', data);
                this.handleMessage(data);
            } catch (error) {
@@ -289,21 +273,21 @@ class WebSocketClient {
    }
    handleMessage(data) {
-        const messageTopic = data.topic || data.type;
+        switch (data.type) {
-        
+            case 'cluster_update':
-        // Handler map for different WebSocket message types
+                this.emit('clusterUpdate', data);
-        const handlers = {
+                break;
-            'cluster/update': (data) => this.emit('clusterUpdate', data),
+            case 'node_discovery':
-            'node/discovery': (data) => this.emit('nodeDiscovery', data),
+                this.emit('nodeDiscovery', data);
-            'firmware/upload/status': (data) => this.emit('firmwareUploadStatus', data),
+                break;
-            'rollout/progress': (data) => this.emit('rolloutProgress', data)
+            case 'firmware_upload_status':
-        };
+                this.emit('firmwareUploadStatus', data);
-        
+                break;
-        const handler = handlers[messageTopic];
+            case 'rollout_progress':
-        if (handler) {
+                this.emit('rolloutProgress', data);
-            handler(data);
+                break;
-        } else {
+            default:
-            logger.debug('Unknown WebSocket message topic:', messageTopic);
+                logger.debug('Unknown WebSocket message type:', data.type);
        }
    }
--- a/public/scripts/app.js
+++ b/public/scripts/app.js
@@ -17,8 +17,7 @@ document.addEventListener('DOMContentLoaded', async function() {
    const clusterFirmwareViewModel = new ClusterFirmwareViewModel();
    const topologyViewModel = new TopologyViewModel();
    const monitoringViewModel = new MonitoringViewModel();
-    const eventsViewModel = new EventViewModel();
+    logger.debug('App: View models created:', { clusterViewModel, firmwareViewModel, clusterFirmwareViewModel, topologyViewModel, monitoringViewModel });
    logger.debug('App: View models created:', { clusterViewModel, firmwareViewModel, clusterFirmwareViewModel, topologyViewModel, monitoringViewModel, eventsViewModel });
    // Connect firmware view model to cluster data
    clusterViewModel.subscribe('members', (members) => {
@@ -66,7 +65,6 @@ document.addEventListener('DOMContentLoaded', async function() {
    app.registerRoute('topology', TopologyGraphComponent, 'topology-view', topologyViewModel);
    app.registerRoute('firmware', FirmwareViewComponent, 'firmware-view', firmwareViewModel);
    app.registerRoute('monitoring', MonitoringViewComponent, 'monitoring-view', monitoringViewModel);
    app.registerRoute('events', EventComponent, 'events-view', eventsViewModel);
    logger.debug('App: Routes registered and components pre-initialized');
    // Initialize cluster status component for header badge
@@ -79,65 +77,6 @@ document.addEventListener('DOMContentLoaded', async function() {
    clusterStatusComponent.mount();
    logger.debug('App: Cluster status component initialized');
    // Set up random primary node button
    logger.debug('App: Setting up random primary node button...');
    const randomPrimaryBtn = document.getElementById('random-primary-toggle');
    if (randomPrimaryBtn) {
        randomPrimaryBtn.addEventListener('click', async function() {
            try {
                // Add spinning animation
                randomPrimaryBtn.classList.add('spinning');
                randomPrimaryBtn.disabled = true;
                logger.debug('App: Selecting random primary node...');
                await clusterViewModel.selectRandomPrimaryNode();
                // Show success state briefly
                logger.info('App: Random primary node selected successfully');
                // Refresh topology to show new primary node connections
                // Wait a bit for the backend to update, then refresh topology
                setTimeout(async () => {
                    logger.debug('App: Refreshing topology after primary node change...');
                    try {
                        await topologyViewModel.updateNetworkTopology();
                        logger.debug('App: Topology refreshed successfully');
                    } catch (error) {
                        logger.error('App: Failed to refresh topology:', error);
                    }
                }, 1000);
                // Also refresh cluster view to update member list with new primary
                setTimeout(async () => {
                    logger.debug('App: Refreshing cluster view after primary node change...');
                    try {
                        if (clusterViewModel.updateClusterMembers) {
                            await clusterViewModel.updateClusterMembers();
                        }
                        logger.debug('App: Cluster view refreshed successfully');
                    } catch (error) {
                        logger.error('App: Failed to refresh cluster view:', error);
                    }
                }, 1000);
                // Remove spinning animation after delay
                setTimeout(() => {
                    randomPrimaryBtn.classList.remove('spinning');
                    randomPrimaryBtn.disabled = false;
                }, 1500);
            } catch (error) {
                logger.error('App: Failed to select random primary node:', error);
                randomPrimaryBtn.classList.remove('spinning');
                randomPrimaryBtn.disabled = false;
                // Show error notification (could be enhanced with a toast notification)
                alert('Failed to select random primary node: ' + error.message);
            }
        });
        logger.debug('App: Random primary node button configured');
    }
    // Set up navigation event listeners
    logger.debug('App: Setting up navigation...');
    app.setupNavigation();
--- a/public/scripts/components/EventComponent.js
+++ b/public/scripts/components/EventComponent.js
--- a/public/scripts/components/FirmwareComponent.js
+++ b/public/scripts/components/FirmwareComponent.js
@@ -53,11 +53,6 @@ class FirmwareComponent extends Component {
        logger.debug('FirmwareComponent: Mounted successfully');
    }
    unmount() {
        this.cleanupDynamicListeners();
        super.unmount();
    }
    async checkRegistryConnection() {
        try {
            await window.apiClient.getRegistryHealth();
@@ -154,10 +149,8 @@ class FirmwareComponent extends Component {
            `;
            return;
        }
-        
+            
-        // Auto-expand groups when search is active to show results
+        const firmwareHTML = filteredGroups.map(group => this.renderFirmwareGroup(group)).join('');
        const autoExpand = searchQuery.trim().length > 0;
        const firmwareHTML = filteredGroups.map(group => this.renderFirmwareGroup(group, autoExpand)).join('');
        container.innerHTML = `
            <div class="firmware-groups">
@@ -169,22 +162,14 @@ class FirmwareComponent extends Component {
        this.setupFirmwareItemListeners();
    }
-    renderFirmwareGroup(group, autoExpand = false) {
+    renderFirmwareGroup(group) {
        const versionsHTML = group.firmware.map(firmware => this.renderFirmwareVersion(firmware)).join('');
        // Add 'expanded' class if autoExpand is true (e.g., when search results are shown)
        const expandedClass = autoExpand ? 'expanded' : '';
        return `
-            <div class="firmware-group ${expandedClass}">
+            <div class="firmware-group">
                <div class="firmware-group-header">
-                    <div class="firmware-group-header-content">
+                    <h3 class="firmware-group-name">${this.escapeHtml(group.name)}</h3>
-                        <h3 class="firmware-group-name">${this.escapeHtml(group.name)}</h3>
+                    <span class="firmware-group-count">${group.firmware.length} version${group.firmware.length !== 1 ? 's' : ''}</span>
                        <span class="firmware-group-count">${group.firmware.length} version${group.firmware.length !== 1 ? 's' : ''}</span>
                    </div>
                    <svg class="firmware-group-chevron" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="20" height="20">
                        <polyline points="6 9 12 15 18 9"/>
                    </svg>
                </div>
                <div class="firmware-versions">
                    ${versionsHTML}
@@ -288,25 +273,10 @@ class FirmwareComponent extends Component {
    }
    setupFirmwareItemListeners() {
        // First, clean up existing listeners for dynamically created content
        this.cleanupDynamicListeners();
        this.dynamicUnsubscribers = [];
        // Firmware group header clicks (for expand/collapse)
        const groupHeaders = this.findAllElements('.firmware-group-header');
        groupHeaders.forEach(header => {
            const handler = (e) => {
                const group = header.closest('.firmware-group');
                group.classList.toggle('expanded');
            };
            header.addEventListener('click', handler);
            this.dynamicUnsubscribers.push(() => header.removeEventListener('click', handler));
        });
        // Version item clicks (for editing)
        const versionItems = this.findAllElements('.firmware-version-item.clickable');
        versionItems.forEach(item => {
-            const handler = (e) => {
+            this.addEventListener(item, 'click', (e) => {
                // Don't trigger if clicking on action buttons
                if (e.target.closest('.firmware-version-actions')) {
                    return;
@@ -315,61 +285,44 @@ class FirmwareComponent extends Component {
                const name = item.getAttribute('data-name');
                const version = item.getAttribute('data-version');
                this.showEditFirmwareForm(name, version);
-            };
+            });
            item.addEventListener('click', handler);
            this.dynamicUnsubscribers.push(() => item.removeEventListener('click', handler));
        });
        // Rollout buttons
        const rolloutBtns = this.findAllElements('.rollout-btn');
        rolloutBtns.forEach(btn => {
-            const handler = (e) => {
+            this.addEventListener(btn, 'click', (e) => {
                e.stopPropagation();
                const name = btn.getAttribute('data-name');
                const version = btn.getAttribute('data-version');
                const labels = JSON.parse(btn.getAttribute('data-labels') || '{}');
                this.showRolloutPanel(name, version, labels);
-            };
+            });
            btn.addEventListener('click', handler);
            this.dynamicUnsubscribers.push(() => btn.removeEventListener('click', handler));
        });
        // Download buttons
        const downloadBtns = this.findAllElements('.download-btn');
        downloadBtns.forEach(btn => {
-            const handler = (e) => {
+            this.addEventListener(btn, 'click', (e) => {
                e.stopPropagation();
                const name = btn.getAttribute('data-name');
                const version = btn.getAttribute('data-version');
                this.downloadFirmware(name, version);
-            };
+            });
            btn.addEventListener('click', handler);
            this.dynamicUnsubscribers.push(() => btn.removeEventListener('click', handler));
        });
        // Delete buttons
        const deleteBtns = this.findAllElements('.delete-btn');
        logger.debug('Found delete buttons:', deleteBtns.length);
        deleteBtns.forEach(btn => {
-            const handler = (e) => {
+            this.addEventListener(btn, 'click', (e) => {
                e.stopPropagation();
                const name = btn.getAttribute('data-name');
                const version = btn.getAttribute('data-version');
                logger.debug('Delete button clicked:', name, version);
                this.showDeleteConfirmation(name, version);
-            };
+            });
            btn.addEventListener('click', handler);
            this.dynamicUnsubscribers.push(() => btn.removeEventListener('click', handler));
        });
    }
    cleanupDynamicListeners() {
        if (this.dynamicUnsubscribers) {
            this.dynamicUnsubscribers.forEach(unsub => unsub());
            this.dynamicUnsubscribers = [];
        }
    }
    showAddFirmwareForm() {
        this.openFirmwareForm('Add Firmware', null, null);
    }
@@ -431,12 +384,13 @@ class FirmwareComponent extends Component {
    }
    showDeleteConfirmation(name, version) {
-        OverlayDialogComponent.danger({
+        this.showConfirmationDialog({
            title: 'Delete Firmware',
            message: `Are you sure you want to delete firmware "${name}" version "${version}"?<br><br>This action cannot be undone.`,
            confirmText: 'Delete',
            cancelText: 'Cancel',
-            onConfirm: () => this.deleteFirmware(name, version)
+            onConfirm: () => this.deleteFirmware(name, version),
            onCancel: () => {}
        });
    }
@@ -606,9 +560,9 @@ class FirmwareComponent extends Component {
    async deleteFirmware(name, version) {
        try {
-            await window.apiClient.deleteFirmwareFromRegistry(name, version);
+            // Note: The registry API doesn't have a delete endpoint in the OpenAPI spec
-            this.showSuccess(`Firmware ${name} v${version} deleted successfully`);
+            // This would need to be implemented in the registry service
-            await this.loadFirmwareList();
+            this.showError('Delete functionality not yet implemented in registry API');
        } catch (error) {
            logger.error('Delete failed:', error);
            this.showError('Delete failed: ' + error.message);
@@ -670,6 +624,52 @@ class FirmwareComponent extends Component {
        }
    }
    showConfirmationDialog(options) {
        // Create a simple confirmation dialog
        const overlay = document.createElement('div');
        overlay.className = 'overlay-dialog';
        overlay.innerHTML = `
            <div class="dialog">
                <div class="dialog-header">
                    <h3>${options.title}</h3>
                </div>
                <div class="dialog-body">
                    <p>${options.message}</p>
                </div>
                <div class="dialog-footer">
                    ${options.cancelText ? `<button class="btn btn-secondary" id="cancel-btn">${options.cancelText}</button>` : ''}
                    <button class="btn btn-primary" id="confirm-btn">${options.confirmText}</button>
                </div>
            </div>
        `;
        document.body.appendChild(overlay);
        const confirmBtn = overlay.querySelector('#confirm-btn');
        const cancelBtn = overlay.querySelector('#cancel-btn');
        confirmBtn.addEventListener('click', () => {
            document.body.removeChild(overlay);
            if (options.onConfirm) options.onConfirm();
        });
        if (cancelBtn) {
            cancelBtn.addEventListener('click', () => {
                document.body.removeChild(overlay);
                if (options.onCancel) options.onCancel();
            });
        }
        // Close on escape key
        const handleEscape = (e) => {
            if (e.key === 'Escape') {
                document.body.removeChild(overlay);
                document.removeEventListener('keydown', handleEscape);
                if (options.onCancel) options.onCancel();
            }
        };
        document.addEventListener('keydown', handleEscape);
    }
    showSuccess(message) {
        this.showNotification(message, 'success');
--- a/public/scripts/components/FirmwareFormComponent.js
+++ b/public/scripts/components/FirmwareFormComponent.js
@@ -83,15 +83,13 @@ class FirmwareFormComponent extends Component {
        const labels = this.firmwareData?.labels || {};
        const labelsHTML = Object.entries(labels).map(([key, value]) => 
-            `<div class="label-item" data-key="${this.escapeHtml(key)}">
+            `<div class="label-item">
-                <div class="label-content">
+                <span class="label-key">${this.escapeHtml(key)}</span>
-                    <span class="label-key">${this.escapeHtml(key)}</span>
+                <span class="label-value">${this.escapeHtml(value)}</span>
                    <span class="label-separator">=</span>
                    <span class="label-value">${this.escapeHtml(value)}</span>
                </div>
                <button type="button" class="remove-label-btn" data-label-key="${this.escapeHtml(key)}" title="Remove label">
-                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="14" height="14">
-                        <path d="M18 6L6 18M6 6l12 12"/>
+                        <line x1="18" y1="6" x2="6" y2="18"/>
                        <line x1="6" y1="6" x2="18" y2="18"/>
                    </svg>
                </button>
            </div>`
@@ -150,7 +148,7 @@ class FirmwareFormComponent extends Component {
                    <div class="labels-section">
                        <div class="add-label-controls">
                            <input type="text" id="label-key" placeholder="Key" class="label-key-input">
-                            <span class="label-separator">=</span>
+                            <span class="label-separator">:</span>
                            <input type="text" id="label-value" placeholder="Value" class="label-value-input">
                            <button type="button" id="add-label-btn" class="add-label-btn">
                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="14" height="14">
@@ -204,7 +202,7 @@ class FirmwareFormComponent extends Component {
        }
        // Check if key already exists
-        const existingLabel = labelsContainer.querySelector(`[data-key="${this.escapeHtml(key)}"]`);
+        const existingLabel = labelsContainer.querySelector(`[data-label-key="${this.escapeHtml(key)}"]`);
        if (existingLabel) {
            this.showError('A label with this key already exists');
            return;
@@ -212,15 +210,13 @@ class FirmwareFormComponent extends Component {
        // Add the label
        const labelHTML = `
-            <div class="label-item" data-key="${this.escapeHtml(key)}">
+            <div class="label-item">
-                <div class="label-content">
+                <span class="label-key">${this.escapeHtml(key)}</span>
-                    <span class="label-key">${this.escapeHtml(key)}</span>
+                <span class="label-value">${this.escapeHtml(value)}</span>
                    <span class="label-separator">=</span>
                    <span class="label-value">${this.escapeHtml(value)}</span>
                </div>
                <button type="button" class="remove-label-btn" data-label-key="${this.escapeHtml(key)}" title="Remove label">
-                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="14" height="14">
-                        <path d="M18 6L6 18M6 6l12 12"/>
+                        <line x1="18" y1="6" x2="6" y2="18"/>
                        <line x1="6" y1="6" x2="18" y2="18"/>
                    </svg>
                </button>
            </div>
--- a/public/scripts/components/NodeDetailsComponent.js
+++ b/public/scripts/components/NodeDetailsComponent.js
@@ -709,47 +709,62 @@ class NodeDetailsComponent extends Component {
        const labels = nodeStatus?.labels || {};
        const labelsArray = Object.entries(labels);
        const labelsHTML = labelsArray.map(([key, value]) => `
            <div class="label-item" data-key="${this.escapeHtml(key)}">
                <div class="label-content">
                    <span class="label-key">${this.escapeHtml(key)}</span>
                    <span class="label-separator">=</span>
                    <span class="label-value">${this.escapeHtml(value)}</span>
                </div>
                <button class="label-remove-btn" data-key="${this.escapeHtml(key)}" title="Remove label">
                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16">
                        <path d="M18 6L6 18M6 6l12 12"/>
                    </svg>
                </button>
            </div>
        `).join('');
        let html = `
            <div class="labels-section">
                <div class="labels-header">
                    <h3>Node Labels</h3>
                    <p class="labels-description">Manage custom labels for this node. Labels help organize and identify nodes in your cluster.</p>
                </div>
-                <div class="add-label-controls">
+                <div class="labels-list">
-                    <input type="text" id="label-key" placeholder="Key" class="label-key-input" maxlength="50">
+        `;
-                    <span class="label-separator">=</span>
+        
-                    <input type="text" id="label-value" placeholder="Value" class="label-value-input" maxlength="100">
+        if (labelsArray.length === 0) {
-                    <button class="add-label-btn" type="button">
+            html += `
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="14" height="14">
+                <div class="no-labels">
-                            <line x1="12" y1="5" x2="12" y2="19"/>
+                    <div>No labels configured</div>
-                            <line x1="5" y1="12" x2="19" y2="12"/>
+                    <div style="font-size: 0.9rem; margin-top: 0.5rem; opacity: 0.7;">Add labels to organize and identify this node</div>
-                        </svg>
+                </div>
-                        Add Label
+            `;
-                    </button>
+        } else {
            labelsArray.forEach(([key, value]) => {
                html += `
                    <div class="label-item" data-key="${this.escapeHtml(key)}">
                        <div class="label-content">
                            <span class="label-key">${this.escapeHtml(key)}</span>
                            <span class="label-separator">=</span>
                            <span class="label-value">${this.escapeHtml(value)}</span>
                        </div>
                        <button class="label-remove-btn" data-key="${this.escapeHtml(key)}" title="Remove label">
                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16">
                                <path d="M18 6L6 18M6 6l12 12"/>
                            </svg>
                        </button>
                    </div>
                `;
            });
        }
        html += `
                </div>
-                <div class="labels-list">
+                <div class="add-label-section">
-                    ${labelsArray.length === 0 ? `
+                    <div class="add-label-form">
-                        <div class="no-labels">
+                        <div class="form-group">
-                            <div>No labels configured</div>
+                            <label for="label-key">Key:</label>
-                            <div style="font-size: 0.9rem; margin-top: 0.5rem; opacity: 0.7;">Add labels to organize and identify this node</div>
+                            <input type="text" id="label-key" placeholder="e.g., environment" maxlength="50">
                        </div>
-                    ` : labelsHTML}
+                        <div class="form-group">
                            <label for="label-value">Value:</label>
                            <input type="text" id="label-value" placeholder="e.g., production" maxlength="100">
                        </div>
                        <button class="add-label-btn" type="button">
                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="16" height="16">
                                <path d="M12 5v14M5 12h14"/>
                            </svg>
                            Add Label
                        </button>
                    </div>
                </div>
                <div class="labels-actions">
@@ -989,6 +1004,7 @@ class NodeDetailsComponent extends Component {
            const summaryHTML = summary ? `
                <div class="tasks-summary">
                    <div class="tasks-summary-left">
                        <div class="summary-icon">${window.icon('file', { width: 16, height: 16 })}</div>
                        <div>
                            <div class="summary-title">Tasks Overview</div>
                            <div class="summary-subtitle">System task management and monitoring</div>
--- a/public/scripts/components/OverlayDialogComponent.js
+++ b/public/scripts/components/OverlayDialogComponent.js
@@ -9,8 +9,6 @@ class OverlayDialogComponent extends Component {
        this.message = '';
        this.confirmText = 'Yes';
        this.cancelText = 'No';
        this.confirmClass = 'overlay-dialog-btn-confirm';
        this.showCloseButton = true;
    }
    mount() {
@@ -40,8 +38,6 @@ class OverlayDialogComponent extends Component {
            message = 'Are you sure you want to proceed?',
            confirmText = 'Yes',
            cancelText = 'No',
            confirmClass = 'overlay-dialog-btn-confirm',
            showCloseButton = true,
            onConfirm = null,
            onCancel = null
        } = options;
@@ -50,74 +46,53 @@ class OverlayDialogComponent extends Component {
        this.message = message;
        this.confirmText = confirmText;
        this.cancelText = cancelText;
        this.confirmClass = confirmClass;
        this.showCloseButton = showCloseButton;
        this.onConfirm = onConfirm;
        this.onCancel = onCancel;
        this.render();
-        
+        this.container.classList.add('visible');
        // Add visible class with small delay for animation
        setTimeout(() => {
            this.container.classList.add('visible');
        }, 10);
        this.isVisible = true;
    }
    hide() {
        this.container.classList.remove('visible');
        this.isVisible = false;
-        setTimeout(() => {
+        // Call cancel callback if provided
-            this.isVisible = false;
+        if (this.onCancel) {
-            
+            this.onCancel();
-            // Call cancel callback if provided
+        }
            if (this.onCancel) {
                this.onCancel();
                this.onCancel = null;
            }
        }, 300);
    }
    handleConfirm() {
-        this.container.classList.remove('visible');
+        this.hide();
-        setTimeout(() => {
+        // Call confirm callback if provided
-            this.isVisible = false;
+        if (this.onConfirm) {
-            
+            this.onConfirm();
-            // Call confirm callback if provided
+        }
            if (this.onConfirm) {
                this.onConfirm();
                this.onConfirm = null;
            }
        }, 300);
    }
    render() {
        this.container.innerHTML = `
            <div class="overlay-dialog-content">
                <div class="overlay-dialog-header">
-                    <h3 class="overlay-dialog-title">${this.escapeHtml(this.title)}</h3>
+                    <h3 class="overlay-dialog-title">${this.title}</h3>
-                    ${this.showCloseButton ? `
+                    <button class="overlay-dialog-close" type="button">
-                        <button class="overlay-dialog-close" type="button" aria-label="Close">
+                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="20" height="20">
-                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="20" height="20">
+                            <path d="M18 6L6 18M6 6l12 12"/>
-                                <line x1="18" y1="6" x2="6" y2="18"/>
+                        </svg>
-                                <line x1="6" y1="6" x2="18" y2="18"/>
+                    </button>
                            </svg>
                        </button>
                    ` : ''}
                </div>
                <div class="overlay-dialog-body">
-                    <p class="overlay-dialog-message">${this.message}</p>
+                    <div class="overlay-dialog-message">${this.message}</div>
                </div>
                <div class="overlay-dialog-footer">
-                    ${this.cancelText ? `
+                    <button class="overlay-dialog-btn overlay-dialog-btn-cancel" type="button">
-                        <button class="overlay-dialog-btn overlay-dialog-btn-cancel" type="button">
+                        ${this.cancelText}
-                            ${this.escapeHtml(this.cancelText)}
+                    </button>
-                        </button>
+                    <button class="overlay-dialog-btn overlay-dialog-btn-confirm" type="button">
-                    ` : ''}
+                        ${this.confirmText}
                    <button class="overlay-dialog-btn ${this.confirmClass}" type="button">
                        ${this.escapeHtml(this.confirmText)}
                    </button>
                </div>
            </div>
@@ -126,7 +101,7 @@ class OverlayDialogComponent extends Component {
        // Add event listeners to buttons
        const closeBtn = this.container.querySelector('.overlay-dialog-close');
        const cancelBtn = this.container.querySelector('.overlay-dialog-btn-cancel');
-        const confirmBtn = this.container.querySelector(`.${this.confirmClass}`);
+        const confirmBtn = this.container.querySelector('.overlay-dialog-btn-confirm');
        if (closeBtn) {
            this.addEventListener(closeBtn, 'click', () => this.hide());
@@ -141,13 +116,6 @@ class OverlayDialogComponent extends Component {
        }
    }
    escapeHtml(text) {
        if (typeof text !== 'string') return text;
        const div = document.createElement('div');
        div.textContent = text;
        return div.innerHTML;
    }
    unmount() {
        // Clean up event listeners
        this.removeAllEventListeners();
@@ -156,68 +124,3 @@ class OverlayDialogComponent extends Component {
        super.unmount();
    }
 }
 // Static utility methods for easy usage without mounting
 OverlayDialogComponent.show = function(options) {
    // Create a temporary container
    const container = document.createElement('div');
    container.className = 'overlay-dialog';
    document.body.appendChild(container);
    // Create component instance
    const dialog = new OverlayDialogComponent(container, null, null);
    // Override hide to clean up container
    const originalHide = dialog.hide.bind(dialog);
    dialog.hide = function() {
        originalHide();
        setTimeout(() => {
            if (container.parentNode) {
                document.body.removeChild(container);
            }
        }, 350);
    };
    // Override handleConfirm to clean up container
    const originalHandleConfirm = dialog.handleConfirm.bind(dialog);
    dialog.handleConfirm = function() {
        originalHandleConfirm();
        setTimeout(() => {
            if (container.parentNode) {
                document.body.removeChild(container);
            }
        }, 350);
    };
    dialog.mount();
    dialog.show(options);
    return dialog;
 };
 // Convenience method for confirmation dialogs
 OverlayDialogComponent.confirm = function(options) {
    return OverlayDialogComponent.show({
        ...options,
        confirmClass: options.confirmClass || 'overlay-dialog-btn-confirm'
    });
 };
 // Convenience method for danger/delete confirmations
 OverlayDialogComponent.danger = function(options) {
    return OverlayDialogComponent.show({
        ...options,
        confirmClass: 'overlay-dialog-btn-danger'
    });
 };
 // Convenience method for alerts
 OverlayDialogComponent.alert = function(message, title = 'Notice') {
    return OverlayDialogComponent.show({
        title,
        message,
        confirmText: 'OK',
        cancelText: null,
        showCloseButton: false
    });
 };
--- a/public/scripts/components/RolloutComponent.js
+++ b/public/scripts/components/RolloutComponent.js
@@ -228,30 +228,17 @@ class RolloutComponent extends Component {
            return;
        }
-        const nodeCount = this.matchingNodes.length;
+        // Send the firmware info and matching nodes directly
-        const nodePlural = nodeCount !== 1 ? 's' : '';
+        const rolloutData = {
-        const { name, version } = this.rolloutData;
+            firmware: {
                name: this.rolloutData.name,
                version: this.rolloutData.version,
                labels: this.rolloutData.labels
            },
            nodes: this.matchingNodes
        };
-        // Show confirmation dialog
+        this.onRolloutCallback(rolloutData);
        OverlayDialogComponent.confirm({
            title: 'Confirm Firmware Rollout',
            message: `Are you sure you want to deploy firmware <strong>${this.escapeHtml(name)}</strong> version <strong>${this.escapeHtml(version)}</strong> to <strong>${nodeCount} node${nodePlural}</strong>?<br><br>The rollout process cannot be cancelled once started. All nodes will be updated and rebooted.`,
            confirmText: `Rollout to ${nodeCount} Node${nodePlural}`,
            cancelText: 'Cancel',
            onConfirm: () => {
                // Send the firmware info and matching nodes directly
                const rolloutData = {
                    firmware: {
                        name: this.rolloutData.name,
                        version: this.rolloutData.version,
                        labels: this.rolloutData.labels
                    },
                    nodes: this.matchingNodes
                };
                this.onRolloutCallback(rolloutData);
            }
        });
    }
    handleCancel() {
--- a/public/scripts/components/TopologyGraphComponent.js
+++ b/public/scripts/components/TopologyGraphComponent.js
--- a/public/scripts/framework.js
+++ b/public/scripts/framework.js
@@ -647,7 +647,7 @@ class App {
    }
    // Navigate to a route
-    navigateTo(routeName, updateUrl = true) {
+    navigateTo(routeName) {
        // Check cooldown period
        const now = Date.now();
        if (now - this.lastNavigationTime < this.navigationCooldown) {
@@ -670,45 +670,10 @@ class App {
            return;
        }
        // Update URL if requested
        if (updateUrl) {
            this.updateURL(routeName);
        }
        this.lastNavigationTime = now;
        this.performNavigation(routeName);
    }
    // Update browser URL
    updateURL(routeName) {
        const url = `/${routeName}`;
        if (window.location.pathname !== url) {
            window.history.pushState({ route: routeName }, '', url);
            logger.debug(`App: Updated URL to ${url}`);
        }
    }
    // Get route from current URL
    getRouteFromURL() {
        const path = window.location.pathname;
        // Remove leading slash and use as route name
        const routeName = path.substring(1) || 'cluster'; // default to cluster
        return routeName;
    }
    // Handle browser back/forward
    handlePopState(event) {
        if (event.state && event.state.route) {
            logger.debug(`App: Handling popstate for route '${event.state.route}'`);
            this.navigateTo(event.state.route, false); // Don't update URL again
        } else {
            // Fallback: parse URL
            const routeName = this.getRouteFromURL();
            logger.debug(`App: Handling popstate, navigating to '${routeName}'`);
            this.navigateTo(routeName, false);
        }
    }
    // Perform the actual navigation
    async performNavigation(routeName) {
        this.navigationInProgress = true;
@@ -883,27 +848,12 @@ class App {
    // Setup navigation
    setupNavigation() {
        // Intercept navigation link clicks
        document.querySelectorAll((window.CONSTANTS && window.CONSTANTS.SELECTORS.NAV_TAB) || '.nav-tab').forEach(tab => {
-            tab.addEventListener('click', (e) => {
+            tab.addEventListener('click', () => {
                e.preventDefault(); // Prevent default link behavior
                const routeName = tab.dataset.view;
                this.navigateTo(routeName);
            });
        });
        // Handle browser back/forward buttons
        window.addEventListener('popstate', (e) => this.handlePopState(e));
        // Navigate to route based on current URL on initial load
        const initialRoute = this.getRouteFromURL();
        logger.debug(`App: Initial route from URL: '${initialRoute}'`);
        // Set initial history state
        window.history.replaceState({ route: initialRoute }, '', `/${initialRoute}`);
        // Navigate to initial route
        this.navigateTo(initialRoute, false); // Don't update URL since we just set it
    }
    // Clean up cached components (call when app is shutting down)
--- a/public/scripts/view-models.js
+++ b/public/scripts/view-models.js
@@ -584,77 +584,14 @@ class TopologyViewModel extends ViewModel {
            isLoading: false,
            error: null,
            lastUpdateTime: null,
-            selectedNode: null,
+            selectedNode: null
            topologyMode: 'mesh', // 'mesh' or 'star'
            starCenterNode: null // IP of the center node in star mode
        });
    }
    // Set up WebSocket event listeners for real-time topology updates
    setupWebSocketListeners() {
        if (!window.wsClient) {
            logger.warn('TopologyViewModel: WebSocket client not available');
            return;
        }
        // Listen for cluster updates
        window.wsClient.on('clusterUpdate', (data) => {
            logger.debug('TopologyViewModel: Received WebSocket cluster update:', data);
            // Update topology from WebSocket data
            if (data.members && Array.isArray(data.members)) {
                logger.debug(`TopologyViewModel: Updating topology with ${data.members.length} members, primary: ${data.primaryNode}`);
                // Build enhanced graph data from updated members with primary node info
                this.buildEnhancedGraphData(data.members, data.primaryNode).then(({ nodes, links }) => {
                    this.batchUpdate({
                        nodes: nodes,
                        links: links,
                        primaryNode: data.primaryNode,
                        lastUpdateTime: data.timestamp || new Date().toISOString()
                    });
                }).catch(error => {
                    logger.error('TopologyViewModel: Failed to build graph data from websocket update:', error);
                });
            } else {
                logger.warn('TopologyViewModel: Received cluster update but no valid members array:', data);
            }
        });
        // Listen for node discovery events
        window.wsClient.on('nodeDiscovery', (data) => {
            logger.debug('TopologyViewModel: Received WebSocket node discovery event:', data);
            // Trigger animation for 'discovered' or 'active' actions (node is alive)
            // Skip animation for 'stale' or 'inactive' actions
            if (data.action === 'discovered' || data.action === 'active') {
                // Emit discovery animation event
                this.set('discoveryEvent', {
                    nodeIp: data.nodeIp,
                    timestamp: data.timestamp || new Date().toISOString(),
                    action: data.action
                });
            }
        });
        // Listen for connection status changes
        window.wsClient.on('connected', () => {
            logger.debug('TopologyViewModel: WebSocket connected');
            // Connection restored - the server will send a clusterUpdate event shortly
            // No need to make an API call, just wait for the websocket data
        });
        window.wsClient.on('disconnected', () => {
            logger.debug('TopologyViewModel: WebSocket disconnected');
        });
    }
    // Update network topology data
    // NOTE: This method makes an API call and should only be used for initial load
    // All subsequent updates should come from websocket events (clusterUpdate)
    async updateNetworkTopology() {
        try {
-            logger.debug('TopologyViewModel: updateNetworkTopology called (API call)');
+            logger.debug('TopologyViewModel: updateNetworkTopology called');
            this.set('isLoading', true);
            this.set('error', null);
@@ -663,24 +600,14 @@ class TopologyViewModel extends ViewModel {
            const response = await window.apiClient.getClusterMembers();
            logger.debug('TopologyViewModel: Got cluster members response:', response);
            // Get discovery info to find the primary node
            const discoveryInfo = await window.apiClient.getDiscoveryInfo();
            logger.debug('TopologyViewModel: Got discovery info:', discoveryInfo);
            const members = response.members || [];
            const primaryNode = discoveryInfo.primaryNode || null;
            logger.debug(`TopologyViewModel: Building graph with ${members.length} members, primary: ${primaryNode}`);
            // Build enhanced graph data with actual node connections
-            const { nodes, links } = await this.buildEnhancedGraphData(members, primaryNode);
+            const { nodes, links } = await this.buildEnhancedGraphData(members);
            logger.debug(`TopologyViewModel: Built graph with ${nodes.length} nodes and ${links.length} links`);
            this.batchUpdate({
                nodes: nodes,
                links: links,
                primaryNode: primaryNode,
                lastUpdateTime: new Date().toISOString()
            });
@@ -694,91 +621,93 @@ class TopologyViewModel extends ViewModel {
    }
    // Build enhanced graph data with actual node connections
-    // Creates either a mesh topology (all nodes connected) or star topology (center node to all others)
+    async buildEnhancedGraphData(members) {
    async buildEnhancedGraphData(members, primaryNode) {
        const nodes = [];
        const links = [];
-        
+        const nodeConnections = new Map();
        // Get existing nodes to preserve their positions
        const existingNodes = this.get('nodes') || [];
        const existingNodeMap = new Map(existingNodes.map(n => [n.id, n]));
        // Create nodes from members
        members.forEach((member, index) => {
            if (member && member.ip) {
                const existingNode = existingNodeMap.get(member.ip);
                const isPrimary = member.ip === primaryNode;
                nodes.push({
                    id: member.ip,
                    hostname: member.hostname || member.ip,
                    ip: member.ip,
                    status: member.status || 'UNKNOWN',
                    latency: member.latency || 0,
                    isPrimary: isPrimary,
                    // Preserve both legacy 'resources' and preferred 'labels'
                    labels: (member.labels && typeof member.labels === 'object') ? member.labels : (member.resources || {}),
                    resources: member.resources || {},
-                    // Preserve existing position if node already exists, otherwise assign random position
+                    x: Math.random() * 1200 + 100,   // Better spacing for 1400px width
-                    x: existingNode ? existingNode.x : Math.random() * 1200 + 100,
+                    y: Math.random() * 800 + 100     // Better spacing for 1000px height
                    y: existingNode ? existingNode.y : Math.random() * 800 + 100,
                    // Preserve velocity if it exists (for D3 simulation)
                    vx: existingNode ? existingNode.vx : undefined,
                    vy: existingNode ? existingNode.vy : undefined,
                    // Preserve fixed position if it was dragged
                    fx: existingNode ? existingNode.fx : undefined,
                    fy: existingNode ? existingNode.fy : undefined
                });
            }
        });
-        // Build links based on topology mode
+        // Try to get cluster members from each node to build actual connections
-        const topologyMode = this.get('topologyMode') || 'mesh';
+        for (const node of nodes) {
            try {
                const nodeResponse = await window.apiClient.getClusterMembersFromNode(node.ip);
                if (nodeResponse && nodeResponse.members) {
                    nodeConnections.set(node.ip, nodeResponse.members);
                }
            } catch (error) {
                console.warn(`Failed to get cluster members from node ${node.ip}:`, error);
                // Continue with other nodes
            }
        }
-        if (topologyMode === 'mesh') {
+        // Build links based on actual connections
-            // Full mesh - connect all nodes to all other nodes
+        for (const [sourceIp, sourceMembers] of nodeConnections) {
-            logger.debug('TopologyViewModel: Creating full mesh topology');
+            for (const targetMember of sourceMembers) {
                if (targetMember.ip && targetMember.ip !== sourceIp) {
                    // Check if we already have this link
                    const existingLink = links.find(link => 
                        (link.source === sourceIp && link.target === targetMember.ip) ||
                        (link.source === targetMember.ip && link.target === sourceIp)
                    );
                    if (!existingLink) {
                        const sourceNode = nodes.find(n => n.id === sourceIp);
                        const targetNode = nodes.find(n => n.id === targetMember.ip);
                        if (sourceNode && targetNode) {
                            const latency = targetMember.latency || this.estimateLatency(sourceNode, targetNode);
                            links.push({
                                source: sourceIp,
                                target: targetMember.ip,
                                latency: latency,
                                sourceNode: sourceNode,
                                targetNode: targetNode,
                                bidirectional: true
                            });
                        }
                    }
                }
            }
        }
        // If no actual connections found, create a basic mesh
        if (links.length === 0) {
            logger.debug('TopologyViewModel: No actual connections found, creating basic mesh');
            for (let i = 0; i < nodes.length; i++) {
                for (let j = i + 1; j < nodes.length; j++) {
                    const sourceNode = nodes[i];
                    const targetNode = nodes[j];
                    const estimatedLatency = this.estimateLatency(sourceNode, targetNode);
                    links.push({
                        source: sourceNode.id,
                        target: targetNode.id,
-                        latency: this.estimateLatency(sourceNode, targetNode),
+                        latency: estimatedLatency,
                        sourceNode: sourceNode,
                        targetNode: targetNode,
                        bidirectional: true
                    });
                }
            }
            logger.debug(`TopologyViewModel: Created ${links.length} links in mesh topology`);
        } else if (topologyMode === 'star') {
            // Star topology - center node connects to all others
            const centerNode = this.get('starCenterNode') || primaryNode;
            if (centerNode) {
                logger.debug(`TopologyViewModel: Creating star topology with center ${centerNode}`);
                nodes.forEach(node => {
                    if (node.ip !== centerNode) {
                        const member = members.find(m => m.ip === node.ip);
                        const latency = member?.latency || this.estimateLatency(node, { ip: centerNode });
                        links.push({
                            source: centerNode,
                            target: node.id,
                            latency: latency,
                            sourceNode: nodes.find(n => n.ip === centerNode),
                            targetNode: node,
                            bidirectional: false
                        });
                    }
                });
                logger.debug(`TopologyViewModel: Created ${links.length} links from center node`);
            } else {
                logger.warn('TopologyViewModel: No center node specified for star topology');
            }
        }
        return { nodes, links };
@@ -801,61 +730,6 @@ class TopologyViewModel extends ViewModel {
    clearSelection() {
        this.set('selectedNode', null);
    }
    // Switch to a specific node as the new primary
    async switchToPrimaryNode(nodeIp) {
        try {
            logger.debug(`TopologyViewModel: Switching primary node to ${nodeIp}`);
            const result = await window.apiClient.setPrimaryNode(nodeIp);
            if (result.success) {
                logger.info(`TopologyViewModel: Successfully switched primary to ${nodeIp}`);
                // Update topology after a short delay to allow backend to update
                setTimeout(async () => {
                    logger.debug('TopologyViewModel: Refreshing topology after primary switch...');
                    await this.updateNetworkTopology();
                }, 1000);
                return result;
            } else {
                throw new Error(result.message || 'Failed to switch primary node');
            }
        } catch (error) {
            logger.error('TopologyViewModel: Failed to switch primary node:', error);
            throw error;
        }
    }
    // Toggle topology mode or set star mode with specific center node
    async setTopologyMode(mode, centerNodeIp = null) {
        logger.debug(`TopologyViewModel: Setting topology mode to ${mode}`, centerNodeIp ? `with center ${centerNodeIp}` : '');
        this.setMultiple({
            topologyMode: mode,
            starCenterNode: centerNodeIp
        });
        // Rebuild the graph with new topology
        await this.updateNetworkTopology();
    }
    // Toggle between mesh and star modes
    async toggleTopologyMode(nodeIp) {
        const currentMode = this.get('topologyMode');
        const currentCenter = this.get('starCenterNode');
        if (currentMode === 'mesh') {
            // Switch to star mode with this node as center
            await this.setTopologyMode('star', nodeIp);
        } else if (currentMode === 'star' && currentCenter === nodeIp) {
            // Clicking same center node - switch back to mesh
            await this.setTopologyMode('mesh', null);
        } else {
            // Clicking different node - change star center
            await this.setTopologyMode('star', nodeIp);
        }
    }
 }
 // Monitoring View Model for cluster resource monitoring
@@ -1235,200 +1109,4 @@ class WiFiConfigViewModel extends ViewModel {
    }
 }
-window.WiFiConfigViewModel = WiFiConfigViewModel;
+window.WiFiConfigViewModel = WiFiConfigViewModel; 
 // Events View Model for websocket event visualization
 class EventViewModel extends ViewModel {
    constructor() {
        super();
        this.setMultiple({
            events: new Map(), // Map of topic -> { parts: [], count: number, lastSeen: timestamp }
            allMessages: [], // Array of all messages for live viewing
            allMessagesCounter: 0, // Counter to trigger updates
            selectedTopic: null, // Currently selected topic for drawer
            isLoading: false,
            error: null,
            lastUpdateTime: null
        });
        // Set up WebSocket listeners for real-time updates
        this.setupWebSocketListeners();
    }
    // Set up WebSocket event listeners
    setupWebSocketListeners() {
        if (!window.wsClient) {
            // Retry after a short delay to allow wsClient to initialize
            setTimeout(() => this.setupWebSocketListeners(), 1000);
            return;
        }
        // Listen for all websocket messages
        window.wsClient.on('message', (data) => {
            const topic = data.topic || data.type;
            if (topic) {
                // Store the full message
                const allMessages = this.get('allMessages') || [];
                const newMessage = {
                    ...data,
                    topic: topic,
                    timestamp: new Date().toISOString(),
                    id: `${topic}-${Date.now()}-${Math.random()}`
                };
                allMessages.push(newMessage);
                // Keep only the last 1000 messages to prevent memory issues
                const maxMessages = 1000;
                if (allMessages.length > maxMessages) {
                    allMessages.splice(0, allMessages.length - maxMessages);
                }
                // Update messages and trigger change notification
                this.set('allMessages', allMessages);
                this.set('allMessagesCounter', this.get('allMessagesCounter') + 1);
                this.addTopic(topic, data);
            }
        });
        // Listen for connection status changes
        window.wsClient.on('connected', () => {
            logger.info('EventViewModel: WebSocket connected');
        });
        window.wsClient.on('disconnected', () => {
            logger.debug('EventViewModel: WebSocket disconnected');
        });
    }
    // Get messages for a specific topic
    getMessagesForTopic(topic) {
        const allMessages = this.get('allMessages') || [];
        return allMessages.filter(msg => {
            // Handle nested events from cluster/event
            if (msg.topic === 'cluster/event' && msg.data) {
                try {
                    const parsedData = typeof msg.data === 'string' ? JSON.parse(msg.data) : msg.data;
                    if (parsedData && parsedData.event) {
                        const fullTopic = `${msg.topic}/${parsedData.event}`;
                        return fullTopic === topic;
                    }
                } catch (e) {
                    // If parsing fails, just use the original topic
                }
            }
            return msg.topic === topic;
        });
    }
    // Set the selected topic for drawer
    setSelectedTopic(topic) {
        this.set('selectedTopic', topic);
    }
    // Clear selected topic
    clearSelectedTopic() {
        this.set('selectedTopic', null);
    }
    // Add a topic (parsed by "/" separator)
    addTopic(topic, data = null) {
        // Get current events as a new Map to ensure change detection
        const events = new Map(this.get('events'));
        // Handle nested events from cluster/event
        let fullTopic = topic;
        if (topic === 'cluster/event' && data && data.data) {
            try {
                const parsedData = typeof data.data === 'string' ? JSON.parse(data.data) : data.data;
                if (parsedData && parsedData.event) {
                    // Create nested topic chain: cluster/event/api/neopattern
                    fullTopic = `${topic}/${parsedData.event}`;
                }
            } catch (e) {
                // If parsing fails, just use the original topic
            }
        }
        const parts = fullTopic.split('/').filter(p => p);
        if (events.has(fullTopic)) {
            // Update existing event - create new object to ensure change detection
            const existing = events.get(fullTopic);
            events.set(fullTopic, {
                topic: existing.topic,
                parts: existing.parts,
                count: existing.count + 1,
                firstSeen: existing.firstSeen,
                lastSeen: new Date().toISOString(),
                lastData: data
            });
        } else {
            // Create new event entry
            events.set(fullTopic, {
                topic: fullTopic,
                parts: parts,
                count: 1,
                firstSeen: new Date().toISOString(),
                lastSeen: new Date().toISOString(),
                lastData: data
            });
        }
        // Use set to trigger change notification
        this.set('events', events);
        this.set('lastUpdateTime', new Date().toISOString());
    }
    // Get all topic parts (unique segments after splitting by "/")
    getTopicParts() {
        const events = this.get('events');
        const allParts = new Set();
        for (const [topic, data] of events) {
            data.parts.forEach(part => allParts.add(part));
        }
        return Array.from(allParts).map(part => {
            // Count how many events contain this part
            let count = 0;
            for (const [topic, data] of events) {
                if (data.parts.includes(part)) {
                    count += data.count;
                }
            }
            return { part, count };
        });
    }
    // Clear all events
    clearTopics() {
        this.set('events', new Map());
        this.set('lastUpdateTime', new Date().toISOString());
    }
    // Get connections between topic parts (for graph edges)
    getTopicConnections() {
        const topics = this.get('topics');
        const connections = [];
        for (const [topic, data] of topics) {
            const parts = data.parts;
            // Create connections between adjacent parts
            for (let i = 0; i < parts.length - 1; i++) {
                connections.push({
                    source: parts[i],
                    target: parts[i + 1],
                    topic: topic,
                    count: data.count
                });
            }
        }
        return connections;
    }
 }
 window.EventViewModel = EventViewModel; 
--- a/public/styles/main.css
+++ b/public/styles/main.css