diff --git a/pkg/metricstore/api.go b/pkg/metricstore/api.go
index a37dfff9..21f8db0c 100644
--- a/pkg/metricstore/api.go
+++ b/pkg/metricstore/api.go
@@ -20,7 +20,7 @@ import (
 
 var (
 	// ErrNoHostOrMetric is returned when the metric store does not find the host or the metric
-	ErrNoHostOrMetric error = errors.New("[METRICSTORE]> [METRICSTORE]> metric or host not found")
+	ErrNoHostOrMetric error = errors.New("[METRICSTORE]> metric or host not found")
 	// ErrInvalidTimeRange is returned when a query has 'from' >= 'to'
 	ErrInvalidTimeRange = errors.New("[METRICSTORE]> invalid time range: 'from' must be before 'to'")
 	// ErrEmptyCluster is returned when a query with ForAllNodes has no cluster specified
diff --git a/web/frontend/src/Node.root.svelte b/web/frontend/src/Node.root.svelte
index 099233f4..f8bc79a2 100644
--- a/web/frontend/src/Node.root.svelte
+++ b/web/frontend/src/Node.root.svelte
@@ -176,7 +176,11 @@
         <InputGroupText><Icon name="clipboard2-pulse" /></InputGroupText>
         <InputGroupText>Node State</InputGroupText>
         <Button class="flex-grow-1 text-center" color={stateColors[thisNodeState]} disabled>
-          {thisNodeState}
+          {#if $nodeMetricsData?.data}
+            {thisNodeState}
+          {:else}
+            <span><Spinner size="sm" secondary/></span>
+          {/if}
         </Button>
       </InputGroup>
     </Col>
diff --git a/web/frontend/src/generic/plots/Roofline.svelte b/web/frontend/src/generic/plots/Roofline.svelte
index 20c91872..6500eb5c 100644
--- a/web/frontend/src/generic/plots/Roofline.svelte
+++ b/web/frontend/src/generic/plots/Roofline.svelte
@@ -46,6 +46,7 @@
   /* Const Init */
   const lineWidth = 2 // clusterCockpitConfig.plotConfiguration_lineWidth;
   const cbmode = clusterCockpitConfig?.plotConfiguration_colorblindMode || false;
+  const bubbleSizeMax = 50;
 
   /* Var Init */
   let timeoutId = null;
@@ -317,8 +318,13 @@
             size = sizeBase + scaling
           // Nodes: Size based on Jobcount
           } else if (nodesData) {
-            size = sizeBase + (nodesData[i]?.numJobs * 1.5) // Max Jobs Scale: 8 * 1.5 = 12
+            size = sizeBase + (nodesData[i]?.numJobs * 1.5)
           };
+
+          // Apply Size Capping
+          if (size >= bubbleSizeMax) {
+            size = bubbleSizeMax;
+          }
           
           if (xVal >= filtLft && xVal <= filtRgt && yVal >= filtBtm && yVal <= filtTop) {
             let cx = valToPosX(xVal, scaleX, xDim, xOff);