diff --git a/src/lib/components/card/tabs.svelte b/src/lib/components/card/tabs.svelte
index 86be1bcc..fc11b338 100644
--- a/src/lib/components/card/tabs.svelte
+++ b/src/lib/components/card/tabs.svelte
@@ -25,7 +25,7 @@
 	{#if isOpen && tabs}
 		<ul class="flex flex-wrap flex-row" transition:fade>
 			{#each tabs as tab}
-				<li class="mr-2 last:mr-0 w-28 flex-auto text-center">
+				<li class="mr-2 last:mr-0 w-28 h-6 flex-auto text-center">
 					<div
 						class="text cursor-pointer font-semibold min-w-16 w-auto px-2 py-1 -mb-4 rounded-t  block leading-normal {activeTabID ===
 						tab.id
diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts
index 4d8ef404..cff24395 100644
--- a/src/lib/components/editor/util.ts
+++ b/src/lib/components/editor/util.ts
@@ -17,7 +17,7 @@ export const initEditor = (monacoEditor): void => {
 			'journey'
 		],
 		keywords: ['patricipant', 'as'],
-		arrows: ['---', '===', '-->', '==>'],
+		arrows: ['---', '===', '-->', '==>', '->>', '->'],
 		tokenizer: {
 			root: [
 				[/[{}]/, 'delimiter.bracket'],
diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte
index 23d307c0..3f0e93a0 100644
--- a/src/lib/components/navbar.svelte
+++ b/src/lib/components/navbar.svelte
@@ -74,4 +74,7 @@
 	#menu-toggle:checked + #menu {
 		display: block;
 	}
+	header {
+		z-index: 10000;
+	}
 </style>
diff --git a/src/routes/edit.svelte b/src/routes/edit.svelte
index 9579bc06..8213ad5a 100644
--- a/src/routes/edit.svelte
+++ b/src/routes/edit.svelte
@@ -100,13 +100,32 @@
 		await goto(`/view#${$base64State}`, { replaceState: true });
 	};
 
-	onMount(initHandler);
+	onMount(() => {
+		initHandler();
+		const resizer = document.getElementById('resizeHandler');
+		const element = document.getElementById('editorPane');
+		const resize = (e) => {
+			const newWidth = e.pageX - element.getBoundingClientRect().left;
+			if (newWidth > 50) {
+				element.style.width = newWidth + 'px';
+			}
+		};
+
+		const stopResize = () => {
+			window.removeEventListener('mousemove', resize);
+		};
+		resizer.addEventListener('mousedown', (e) => {
+			e.preventDefault();
+			window.addEventListener('mousemove', resize);
+			window.addEventListener('mouseup', stopResize);
+		});
+	});
 </script>
 
 <div class="h-full flex flex-col overflow-hidden bg-gray-100">
 	<Navbar />
 	<div class="flex-1 flex overflow-hidden">
-		<div class="w-2/5 hidden md:flex flex-col">
+		<div class="hidden md:flex flex-col" id="editorPane" style="width: 40%">
 			<Card on:select={tabSelectHandler} {tabs} isCloseable={false} title="Mermaid">
 				<div slot="actions">
 					{#if !$codeStore.autoSync}
@@ -116,7 +135,9 @@
 							data-cy="sync"
 							on:click={syncDiagram}><i class="fas fa-sync" /></button>
 					{/if}
-					<label for="autoSync">
+					<label
+						for="autoSync"
+						style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
 						<input type="checkbox" id="autoSync" bind:checked={$codeStore.autoSync} />
 						Auto sync
 					</label>
@@ -131,7 +152,7 @@
 				<Actions />
 			</div>
 		</div>
-
+		<div id="resizeHandler" />
 		<div class="flex-1 flex flex-col overflow-hidden">
 			<Card title="Diagram" isCloseable={false}>
 				<button
@@ -150,3 +171,31 @@
 		</div>
 	</div>
 </div>
+
+<style>
+	#resizeHandler {
+		height: 100%;
+		display: block;
+		cursor: col-resize;
+		padding: 0 2px;
+	}
+
+	#resizeHandler::after {
+		width: 1px;
+		height: 100%;
+		content: '';
+		position: absolute;
+		margin-left: -1px;
+		background-color: #ccc;
+	}
+
+	#resizeHandler:hover::after {
+		width: 2px;
+	}
+
+	@media screen and (max-width: 768px) {
+		#resizeHandler {
+			display: none;
+		}
+	}
+</style>