diff --git a/frontend/src/lib/components/FlowMetadata.svelte b/frontend/src/lib/components/FlowMetadata.svelte
index e6d0d2b874..fe91ae7ae6 100644
--- a/frontend/src/lib/components/FlowMetadata.svelte
+++ b/frontend/src/lib/components/FlowMetadata.svelte
@@ -3,7 +3,14 @@
 	import JobStatus from '$lib/components/JobStatus.svelte'
 	import Icon from 'svelte-awesome'
 	import { displayDaysAgo } from '$lib/utils'
-	import { faCalendar, faClock, faRobot, faUser, faWind } from '@fortawesome/free-solid-svg-icons'
+	import {
+		faCalendar,
+		faClock,
+		faRobot,
+		faScroll,
+		faUser,
+		faWind
+	} from '@fortawesome/free-solid-svg-icons'
 
 	export let job: Job
 	const SMALL_ICON_SCALE = 0.7
@@ -43,6 +50,19 @@
 				></span
 			>
 		{/if}
+
+		{#if (job && job.job_kind == 'flow') || job?.job_kind == 'script'}
+			{@const stem = `/${job?.job_kind}s`}
+			{@const isScript = job?.job_kind === 'script'}
+			{@const viewHref = `${stem}/get/${isScript ? job?.script_hash : job?.script_path}`}
+			<div>
+				<Icon class="text-gray-700" data={faScroll} scale={SMALL_ICON_SCALE} /><span class="mx-2">
+					{job?.job_kind}:
+					<a href={viewHref}>{isScript ? job?.script_hash : job?.script_path}</a>
+				</span>
+			</div>
+		{/if}
+
 		<div>
 			<Icon class="text-gray-700" data={faUser} scale={SMALL_ICON_SCALE} /><span class="mx-2">
 				By {job.created_by}
diff --git a/frontend/src/routes/run/[...run].svelte b/frontend/src/routes/run/[...run].svelte
index e289e26ab4..1d87d93a0d 100644
--- a/frontend/src/routes/run/[...run].svelte
+++ b/frontend/src/routes/run/[...run].svelte
@@ -37,7 +37,6 @@
 	import FlowMetadata from '$lib/components/FlowMetadata.svelte'
 	import JobArgs from '$lib/components/JobArgs.svelte'
 	import FlowProgressBar from '$lib/components/flows/FlowProgressBar.svelte'
-	import { flowStateStore, initFlowState } from '$lib/components/flows/flowState'
 
 	let workspace_id_query: string | undefined = $page.url.searchParams.get('workspace') ?? undefined
 	let workspace_id: string | undefined
@@ -113,6 +112,8 @@
 			}`}
 			{@const editHref = `${stem}/edit/${route}${isScript ? '?step=2' : ''}`}
 			{@const isRunning = job && 'running' in job && job.running}
+			{@const runsHref = `/runs/${job?.script_path}${!isScript ? '?jobKind=flow' : ''}`}
+			{@const viewHref = `${stem}/get/${isScript ? job?.script_hash : job?.script_path}`}
 			{#if isRunning}
 				<Button
 					color="red"
@@ -137,12 +138,14 @@
 			{#if canWrite(job?.script_path ?? '', {}, $userStore)}
 				<Button href={editHref} color="blue" size="xs" startIcon={{ icon: faEdit }}>Edit</Button>
 			{/if}
+			<Button href={viewHref} color="blue" size="xs" startIcon={{ icon: faScroll }}>
+				View {job?.job_kind}
+			</Button>
+			<Button href={runsHref} variant="border" color="blue" size="xs" startIcon={{ icon: faList }}>
+				View runs
+			</Button>
 		</svelte:fragment>
 		<svelte:fragment slot="right">
-			{@const stem = `/${job?.job_kind}s`}
-			{@const isScript = job?.job_kind === 'script'}
-			{@const runsHref = `/runs/${job?.script_path}${!isScript ? '?jobKind=flow' : ''}`}
-			{@const viewHref = `${stem}/get/${isScript ? job?.script_hash : job?.script_path}`}
 			{#if job && 'deleted' in job && !job?.deleted && ($userStore?.is_admin ?? false)}
 				<Button
 					variant="border"
@@ -154,86 +157,67 @@
 					Delete
 				</Button>
 			{/if}
-			<Button href={runsHref} variant="border" color="blue" size="xs" startIcon={{ icon: faList }}>
-				View runs
-			</Button>
-			<Button
-				href={viewHref}
-				variant="border"
-				color="blue"
-				size="xs"
-				startIcon={{ icon: faScroll }}
-			>
-				View {job?.job_kind}
-			</Button>
 		</svelte:fragment>
 	</ActionRow>
 {/if}
 <CenteredPage>
-	<div class="flex flex-row flex-wrap justify-between items-center gap-4 py-4">
-		<h1>
-			<div>
-				{#if job}
-					{#if 'success' in job && job.success}
-						{#if job.is_skipped}
-							<Icon
-								class="text-green-600"
-								data={faFastForward}
-								scale={SMALL_ICON_SCALE}
-								label="Job completed successfully but was skipped"
-							/>
-						{:else}
-							<Icon
-								class="text-green-600"
-								data={check}
-								scale={SMALL_ICON_SCALE}
-								label="Job completed successfully"
-							/>
-						{/if}
-					{:else if job && 'success' in job}
+	<h1 class="flex flex-row flex-wrap justify-between items-center gap-4 py-6">
+		<div>
+			{#if job}
+				{#if 'success' in job && job.success}
+					{#if job.is_skipped}
 						<Icon
-							class="text-red-700"
-							data={faTimes}
-							scale={iconScale}
-							label="Job completed with an error"
+							class="text-green-600"
+							data={faFastForward}
+							scale={SMALL_ICON_SCALE}
+							label="Job completed successfully but was skipped"
 						/>
-					{:else if job && 'running' in job && job.running}
+					{:else}
 						<Icon
-							class="text-yellow-500"
-							data={faCircle}
-							scale={iconScale}
-							label="Job is running"
-						/>
-					{:else if job && 'running' in job && job.scheduled_for && forLater(job.scheduled_for)}
-						<Icon
-							class="text-gray-700"
-							data={faCalendar}
-							scale={iconScale}
-							label="Job is scheduled for a later time"
-						/>
-					{:else if job && 'running' in job && job.scheduled_for}
-						<Icon
-							class="text-gray-500"
-							data={faHourglassHalf}
-							scale={iconScale}
-							label="Job is waiting for an executor"
+							class="text-green-600"
+							data={check}
+							scale={SMALL_ICON_SCALE}
+							label="Job completed successfully"
 						/>
 					{/if}
-					{job.script_path ?? (job.job_kind == 'dependencies' ? 'lock dependencies' : 'No path')}
-					{#if job.script_hash}
-						<a
-							href="/scripts/get/{job.script_hash}"
-							class="text-2xs text-gray-500 bg-gray-100 font-mono"
-							>{truncateHash(job.script_hash)}</a
-						>
-					{:else if job && 'job_kind' in job}<span
-							class="bg-blue-200 text-gray-700 text-xs rounded px-1 mx-3">{job.job_kind}</span
-						>
-					{/if}
+				{:else if job && 'success' in job}
+					<Icon
+						class="text-red-700"
+						data={faTimes}
+						scale={iconScale}
+						label="Job completed with an error"
+					/>
+				{:else if job && 'running' in job && job.running}
+					<Icon class="text-yellow-500" data={faCircle} scale={iconScale} label="Job is running" />
+				{:else if job && 'running' in job && job.scheduled_for && forLater(job.scheduled_for)}
+					<Icon
+						class="text-gray-700"
+						data={faCalendar}
+						scale={iconScale}
+						label="Job is scheduled for a later time"
+					/>
+				{:else if job && 'running' in job && job.scheduled_for}
+					<Icon
+						class="text-gray-500"
+						data={faHourglassHalf}
+						scale={iconScale}
+						label="Job is waiting for an executor"
+					/>
 				{/if}
-			</div>
-		</h1>
-	</div>
+				{job.script_path ?? (job.job_kind == 'dependencies' ? 'lock dependencies' : 'No path')}
+				{#if job.script_hash}
+					<a
+						href="/scripts/get/{job.script_hash}"
+						class="text-2xs text-gray-500 bg-gray-100 font-mono">{truncateHash(job.script_hash)}</a
+					>
+				{/if}
+				{#if job && 'job_kind' in job}<span
+						class="bg-blue-200 text-gray-700 text-xs rounded px-1 mx-3">{job.job_kind}</span
+					>
+				{/if}
+			{/if}
+		</div>
+	</h1>
 	{#if job && 'deleted' in job && job?.deleted}
 		<div class="bg-red-100 border-l-4 border-red-600 text-orange-700 p-4" role="alert">
 			<p class="font-bold">Deleted</p>
diff --git a/frontend/src/routes/schedule/add.svelte b/frontend/src/routes/schedule/add.svelte
index 2f5b300edb..2a26d3d054 100644
--- a/frontend/src/routes/schedule/add.svelte
+++ b/frontend/src/routes/schedule/add.svelte
@@ -20,6 +20,7 @@
 	import ScriptPicker from '$lib/components/ScriptPicker.svelte'
 	import Required from '$lib/components/Required.svelte'
 	import CronInput, { OFFSET } from '$lib/components/CronInput.svelte'
+	import PageHeader from '$lib/components/PageHeader.svelte'
 
 	let initialPath = $page.url.searchParams.get('edit') || ''
 	let edit = initialPath === '' ? false : true
@@ -110,7 +111,7 @@
 </script>
 
 <CenteredPage>
-	<h1 class="mb-4">{edit ? 'Edit schedule ' + path : 'New schedule'}</h1>
+	<PageHeader title={edit ? 'Edit schedule ' + path : 'New schedule'} />
 
 	<div>
 		{#if !edit}