diff --git a/web/frontend/src/HistogramSelection.svelte b/web/frontend/src/HistogramSelection.svelte
index e210079..c18a6a0 100644
--- a/web/frontend/src/HistogramSelection.svelte
+++ b/web/frontend/src/HistogramSelection.svelte
@@ -4,7 +4,7 @@
     import { gql, getContextClient , mutationStore } from '@urql/svelte'
 
     export let cluster
-    export let availableMetrics
+    export let availableMetrics = ['cpu_load', 'flops_any', 'mem_bw']
     export let metricsInHistograms
 
     const client = getContextClient();
diff --git a/web/frontend/src/User.root.svelte b/web/frontend/src/User.root.svelte
index 23ebb16..16f22d6 100644
--- a/web/frontend/src/User.root.svelte
+++ b/web/frontend/src/User.root.svelte
@@ -75,7 +75,6 @@
 
         <HistogramSelection
         bind:cluster={selectedCluster}
-        bind:availableMetrics={metrics}
         bind:metricsInHistograms={metricsInHistograms}/>
     </Col>
     <Col xs="auto">
@@ -194,7 +193,7 @@
                             title="Distribution of '{item.metric}'"
                             xlabel={`${item.metric} bin maximum [${item.unit}]`}
                             xunit={item.unit}
-                            ylabel="Count"
+                            ylabel="Count [Jobs]"
                             yunit="Jobs"/>
                     </PlotTable>
                 {/key}
diff --git a/web/frontend/src/utils.js b/web/frontend/src/utils.js
index 17f4ceb..537ad3f 100644
--- a/web/frontend/src/utils.js
+++ b/web/frontend/src/utils.js
@@ -320,6 +320,11 @@ export function convert2uplot(canvasData) {
     let uplotData = [[],[]] // [X, Y1, Y2, ...]
     canvasData.forEach( cd => {
         if (cd.bin) { // MetricHisto Datafromat
+            // Force Zero Entry for scaling
+            if (uplotData[0].length == 0) {
+                uplotData[0].push(0)
+                uplotData[1].push(0)    
+            }
             uplotData[0].push(cd.max)
             uplotData[1].push(cd.count)
         } else { // Default