diff --git a/src/ui/src/builder/BuilderHeader.vue b/src/ui/src/builder/BuilderHeader.vue
index 957b747c..67e08d20 100644
--- a/src/ui/src/builder/BuilderHeader.vue
+++ b/src/ui/src/builder/BuilderHeader.vue
@@ -5,12 +5,13 @@
 		<div class="undoRedo">
 			<button
 				class="undo"
-				:title="
+				:data-writer-tooltip="
 					undoRedoSnapshot.isUndoAvailable
-						? `Undo ${undoRedoSnapshot.undoDesc}`
+						? `Undo: ${undoRedoSnapshot.undoDesc}`
 						: 'Nothing to undo'
 				"
 				:disabled="!undoRedoSnapshot.isUndoAvailable"
+				data-writer-tooltip-placement="bottom"
 				@click="undo()"
 			>
 				<i class="material-symbols-outlined"> undo </i>
@@ -18,12 +19,13 @@
 			</button>
 			<button
 				class="redo"
-				:title="
+				:data-writer-tooltip="
 					undoRedoSnapshot.isRedoAvailable
-						? `Redo ${undoRedoSnapshot.redoDesc}`
+						? `Redo: ${undoRedoSnapshot.redoDesc}`
 						: 'Nothing to redo'
 				"
 				:disabled="!undoRedoSnapshot.isRedoAvailable"
+				data-writer-tooltip-placement="bottom"
 				@click="redo()"
 			>
 				<i class="material-symbols-outlined"> redo </i>
