diff --git a/frontend/src/lib/components/flows/map/MapItem.svelte b/frontend/src/lib/components/flows/map/MapItem.svelte
index f29895ac78..9457c15c78 100644
--- a/frontend/src/lib/components/flows/map/MapItem.svelte
+++ b/frontend/src/lib/components/flows/map/MapItem.svelte
@@ -78,7 +78,7 @@
 				{annotation}
 			</div>
 		{/if}
-		{#if flowJobs && !insertable}
+		{#if flowJobs && !insertable && (mod.value.type === 'forloopflow' || mod.value.type === 'whileloopflow')}
 			<div class="absolute right-8 z-50 -top-5">
 				<FlowJobsMenu
 					on:selectedIteration={(e) => {
diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index 6b869b13f1..a0211ed342 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -225,7 +225,7 @@
 
 	const viewport = writable<Viewport>({
 		x: 0,
-		y: 0,
+		y: 5,
 		zoom: 1
 	})
 
diff --git a/frontend/src/lib/components/graph/graphBuilder.ts b/frontend/src/lib/components/graph/graphBuilder.ts
index 8d4d155dd3..0475c1271e 100644
--- a/frontend/src/lib/components/graph/graphBuilder.ts
+++ b/frontend/src/lib/components/graph/graphBuilder.ts
@@ -74,8 +74,6 @@ export default function graphBuilder(
 		// Index of the target module in the modules array
 		let index = mods?.findIndex((m) => m.id === targetId) ?? -1
 
-		console.log('addEdge', sourceId, targetId, options?.disableMoveIds)
-
 		edges.push({
 			id: options?.customId || `edge:${sourceId}->${targetId}`,
 			source: sourceId,
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
index 5945a59ef5..f4df42336a 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
@@ -49,7 +49,8 @@
 	<MapItem
 		mod={data.module}
 		insertable={data.insertable}
-		annotation={state?.flow_jobs
+		annotation={flowJobs &&
+		(data.module.value.type === 'forloopflow' || data.module.value.type === 'whileloopflow')
 			? 'Iteration: ' +
 			  (selectedIteration >= 0 ? selectedIteration : state?.flow_jobs?.length) +
 			  '/' +