diff --git a/cmd/cc-backend/server.go b/cmd/cc-backend/server.go
index c6e30824..4035c430 100644
--- a/cmd/cc-backend/server.go
+++ b/cmd/cc-backend/server.go
@@ -136,7 +136,7 @@ func (s *Server) init() error {
 	userapi := s.router.PathPrefix("/userapi").Subrouter()
 	configapi := s.router.PathPrefix("/config").Subrouter()
 	frontendapi := s.router.PathPrefix("/frontend").Subrouter()
-	metricstoreapi := s.router.PathPrefix("/metricstore").Subrouter()
+	metricstoreapi := s.router.PathPrefix("/api").Subrouter()
 
 	if !config.Keys.DisableAuthentication {
 		// Create login failure handler (used by both /login and /jwt-login)
diff --git a/internal/api/rest.go b/internal/api/rest.go
index 27374f6e..c0fa7c2a 100644
--- a/internal/api/rest.go
+++ b/internal/api/rest.go
@@ -123,15 +123,15 @@ func (api *RestAPI) MountUserAPIRoutes(r *mux.Router) {
 func (api *RestAPI) MountMetricStoreAPIRoutes(r *mux.Router) {
 	// REST API Uses TokenAuth
 	// Note: StrictSlash handles trailing slash variations automatically
-	r.HandleFunc("/api/free", freeMetrics).Methods(http.MethodPost)
-	r.HandleFunc("/api/write", writeMetrics).Methods(http.MethodPost)
-	r.HandleFunc("/api/debug", debugMetrics).Methods(http.MethodGet)
-	r.HandleFunc("/api/healthcheck", metricsHealth).Methods(http.MethodGet)
+	r.HandleFunc("/free", freeMetrics).Methods(http.MethodPost)
+	r.HandleFunc("/write", writeMetrics).Methods(http.MethodPost)
+	r.HandleFunc("/debug", debugMetrics).Methods(http.MethodGet)
+	r.HandleFunc("/healthcheck", metricsHealth).Methods(http.MethodGet)
 	// Same endpoints but with trailing slash
-	r.HandleFunc("/api/free/", freeMetrics).Methods(http.MethodPost)
-	r.HandleFunc("/api/write/", writeMetrics).Methods(http.MethodPost)
-	r.HandleFunc("/api/debug/", debugMetrics).Methods(http.MethodGet)
-	r.HandleFunc("/api/healthcheck/", metricsHealth).Methods(http.MethodGet)
+	r.HandleFunc("/free/", freeMetrics).Methods(http.MethodPost)
+	r.HandleFunc("/write/", writeMetrics).Methods(http.MethodPost)
+	r.HandleFunc("/debug/", debugMetrics).Methods(http.MethodGet)
+	r.HandleFunc("/healthcheck/", metricsHealth).Methods(http.MethodGet)
 }
 
 // MountConfigAPIRoutes registers configuration and user management endpoints.
diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte
index f2cff319..8cfceb96 100644
--- a/web/frontend/src/Job.root.svelte
+++ b/web/frontend/src/Job.root.svelte
@@ -220,7 +220,7 @@
     {#if $initq.error}
       <Card body color="danger">{$initq.error.message}</Card>
     {:else if $initq?.data}
-      <Card class="overflow-auto" style="height: 400px;">
+      <Card class="overflow-auto" style="height: auto;">
         <TabContent> <!-- on:tab={(e) => (status = e.detail)} -->
           {#if $initq.data?.job?.metaData?.message}
             <TabPane tabId="admin-msg" tab="Admin Note" active>
diff --git a/web/frontend/src/generic/helper/ConcurrentJobs.svelte b/web/frontend/src/generic/helper/ConcurrentJobs.svelte
index 180e10ec..098fe0b2 100644
--- a/web/frontend/src/generic/helper/ConcurrentJobs.svelte
+++ b/web/frontend/src/generic/helper/ConcurrentJobs.svelte
@@ -23,7 +23,7 @@
     showLinks = false,
     renderCard = false,
     width = "auto",
-    height = "400px",
+    height = "auto",
   } = $props();
 </script>
 
diff --git a/web/frontend/src/job/JobRoofline.svelte b/web/frontend/src/job/JobRoofline.svelte
index ae962f1b..611db31b 100644
--- a/web/frontend/src/job/JobRoofline.svelte
+++ b/web/frontend/src/job/JobRoofline.svelte
@@ -58,7 +58,7 @@
 {#if $roofMetrics.error}
   <Card body color="danger">{$roofMetrics.error.message}</Card>
 {:else if $roofMetrics?.data}
-  <Card style="height: 400px;">
+  <Card style="height: auto;"> <!-- 400px -->
     <div bind:clientWidth={roofWidth}>
       <Roofline
         width={roofWidth}
diff --git a/web/frontend/src/job/JobSummary.svelte b/web/frontend/src/job/JobSummary.svelte
index aed41959..4bc0ee2d 100644
--- a/web/frontend/src/job/JobSummary.svelte
+++ b/web/frontend/src/job/JobSummary.svelte
@@ -21,7 +21,7 @@
   let {
     job,
     width = "auto",
-    height = "400px",
+    height = "auto",
   } = $props();
 
   /* Const Init */
diff --git a/web/frontend/src/job/jobsummary/JobFootprintBars.svelte b/web/frontend/src/job/jobsummary/JobFootprintBars.svelte
index 34518112..190bea46 100644
--- a/web/frontend/src/job/jobsummary/JobFootprintBars.svelte
+++ b/web/frontend/src/job/jobsummary/JobFootprintBars.svelte
@@ -127,7 +127,7 @@
   }
 </script>
 
-<CardBody class="overflow-auto">
+<CardBody class="overflow-auto" style="height:380px;">
   {#if jobFootprintData.length === 0}
     <div class="text-center">No footprint data for job available.</div>
   {:else}