diff --git a/packages/client/hmi-client/src/api/api.ts b/packages/client/hmi-client/src/api/api.ts
index 8e6f07e16a..b6ba2a01a1 100644
--- a/packages/client/hmi-client/src/api/api.ts
+++ b/packages/client/hmi-client/src/api/api.ts
@@ -108,9 +108,9 @@ export interface PollerResult<T> {
 }
 
 export class Poller<T> {
-	pollingInterval = 2000;
+	pollingInterval = 3000;
 
-	pollingThreshold = 10;
+	pollingThreshold = 150;
 
 	keepGoing = false;
 
diff --git a/packages/client/hmi-client/src/components/drilldown/tera-drilldown-preview.vue b/packages/client/hmi-client/src/components/drilldown/tera-drilldown-preview.vue
index 76ff152fbd..b993c630ba 100644
--- a/packages/client/hmi-client/src/components/drilldown/tera-drilldown-preview.vue
+++ b/packages/client/hmi-client/src/components/drilldown/tera-drilldown-preview.vue
@@ -1,9 +1,8 @@
 <template>
-	<tera-drilldown-section>
+	<tera-drilldown-section :is-loading="isLoading">
 		<div class="content-container">
 			<main>
-				<slot v-if="!isLoading" />
-				<tera-progress-spinner v-else :font-size="2" is-centered style="height: 100%" />
+				<slot />
 			</main>
 		</div>
 		<template #footer v-if="slots.footer">
@@ -15,7 +14,6 @@
 <script setup lang="ts">
 import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
 import { useSlots } from 'vue';
-import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
 
 defineProps<{
 	isLoading?: boolean;
diff --git a/packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue b/packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue
index e7781ae193..e5705311b0 100644
--- a/packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue
+++ b/packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue
@@ -9,8 +9,16 @@
 			</div>
 		</header>
 		<main ref="main" @scroll="handleScroll">
-			<slot v-if="!isLoading" />
-			<tera-progress-spinner v-else :font-size="2" is-centered />
+			<slot v-if="!isLoading || showSlotWhileLoading" />
+			<tera-progress-spinner v-if="isLoading" :font-size="2" is-centered>
+				<span v-if="!loadingMessage">Processing... </span>
+				<span v-if="loadingProgress">{{ loadingProgress }}% </span>
+				<span v-if="loadingProgress && loadingMessage">{{ loadingMessage }}</span>
+			</tera-progress-spinner>
+			<div v-else-if="isBlank" class="empty-state">
+				<Vue3Lottie :animationData="EmptySeed" :height="150" :width="150" loop autoplay />
+				<p>{{ blankMessage }}</p>
+			</div>
 		</main>
 		<footer v-if="slots.footer">
 			<slot name="footer" />
@@ -20,10 +28,17 @@
 
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, computed, useSlots } from 'vue';
+import { Vue3Lottie } from 'vue3-lottie';
+import EmptySeed from '@/assets/images/lottie-empty-seed.json';
 import TeraProgressSpinner from '../widgets/tera-progress-spinner.vue';
 
 defineProps<{
 	isLoading?: boolean;
+	showSlotWhileLoading?: boolean;
+	isBlank?: boolean;
+	blankMessage?: string;
+	loadingMessage?: string;
+	loadingProgress?: number;
 }>();
 
 const slots = useSlots();
@@ -92,6 +107,18 @@ main {
 	flex-direction: column;
 	flex-grow: 1;
 	overflow-y: auto;
+
+	.empty-state {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		gap: var(--gap-4);
+		text-align: center;
+		pointer-events: none;
+	}
 }
 
 .notebook-section {
diff --git a/packages/client/hmi-client/src/components/operator/tera-operator-output-summary.vue b/packages/client/hmi-client/src/components/operator/tera-operator-output-summary.vue
index 3b46abb777..6669e7cd6e 100644
--- a/packages/client/hmi-client/src/components/operator/tera-operator-output-summary.vue
+++ b/packages/client/hmi-client/src/components/operator/tera-operator-output-summary.vue
@@ -76,17 +76,14 @@ function cancelEdit() {
 const poller = new Poller<Summary>();
 async function pollSummary() {
 	isLoading.value = true;
-	poller
-		.setInterval(3000)
-		.setThreshold(15)
-		.setPollAction(async () => {
-			const summaryMap = await getSummaries([props.summaryId]);
-			const summaryObj = summaryMap[props.summaryId];
-			if (summaryObj && summaryObj.generatedSummary) {
-				return { data: summaryObj, progress: null, error: null };
-			}
-			return { data: null, progress: null, error: null };
-		});
+	poller.setThreshold(15).setPollAction(async () => {
+		const summaryMap = await getSummaries([props.summaryId]);
+		const summaryObj = summaryMap[props.summaryId];
+		if (summaryObj && summaryObj.generatedSummary) {
+			return { data: summaryObj, progress: null, error: null };
+		}
+		return { data: null, progress: null, error: null };
+	});
 	const pollerResult = await poller.start();
 	if (pollerResult.state === PollerState.Cancelled) {
 		return;
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
index e91ef17a38..82db2b9c0a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
@@ -223,7 +223,13 @@
 
 		<!-- Output section -->
 		<template #preview>
-			<tera-drilldown-section v-if="showOutputSection">
+			<tera-drilldown-section
+				:is-loading="isLoading"
+				:show-slot-while-loading="true"
+				:loading-progress="props.node.state.currentProgress"
+				:is-blank="!showOutputSection"
+				:blank-message="'Click \'Run\' to begin calibrating'"
+			>
 				<template #header-controls-left>
 					<h5 v-if="configuredModelConfig?.name" class="ml-3">{{ configuredModelConfig.name }}</h5>
 				</template>
@@ -246,7 +252,7 @@
 					class="p-3"
 					:summary-id="node.state.summaryId"
 				/>
-				<Accordion :active-index="lossActiveIndex" class="px-2" v-if="!isLoading">
+				<Accordion :active-index="lossActiveIndex" class="px-2">
 					<AccordionTab header="Loss">
 						<!-- Loss chart -->
 						<div ref="lossChartContainer">
@@ -343,17 +349,7 @@
 						<p class="helpMessage">Connect a model configuration and dataset</p>
 					</section>
 				</div>
-
-				<section v-else class="emptyState">
-					<tera-progress-spinner :font-size="2" is-centered style="height: 12rem" />
-					<p>Processing...{{ props.node.state.currentProgress }}%</p>
-				</section>
 			</tera-drilldown-section>
-			<!-- Empty state if calibrate hasn't been run yet -->
-			<section v-else class="output-section-empty-state">
-				<Vue3Lottie :animationData="EmptySeed" :height="150" loop autoplay />
-				<p class="helpMessage">Click 'Run' to begin calibrating</p>
-			</section>
 		</template>
 
 		<template #sidebar-right>
@@ -497,11 +493,8 @@ import {
 	parseCsvAsset
 } from '@/services/calibrate-workflow';
 import { deleteAnnotation, updateChartSettingsBySelectedVariables } from '@/services/chart-settings';
-import { Vue3Lottie } from 'vue3-lottie';
-import EmptySeed from '@/assets/images/lottie-empty-seed.json';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
-import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
 import TeraNotebookError from '@/components/drilldown/tera-notebook-error.vue';
 import TeraOperatorOutputSummary from '@/components/operator/tera-operator-output-summary.vue';
 import TeraSliderPanel from '@/components/widgets/tera-slider-panel.vue';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
index 31005aa66c..dbc5d97281 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
@@ -171,8 +171,6 @@ const variableCharts = useVariableCharts(selectedVariableSettings, groundTruth);
 const poller = new Poller();
 const pollResult = async (runId: string) => {
 	poller
-		.setInterval(3000)
-		.setThreshold(350)
 		.setPollAction(async () => pollAction(runId))
 		.setProgressAction((data: Simulation) => {
 			if (data?.updates?.length) {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss-drilldown.vue
index f6874aea52..2990032740 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss-drilldown.vue
@@ -189,7 +189,11 @@
 			<h4>Notebook</h4>
 		</section>
 		<template #preview>
-			<tera-drilldown-section>
+			<tera-drilldown-section
+				:is-loading="isRunInProgress"
+				:show-slot-while-loading="true"
+				:loading-progress="node.state.currentProgress"
+			>
 				<section class="pb-3 px-2">
 					<div class="mx-2" ref="chartWidthDiv"></div>
 					<Accordion multiple :active-index="[0, 1, 2, 3]">
@@ -240,9 +244,6 @@
 							</AccordionTab>
 						</template>
 					</Accordion>
-					<tera-progress-spinner v-if="isRunInProgress" :font-size="2" is-centered style="height: 100%">
-						{{ node.state.currentProgress }}%
-					</tera-progress-spinner>
 					<tera-notebook-error v-bind="node.state.errorMessage" />
 				</section>
 			</tera-drilldown-section>
@@ -336,7 +337,6 @@ import Divider from 'primevue/divider';
 import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
 import AccordionTab from 'primevue/accordiontab';
 import Accordion from 'primevue/accordion';
-import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
 import Dropdown from 'primevue/dropdown';
 import { setupDatasetInput, setupCsvAsset, setupModelInput, parseCsvAsset } from '@/services/calibrate-workflow';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue
index 8a7a7cf4ac..7ac4f1817f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue
@@ -73,8 +73,6 @@ const lossChartSize = { width: 180, height: 120 };
 const poller = new Poller();
 const pollResult = async (runId: string) => {
 	poller
-		.setInterval(3000)
-		.setThreshold(300)
 		.setPollAction(async () => pollAction(runId))
 		.setProgressAction((data: Simulation) => {
 			if (data?.updates?.length) {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
index ed88b1cac6..5448c23b9e 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
@@ -156,11 +156,8 @@
 			</template>
 		</tera-slider-panel>
 		<template #preview>
-			<tera-drilldown-preview>
-				<tera-progress-spinner v-if="showSpinner" :font-size="2" is-centered style="height: 100%">
-					{{ props.node.state.currentProgress }}%
-				</tera-progress-spinner>
-				<template v-else-if="!isEmpty(node.state.runId)">
+			<tera-drilldown-preview :is-loading="showSpinner" :loading-progress="props.node.state.currentProgress">
+				<template v-if="!isEmpty(node.state.runId)">
 					<header class="flex align-items-start">
 						<div>
 							<h4>{{ validatedModelConfiguration?.name }}</h4>
@@ -345,7 +342,6 @@ import { VAceEditor } from 'vue3-ace-editor';
 import { saveCodeToState } from '@/services/notebook';
 
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
-import TeraDrilldownPreview from '@/components/drilldown/tera-drilldown-preview.vue';
 import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
 import TeraSliderPanel from '@/components/widgets/tera-slider-panel.vue';
 import TeraModelPart from '@/components/model/model-parts/tera-model-part.vue';
@@ -353,7 +349,6 @@ import TeraInitialTable from '@/components/model/petrinet/tera-initial-table.vue
 import TeraParameterTable from '@/components/model/petrinet/tera-parameter-table.vue';
 import TeraModelDiagram from '@/components/model/petrinet/tera-model-diagram.vue';
 
-import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
 import TeraToggleableInput from '@/components/widgets/tera-toggleable-input.vue';
 
 import TeraChartControl from '@/components/workflow/tera-chart-control.vue';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-comparison/tera-model-comparison.vue b/packages/client/hmi-client/src/components/workflow/ops/model-comparison/tera-model-comparison.vue
index 060ea03c41..a6230318d2 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-comparison/tera-model-comparison.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-comparison/tera-model-comparison.vue
@@ -116,12 +116,7 @@
 					:options="{ showPrintMargin: false }"
 				/>
 			</tera-drilldown-section>
-			<tera-drilldown-preview>
-				<tera-progress-spinner
-					v-if="isLoadingStructuralComparisons && isEmpty(structuralComparisons)"
-					is-centered
-					:font-size="3"
-				/>
+			<tera-drilldown-preview :is-loading="isLoadingStructuralComparisons && isEmpty(structuralComparisons)">
 				<ul>
 					<li v-for="(image, index) in structuralComparisons" :key="index">
 						<label>Comparison {{ index + 1 }}: {{ getTitle(index) }}</label>
@@ -177,7 +172,6 @@ import { VAceEditor } from 'vue3-ace-editor';
 import { VAceEditorInstance } from 'vue3-ace-editor/types';
 import TeraNotebookJupyterInput from '@/components/llm/tera-notebook-jupyter-input.vue';
 import Image from 'primevue/image';
-import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
 import { saveCodeToState } from '@/services/notebook';
 import { addImage, deleteImages, getImages } from '@/services/image';
 import TeraColumnarPanel from '@/components/widgets/tera-columnar-panel.vue';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index f3d675ad82..45c73f1621 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -201,6 +201,11 @@
 		<!-- Preview tab -->
 		<template #preview>
 			<tera-drilldown-section
+				:is-loading="showSpinner"
+				:loading-progress="props.node.state.currentProgress"
+				:loading-message="'of maximum iterations complete'"
+				:is-blank="showSpinner && node.state.inProgressOptimizeId === ''"
+				:blank-message="'Optimize complete. Running simulations'"
 				class="ml-3 mr-3"
 				:class="{
 					'failed-run': optimizationResult.success === 'False',
@@ -219,12 +224,6 @@
 						@click="showSaveInterventionPolicy = true"
 					/>
 				</template>
-				<tera-progress-spinner v-if="showSpinner" :font-size="2" is-centered style="height: 100%">
-					<div v-if="node.state.inProgressOptimizeId !== ''">
-						{{ props.node.state.currentProgress }}% of maximum iterations complete
-					</div>
-					<div v-else>Optimize complete. Running simulations</div>
-				</tera-progress-spinner>
 				<tera-operator-output-summary v-if="node.state.summaryId && !showSpinner" :summary-id="node.state.summaryId" />
 				<!-- Optimize result.json display: -->
 				<div
@@ -438,7 +437,6 @@ import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.
 import TeraSaveDatasetFromSimulation from '@/components/dataset/tera-save-dataset-from-simulation.vue';
 import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel-button.vue';
 import TeraOperatorOutputSummary from '@/components/operator/tera-operator-output-summary.vue';
-import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
 import { getModelByModelConfigurationId, getCalendarSettingsFromModel } from '@/services/model';
 import { getModelConfigurationById } from '@/services/model-configurations';
 import {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
index d75ed3184c..78d8e9e47d 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
@@ -100,8 +100,6 @@ const showSpinner = computed<boolean>(
 const poller = new Poller();
 const pollResult = async (runId: string) => {
 	poller
-		.setInterval(5000)
-		.setThreshold(350)
 		.setPollAction(async () => pollAction(runId))
 		.setProgressAction((data: Simulation) => {
 			if (runId === props.node.state.inProgressOptimizeId && data.updates.length > 0) {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
index b95b0d8ee3..41bd471b86 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
@@ -17,7 +17,7 @@
 			>
 				<template #content>
 					<div class="toolbar">
-						<p>Click Run to start the simulation.</p>
+						<p>{{ blankMessage }}.</p>
 						<span class="flex gap-2">
 							<tera-pyciemss-cancel-button :simulation-run-id="cancelRunIds" />
 							<Button label="Run" icon="pi pi-play" @click="run" :loading="inProgressForecastRun" />
@@ -120,7 +120,11 @@
 
 		<!-- Preview -->
 		<template #preview>
-			<tera-drilldown-section v-if="selectedOutputId" :is-loading="inProgressForecastRun">
+			<tera-drilldown-section
+				:is-loading="inProgressForecastRun"
+				:is-blank="!selectedOutputId"
+				:blank-message="blankMessage"
+			>
 				<template #header-controls-right>
 					<Button class="mr-3" label="Save for re-use" severity="secondary" outlined @click="showSaveDataset = true" />
 				</template>
@@ -197,12 +201,6 @@
 					</div>
 				</template>
 			</tera-drilldown-section>
-
-			<!-- Empty state -->
-			<section v-else class="empty-state">
-				<Vue3Lottie :animationData="EmptySeed" :height="150" loop autoplay />
-				<p class="helpMessage">Click 'Run' to start the simulation</p>
-			</section>
 		</template>
 
 		<template #sidebar-right>
@@ -315,16 +313,16 @@
 <script setup lang="ts">
 import _, { isEmpty } from 'lodash';
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
+
+import { VAceEditor } from 'vue3-ace-editor';
+import { VAceEditorInstance } from 'vue3-ace-editor/types';
+
+import Accordion from 'primevue/accordion';
+import AccordionTab from 'primevue/accordiontab';
 import Button from 'primevue/button';
 import Dropdown from 'primevue/dropdown';
 import Divider from 'primevue/divider';
-import Accordion from 'primevue/accordion';
-import AccordionTab from 'primevue/accordiontab';
-import { Vue3Lottie } from 'vue3-lottie';
-import EmptySeed from '@/assets/images/lottie-empty-seed.json';
-import { useDrilldownChartSize } from '@/composables/useDrilldownChartSize';
-import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
-import TeraSliderPanel from '@/components/widgets/tera-slider-panel.vue';
+
 import type {
 	CsvAsset,
 	InterventionPolicy,
@@ -335,6 +333,16 @@ import type {
 } from '@/types/Types';
 import { AssetType } from '@/types/Types';
 import type { WorkflowNode } from '@/types/workflow';
+
+import { deleteAnnotation } from '@/services/chart-settings';
+import { flattenInterventionData, getInterventionPolicyById } from '@/services/intervention-policy';
+import {
+	getModelByModelConfigurationId,
+	getUnitsFromModelParts,
+	getCalendarSettingsFromModel,
+	getTypesFromModelParts
+} from '@/services/model';
+import { getModelConfigurationById } from '@/services/model-configurations';
 import {
 	getRunResultCSV,
 	parsePyCiemssMap,
@@ -343,39 +351,33 @@ import {
 	DataArray,
 	CiemssMethodOptions
 } from '@/services/models/simulation-service';
-import {
-	getModelByModelConfigurationId,
-	getUnitsFromModelParts,
-	getCalendarSettingsFromModel,
-	getTypesFromModelParts
-} from '@/services/model';
-import { nodeMetadata } from '@/components/workflow/util';
 
+import { logger } from '@/utils/logger';
+
+import { ChartSettingType, CiemssPresetTypes, DrilldownTabs } from '@/types/common';
+
+import VegaChart from '@/components/widgets/VegaChart.vue';
+import { KernelSessionManager } from '@/services/jupyter';
+import TeraChartSettings from '@/components/widgets/tera-chart-settings.vue';
+import TeraChartSettingsPanel from '@/components/widgets/tera-chart-settings-panel.vue';
 import TeraDatasetDatatable from '@/components/dataset/tera-dataset-datatable.vue';
-import SelectButton from 'primevue/selectbutton';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
-import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel-button.vue';
+import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
+import TeraInterventionSummaryCard from '@/components/intervention-policy/tera-intervention-summary-card.vue';
 import TeraNotebookError from '@/components/drilldown/tera-notebook-error.vue';
-import TeraOperatorOutputSummary from '@/components/operator/tera-operator-output-summary.vue';
-import { useProjects } from '@/composables/project';
 import TeraNotebookJupyterInput from '@/components/llm/tera-notebook-jupyter-input.vue';
-import { KernelSessionManager } from '@/services/jupyter';
-import { logger } from '@/utils/logger';
-import { VAceEditor } from 'vue3-ace-editor';
-import { VAceEditorInstance } from 'vue3-ace-editor/types';
-import VegaChart from '@/components/widgets/VegaChart.vue';
-import { ChartSettingType, CiemssPresetTypes, DrilldownTabs } from '@/types/common';
-import { getModelConfigurationById } from '@/services/model-configurations';
-import { flattenInterventionData, getInterventionPolicyById } from '@/services/intervention-policy';
-import TeraInterventionSummaryCard from '@/components/intervention-policy/tera-intervention-summary-card.vue';
+import TeraOperatorOutputSummary from '@/components/operator/tera-operator-output-summary.vue';
+import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel-button.vue';
 import TeraSaveSimulationModal from '@/components/project/tera-save-simulation-modal.vue';
-import TeraChartSettings from '@/components/widgets/tera-chart-settings.vue';
-import TeraChartSettingsPanel from '@/components/widgets/tera-chart-settings-panel.vue';
+import TeraSliderPanel from '@/components/widgets/tera-slider-panel.vue';
 import TeraTimestepCalendar from '@/components/widgets/tera-timestep-calendar.vue';
-import { deleteAnnotation } from '@/services/chart-settings';
+import { nodeMetadata } from '@/components/workflow/util';
+
 import { useCharts } from '@/composables/useCharts';
 import { useChartSettings } from '@/composables/useChartSettings';
+import { useProjects } from '@/composables/project';
+import { useDrilldownChartSize } from '@/composables/useDrilldownChartSize';
 import { SimulateCiemssOperationState } from './simulate-ciemss-operation';
 import { mergeResults, renameFnGenerator } from '../calibrate-ciemss/calibrate-utils';
 import { usePreparedChartInputs } from './simulate-utils';
@@ -387,6 +389,7 @@ const emit = defineEmits(['update-state', 'select-output', 'close']);
 
 const isSidebarOpen = ref(true);
 const isOutputSettingsPanelOpen = ref(false);
+const blankMessage = "Click 'Run' to start the simulation";
 
 const currentActiveIndicies = ref([0, 1, 2]);
 
@@ -792,6 +795,7 @@ onUnmounted(() => kernelManager.shutdown());
 	color: var(--text-color-secondary);
 	background: var(--surface-50);
 }
+
 .empty-image {
 	width: 5rem;
 	height: 6rem;
@@ -835,18 +839,6 @@ onUnmounted(() => kernelManager.shutdown());
 	}
 }
 
-.empty-state {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	gap: var(--gap-4);
-	text-align: center;
-	pointer-events: none;
-}
-
 .p-button-icon-left {
 	color: var(--text-color-primary);
 }
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-node-ciemss.vue
index 2de1cc7a04..491c2cffe7 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-node-ciemss.vue
@@ -1,6 +1,9 @@
 <template>
 	<main>
-		<template v-if="selectedRunId && runResults[selectedRunId]">
+		<tera-progress-spinner v-if="inProgressForecastRun" :font-size="2" is-centered style="height: 100%">
+			Processing...
+		</tera-progress-spinner>
+		<template v-else-if="selectedRunId && runResults[selectedRunId]">
 			<section>
 				<div v-if="isChartsEmpty" class="empty-chart">
 					<img src="@assets/svg/seed.svg" alt="" draggable="false" class="empty-image" />
@@ -32,7 +35,6 @@
 				/>
 			</section>
 		</template>
-		<tera-progress-spinner v-if="inProgressForecastRun" :font-size="2" is-centered style="height: 100%" />
 		<Button v-if="areInputsFilled" label="Edit" @click="emit('open-drilldown')" severity="secondary" outlined />
 		<tera-operator-placeholder v-else :node="node"> Connect a model configuration </tera-operator-placeholder>
 	</main>
@@ -42,36 +44,31 @@
 import _ from 'lodash';
 import { computed, ref, toRef, watch } from 'vue';
 import Button from 'primevue/button';
-import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
-import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
-import { getRunResultCSV, getSimulation, parsePyCiemssMap, DataArray } from '@/services/models/simulation-service';
-import { getModelByModelConfigurationId, getTypesFromModelParts, getUnitsFromModelParts } from '@/services/model';
+
 import { logger } from '@/utils/logger';
-import { nodeOutputLabel } from '@/components/workflow/util';
 
-import type { WorkflowNode } from '@/types/workflow';
-import { createLLMSummary } from '@/services/summary-service';
-import { useProjects } from '@/composables/project';
+import { updateChartSettingsBySelectedVariables } from '@/services/chart-settings';
 import { createDatasetFromSimulationResult } from '@/services/dataset';
-import VegaChart from '@/components/widgets/VegaChart.vue';
-import {
-	ClientEvent,
-	ClientEventType,
-	ModelConfiguration,
-	ProgressState,
-	Simulation,
-	SimulationNotificationData,
-	StatusUpdate,
-	type InterventionPolicy,
-	type Model
-} from '@/types/Types';
 import { flattenInterventionData, getInterventionPolicyById } from '@/services/intervention-policy';
-import { updateChartSettingsBySelectedVariables } from '@/services/chart-settings';
-import { ChartSettingType } from '@/types/common';
-import { useClientEvent } from '@/composables/useClientEvent';
+import { getModelByModelConfigurationId, getTypesFromModelParts, getUnitsFromModelParts } from '@/services/model';
 import { getModelConfigurationById } from '@/services/model-configurations';
+import { getRunResultCSV, parsePyCiemssMap, pollAction, DataArray } from '@/services/models/simulation-service';
+import { createLLMSummary } from '@/services/summary-service';
+
+import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
+import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
+import VegaChart from '@/components/widgets/VegaChart.vue';
+import { nodeOutputLabel } from '@/components/workflow/util';
+
+import { ModelConfiguration, type InterventionPolicy, type Model } from '@/types/Types';
+import { ChartSettingType } from '@/types/common';
+import type { WorkflowNode } from '@/types/workflow';
+
 import { useChartSettings } from '@/composables/useChartSettings';
 import { useCharts } from '@/composables/useCharts';
+import { useProjects } from '@/composables/project';
+
+import { Poller, PollerState } from '@/api/api';
 import { SimulateCiemssOperationState, SimulateCiemssOperation } from './simulate-ciemss-operation';
 import { mergeResults, renameFnGenerator } from '../calibrate-ciemss/calibrate-utils';
 import { usePreparedChartInputs } from './simulate-utils';
@@ -192,69 +189,42 @@ const isChartsEmpty = computed(
 	() => _.isEmpty(interventionCharts.value) && _.isEmpty(variableCharts.value) && _.isEmpty(comparisonCharts.value)
 );
 
-const isFinished = (state: ProgressState) =>
-	[ProgressState.Cancelled, ProgressState.Failed, ProgressState.Complete].includes(state);
-
-// Handle simulation status update event for the forecast run
-useClientEvent(
-	ClientEventType.SimulationNotification,
-	async (event: ClientEvent<StatusUpdate<SimulationNotificationData>>) => {
-		const simulationNotificationData = event.data.data;
-		if (simulationNotificationData.simulationId !== inProgressForecastId.value || !isFinished(event.data.state)) return;
-
-		const simId = simulationNotificationData.simulationId;
-		let errorMessage = { name: '', value: '', traceback: '' };
-		let forecastId = '';
-		if (event.data.state === ProgressState.Failed) {
-			const simulation = await getSimulation(simId);
-			if (simulation?.status && simulation?.statusMessage) {
-				errorMessage = {
-					name: simId,
-					value: simulation.status,
-					traceback: simulation.statusMessage
-				};
-			}
-		} else if (event.data.state === ProgressState.Complete) {
-			forecastId = simId;
-		}
-		const state = _.cloneDeep(props.node.state);
+const poller = new Poller();
+const pollResult = async (runId: string) => {
+	poller.setPollAction(async () => pollAction(runId));
+	const pollerResults = await poller.start();
+	const state = _.cloneDeep(props.node.state);
+	state.errorMessage = { name: '', value: '', traceback: '' };
+
+	if (pollerResults.state === PollerState.Cancelled) {
 		state.inProgressForecastId = '';
-		state.forecastId = forecastId;
-		state.errorMessage = errorMessage;
-		emit('update-state', state);
-		if (event.data.state === ProgressState.Complete) await processResult(simId);
+		state.inProgressBaseForecastId = '';
+		poller.stop();
+	} else if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
+		// throw if there are any failed runs for now
+		logger.error(`Simulate: ${runId} has failed`, {
+			toastTitle: 'Error - Pyciemss'
+		});
 	}
-);
-
-// Handle simulation status update event for the base forecast run
-useClientEvent(
-	ClientEventType.SimulationNotification,
-	async (event: ClientEvent<StatusUpdate<SimulationNotificationData>>) => {
-		const simulationNotificationData = event.data.data;
-		if (simulationNotificationData.simulationId !== inProgressBaseForecastId.value || !isFinished(event.data.state))
-			return;
+	return pollerResults;
+};
 
-		const simId = simulationNotificationData.simulationId;
+async function processPolling(id, propName, inProgressPropName) {
+	const response = await pollResult(id);
+	if (response.state === PollerState.Done) {
 		const state = _.cloneDeep(props.node.state);
-		state.errorMessage = { name: '', value: '', traceback: '' };
-		state.inProgressBaseForecastId = '';
-		if (event.data.state === ProgressState.Complete) state.baseForecastId = simId;
+		state[propName] = id;
+		state[inProgressPropName] = '';
 		emit('update-state', state);
 	}
-);
+	await processResult(id);
+}
 
 watch(
 	() => props.node.state.inProgressForecastId,
 	async (id) => {
 		if (!id || id === '') return;
-		// Check simulation status and update the state
-		const simResponse: Simulation | null = await getSimulation(id);
-		if (simResponse?.status !== ProgressState.Complete) return;
-		const state = _.cloneDeep(props.node.state);
-		state.inProgressForecastId = '';
-		state.forecastId = id;
-		emit('update-state', state);
-		await processResult(id);
+		await processPolling(id, 'forecastId', 'inProgressForecastId');
 	},
 	{ immediate: true }
 );
@@ -263,13 +233,7 @@ watch(
 	() => props.node.state.inProgressBaseForecastId,
 	async (id) => {
 		if (!id || id === '') return;
-		// Check base simulation (without intervention) status and update the state
-		const simResponse: Simulation | null = await getSimulation(id);
-		if (simResponse?.status !== ProgressState.Complete) return;
-		const state = _.cloneDeep(props.node.state);
-		state.inProgressBaseForecastId = '';
-		state.baseForecastId = id;
-		emit('update-state', state);
+		await processPolling(id, 'baseForecastId', 'inProgressBaseForecastId');
 	},
 	{ immediate: true }
 );