diff --git a/src/ui/src/builder/useComponentActions.ts b/src/ui/src/builder/useComponentActions.ts
index c3c863d6..9ca27dc2 100644
--- a/src/ui/src/builder/useComponentActions.ts
+++ b/src/ui/src/builder/useComponentActions.ts
@@ -765,7 +765,7 @@ export function useComponentActions(wf: Core, ssbm: BuilderManager) {
 		const component = wf.getComponentById(componentId);
 		if (!component) return;
 		const transactionId = `edit-${componentId}-out-${out.outId}-${out.toNodeId}`;
-		ssbm.openMutationTransaction(transactionId, `Edit out`, true);
+		ssbm.openMutationTransaction(transactionId, "Edit out", true);
 		ssbm.registerPreMutation(component);
 
 		component.outs = component.outs.filter(
@@ -789,7 +789,7 @@ export function useComponentActions(wf: Core, ssbm: BuilderManager) {
 		if (!component) return;
 
 		const transactionId = `change-${componentId}-coordinates`;
-		ssbm.openMutationTransaction(transactionId, `Change coordinates`, true);
+		ssbm.openMutationTransaction(transactionId, "Change coordinates", false);
 		ssbm.registerPreMutation(component);
 
 		component.x = Math.floor(x);
@@ -800,6 +800,30 @@ export function useComponentActions(wf: Core, ssbm: BuilderManager) {
 		wf.sendComponentUpdate();
 	}
 
+	/***
+	 * Change the coordinates of multiple components.
+	 */
+	function changeCoordinatesMultiple(
+		coordinates: Record<Component["id"], {x: number, y: number}>
+	) {
+		const transactionId = "change-multiple-coordinates";
+		ssbm.openMutationTransaction(transactionId, "Change coordinates", false);
+
+		const entries = Object.entries(coordinates); 
+		if (entries.length == 0) return;
+		entries.forEach(([componentId, {x, y}]) => {
+			const component = wf.getComponentById(componentId);
+			if (!component) return;
+			ssbm.registerPreMutation(component);
+			component.x = Math.floor(x);
+			component.y = Math.floor(y);
+			ssbm.registerPostMutation(component);
+		});
+
+		ssbm.closeMutationTransaction(transactionId);
+		wf.sendComponentUpdate();
+	}
+
 	/**
 	 * Set the value for a component's visibility.
 	 */
@@ -948,6 +972,7 @@ export function useComponentActions(wf: Core, ssbm: BuilderManager) {
 		addOut,
 		removeOut,
 		changeCoordinates,
+		changeCoordinatesMultiple,
 		setVisibleValue,
 		setBinding,
 		getUndoRedoSnapshot,
diff --git a/src/ui/src/components/workflows/WorkflowsWorkflow.vue b/src/ui/src/components/workflows/WorkflowsWorkflow.vue
index 8df27686..8e610f21 100644
--- a/src/ui/src/components/workflows/WorkflowsWorkflow.vue
+++ b/src/ui/src/components/workflows/WorkflowsWorkflow.vue
@@ -37,8 +37,8 @@
 				<component
 					:is="renderProxiedComponent(node.id, 0)"
 					:style="{
-						top: `${node.y - renderOffset.y}px`,
-						left: `${node.x - renderOffset.x}px`,
+						top: `${(temporaryNodeCoordinates?.[node.id]?.y ?? node.y) - renderOffset.y}px`,
+						left: `${(temporaryNodeCoordinates?.[node.id]?.x ?? node.x) - renderOffset.x}px`,
 						'border-color':
 							activeConnection?.liveArrow?.toNodeId == node.id
 								? activeConnection?.liveArrow?.color
@@ -72,6 +72,7 @@
 			:render-offset="renderOffset"
 			:zoom-level="zoomLevel"
 			class="navigator"
+			@auto-arrange="handleAutoArrange"
 			@change-render-offset="handleChangeRenderOffset"
 			@change-zoom-level="handleChangeZoomLevel"
 			@reset-zoom="resetZoom"
@@ -154,13 +155,24 @@ const isRunning = ref(false);
 const selectedArrow = ref(null);
 const zoomLevel = ref(ZOOM_SETTINGS.initialLevel);
 const arrowRefresherObserver = new MutationObserver(refreshArrows);
+const temporaryNodeCoordinates = ref<
+	Record<Component["id"], { x: number; y: number }>
+>({});
+
+const AUTOARRANGE_ROW_GAP_PX = 96;
+const AUTOARRANGE_COLUMN_GAP_PX = 128;
 
 const nodes = computed(() =>
 	wf.getComponents(workflowComponentId, { sortedByPosition: true }),
 );
 
-const { createAndInsertComponent, addOut, removeOut, changeCoordinates } =
-	useComponentActions(wf, wfbm);
+const {
+	createAndInsertComponent,
+	addOut,
+	removeOut,
+	changeCoordinates,
+	changeCoordinatesMultiple,
+} = useComponentActions(wf, wfbm);
 const { getComponentInfoFromDrag } = useDragDropComponent(wf);
 
 const activeConnection: Ref<{
@@ -214,6 +226,101 @@ function handleClick() {
 	selectedArrow.value = null;
 }
 
+function organizeNodesInColumns() {
+	const columns: Map<number, Set<Component>> = new Map();
+
+	function scan(node: Component, layer: number) {
+		columns.forEach((column) => {
+			if (column.has(node)) {
+				column.delete(node);
+			}
+		});
+		if (!columns.has(layer)) {
+			columns.set(layer, new Set());
+		}
+		const column = columns.get(layer);
+		column.add(node);
+		node.outs?.forEach((out) => {
+			const outNode = wf.getComponentById(out.toNodeId);
+			scan(outNode, layer + 1);
+		});
+	}
+
+	const dependencies: Map<Component["id"], Set<Component["id"]>> = new Map();
+
+	nodes.value.forEach((node) => {
+		node.outs?.forEach((outNode) => {
+			if (!dependencies.has(outNode.toNodeId)) {
+				dependencies.set(outNode.toNodeId, new Set());
+			}
+			dependencies.get(outNode.toNodeId).add(node.id);
+		});
+	});
+
+	nodes.value
+		.filter((node) => !dependencies.has(node.id))
+		.forEach((startNode) => {
+			scan(startNode, 0);
+		});
+
+	return columns;
+}
+
+function calculateAutoArrangeDimensions(columns: Map<number, Set<Component>>) {
+	const columnDimensions: Map<number, { height: number; width: number }> =
+		new Map();
+	const nodeDimensions: Map<Component["id"], { height: number }> = new Map();
+	columns.forEach((nodes, layer) => {
+		let height = 0;
+		let width = 0;
+		nodes.forEach((node) => {
+			const nodeEl = nodeContainerEl.value.querySelector(
+				`[data-writer-id="${node.id}"]`,
+			);
+			if (!nodeEl) return;
+			const nodeBCR = nodeEl.getBoundingClientRect();
+			nodeDimensions.set(node.id, {
+				height: nodeBCR.height * (1 / zoomLevel.value),
+			});
+			height +=
+				nodeBCR.height * (1 / zoomLevel.value) + AUTOARRANGE_ROW_GAP_PX;
+			width = Math.max(width, nodeBCR.width * (1 / zoomLevel.value));
+		});
+		columnDimensions.set(layer, {
+			height: height - AUTOARRANGE_ROW_GAP_PX,
+			width,
+		});
+	});
+	return { columnDimensions, nodeDimensions };
+}
+
+function handleAutoArrange() {
+	const columns = organizeNodesInColumns();
+	const { columnDimensions, nodeDimensions } =
+		calculateAutoArrangeDimensions(columns);
+	const maxColumnHeight = Math.max(
+		...Array.from(columnDimensions.values()).map(
+			(dimensions) => dimensions.height,
+		),
+	);
+
+	const coordinates = {};
+	let x = AUTOARRANGE_COLUMN_GAP_PX;
+	for (let i = 0; i < columns.size; i++) {
+		const nodes = Array.from(columns.get(i)).sort((a, b) =>
+			a.y > b.y ? 1 : -1,
+		);
+		const { width, height } = columnDimensions.get(i);
+		let y = (maxColumnHeight - height) / 2 + AUTOARRANGE_ROW_GAP_PX;
+		nodes.forEach((node) => {
+			coordinates[node.id] = { x, y };
+			y += nodeDimensions.get(node.id).height + AUTOARRANGE_ROW_GAP_PX;
+		});
+		x += width + AUTOARRANGE_COLUMN_GAP_PX;
+	}
+	changeCoordinatesMultiple(coordinates);
+}
+
 async function handleRun() {
 	if (isRunning.value) return;
 	isRunning.value = true;
@@ -376,26 +483,27 @@ function clearActiveOperations() {
 	activeNodeMove.value = null;
 }
 
+function saveNodeMove() {
+	const { nodeId } = activeNodeMove.value;
+	const tempXY = temporaryNodeCoordinates.value?.[nodeId];
+	if (!tempXY) return;
+	const { x, y } = tempXY;
+	changeCoordinates(nodeId, x, y);
+	temporaryNodeCoordinates.value[nodeId] = null;
+}
+
 function moveNode(ev: MouseEvent) {
 	const { nodeId, offset } = activeNodeMove.value;
 	activeNodeMove.value.isPerfected = true;
-	const component = wf.getComponentById(nodeId);
 	const { x, y } = getAdjustedCoordinates(ev);
 
 	const newX = Math.floor(x - offset.x);
 	const newY = Math.floor(y - offset.y);
 
-	if (component.x == newX && component.y == newY) return;
-
-	component.x = newX;
-	component.y = newY;
-
-	setTimeout(() => {
-		// Debouncing
-		if (component.x !== newX) return;
-		if (component.y !== newY) return;
-		changeCoordinates(component.id, newX, newY);
-	}, 200);
+	temporaryNodeCoordinates.value[nodeId] = {
+		x: newX,
+		y: newY,
+	};
 }
 
 function moveCanvas(ev: MouseEvent) {
@@ -444,6 +552,9 @@ function handleMousedown(ev: MouseEvent) {
 }
 
 async function handleMouseup(ev: MouseEvent) {
+	if (activeNodeMove.value) {
+		saveNodeMove();
+	}
 	if (activeConnection.value === null) {
 		return;
 	}
diff --git a/src/ui/src/components/workflows/base/WorkflowMiniMap.vue b/src/ui/src/components/workflows/base/WorkflowMiniMap.vue
index 2da33001..5a11d3b9 100644
--- a/src/ui/src/components/workflows/base/WorkflowMiniMap.vue
+++ b/src/ui/src/components/workflows/base/WorkflowMiniMap.vue
@@ -58,7 +58,7 @@ const miniMap = ref({
 });
 
 const selector = ref({
-	width: 230,
+	width: 260,
 	height: 1,
 	top: 0,
 	left: 0,
@@ -120,7 +120,7 @@ function render() {
 	});
 
 	miniMap.value = {
-		width: 230,
+		width: 260,
 		height:
 			((nodeContainerBCR.height / nodeContainerBCR.width) *
 				nodeContainerBCR.width) /
diff --git a/src/ui/src/components/workflows/base/WorkflowNavigator.vue b/src/ui/src/components/workflows/base/WorkflowNavigator.vue
index 55c4694a..aee803c7 100644
--- a/src/ui/src/components/workflows/base/WorkflowNavigator.vue
+++ b/src/ui/src/components/workflows/base/WorkflowNavigator.vue
@@ -14,6 +14,17 @@
 			@change-render-offset="handleRenderOffsetChange"
 		></WorkflowMiniMap>
 		<div class="bar">
+			<div class="autoArranger">
+				<WdsButton
+					variant="neutral"
+					size="smallIcon"
+					data-writer-tooltip="Auto arrange blocks"
+					data-writer-tooltip-placement="left"
+					@click="handleAutoArrange"
+				>
+					<i class="material-symbols-outlined">apps</i>
+				</WdsButton>
+			</div>
 			<div class="zoomer">
 				<WdsButton
 					variant="neutral"
@@ -99,6 +110,7 @@ const emit = defineEmits([
 	"changeRenderOffset",
 	"changeZoomLevel",
 	"resetZoom",
+	"autoArrange",
 ]);
 const isMiniMapShown = ref(true);
 const zoomLevelAsText = ref<string>(
@@ -113,6 +125,10 @@ function toggleMiniMap() {
 	isMiniMapShown.value = !isMiniMapShown.value;
 }
 
+function handleAutoArrange(ev: MouseEvent) {
+	emit("autoArrange");
+}
+
 function handleRenderOffsetChange(offset: typeof props.renderOffset) {
 	emit("changeRenderOffset", offset);
 }
@@ -190,7 +206,7 @@ onUnmounted(() => {
 	overflow: hidden;
 	color: var(--builderSecondaryTextColor);
 	border: 1px solid var(--builderSeparatorColor);
-	width: 230px;
+	width: 260px;
 }
 
 .bar {
@@ -198,12 +214,23 @@ onUnmounted(() => {
 	background: var(--builderBackgroundColor);
 }
 
+.autoArranger {
+	min-height: 36px;
+	min-width: 40px;
+	flex: 0 0 40px;
+	display: flex;
+	border-right: 1px solid var(--builderSeparatorColor);
+	align-items: center;
+	justify-content: center;
+}
+
 .zoomer {
 	flex: 1 0 auto;
 	display: flex;
 	padding: 4px;
 	gap: 4px;
 	align-items: center;
+	justify-content: center;
 }
 
 .zoomer .zoomLevelInput {
diff --git a/src/writer/command_line.py b/src/writer/command_line.py
index a460fc39..69cb198c 100644
--- a/src/writer/command_line.py
+++ b/src/writer/command_line.py
@@ -1,6 +1,5 @@
 import os
 import shutil
-import sys
 from typing import Optional
 
 import click
@@ -29,11 +28,11 @@ def run(path: str, host: str, port: Optional[int], enable_jobs_api: bool):
     abs_path = os.path.abspath(path)
     if wf_project.is_project(path) is False and \
         wf_project.can_create_project(path) is True:
-        raise click.ClickException(f"There’s no Writer Framework project at this location, create a new one with `writer create {path}`")
+        raise click.ClickException(f"There's no Writer Framework project at this location, create a new one with `writer create {path}`")
 
     if wf_project.is_project(path) is False and \
         wf_project.can_create_project(path) is False:
-        raise click.ClickException(f"There’s no Writer Framework project at this location : {abs_path}")
+        raise click.ClickException(f"There's no Writer Framework project at this location : {abs_path}")
 
     writer.serve.serve(
         abs_path, mode="run", port=port, host=host, enable_server_setup=True, enable_jobs_api=enable_jobs_api)
@@ -43,7 +42,7 @@ def run(path: str, host: str, port: Optional[int], enable_jobs_api: bool):
 @click.option('--port', default=None, help="Port to run the app on")
 @click.option('--enable-remote-edit', help="Set this flag to allow non-local requests in edit mode.", is_flag=True)
 @click.option('--enable-server-setup', help="Set this flag to enable server setup hook in edit mode.", is_flag=True)
-@click.option("--no-interactive", help="Set the flask to ask the app to run without asking anything to the user", is_flag=True)
+@click.option("--no-interactive", help="Set this flag to run the app without asking anything to the user.", is_flag=True)
 @click.option("--enable-jobs-api", help="Set this flag to enable the Jobs API, allowing you to execute jobs without user interaction.", is_flag=True)
 @click.argument('path')
 def edit(