diff --git a/src/lib/History/index.svelte b/src/lib/History/index.svelte
index a56afd2d..a431a8e3 100644
--- a/src/lib/History/index.svelte
+++ b/src/lib/History/index.svelte
@@ -62,7 +62,7 @@
 	});
 </script>
 
-<Card class="h-2/5">
+<Card class="flex-1">
 	<div slot="title" class="flex">
 		<div class="flex"><Tabs on:select={tabSelectHandler} {tabs} /></div>
 		<div class="flex-grow" />
@@ -89,7 +89,7 @@
 
 <style>
 	.custom-contaniner {
-		height: 100%;
-		overflow-y: auto;
+		/* height: 100%;
+		overflow-y: auto; */
 	}
 </style>
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index e688deaa..aa44a263 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -2,13 +2,9 @@
 	import '../app.postcss';
 </script>
 
-<div class="h-screen">
-	<!-- <Header /> -->
-
-	<main class="h-full">
-		<slot />
-	</main>
-</div>
+<main class="h-screen flex flex-col overflow-hidden">
+	<slot />
+</main>
 
 <style>
 </style>
diff --git a/src/routes/edit.svelte b/src/routes/edit.svelte
index 18ad1870..da2ea5cb 100644
--- a/src/routes/edit.svelte
+++ b/src/routes/edit.svelte
@@ -101,39 +101,45 @@
 <svelte:head>
 	<title>Edit</title>
 </svelte:head>
-<div>
-	<Navbar />
-	<div class="flex">
-		<div class="w-2/5 flex-grow flex flex-col" style="resize:both;">
-			<Card class="h-3/5">
-				<div slot="title" class="flex">
-					<div class="flex"><Tabs on:select={tabSelectHandler} {tabs} /></div>
-					<div class="flex-grow" />
-					<div class="flex gap-x-4 text-white">
-						{#if !$codeStore.autoSync}
-							<button class="bg-blue-500 hover:bg-blue-700 rounded px-1" on:click={syncDiagram}
-								>🔄</button
-							>
-						{/if}
-						<label for="autoSync">
-							<input type="checkbox" name="autoSync" bind:checked={$codeStore.autoSync} />
-							Auto sync
-						</label>
-					</div>
-				</div>
 
-				<div class="h-full flex-grow flex flex-col">
-					<div class="flex-grow" style="position: relative;">
-						<Editor on:update={updateHandler} {language} {text} {errorMarkers} />
-					</div>
+<Navbar />
+<div class="flex-1 flex overflow-hidden">
+	<div class="w-2/5 flex flex-col">
+		<Card class="flex-1">
+			<div slot="title" class="flex">
+				<div class="flex"><Tabs on:select={tabSelectHandler} {tabs} /></div>
+				<div class="flex-grow" />
+				<div class="flex gap-x-4 text-white">
+					{#if !$codeStore.autoSync}
+						<button class="bg-blue-500 hover:bg-blue-700 rounded px-1" on:click={syncDiagram}
+							>🔄</button
+						>
+					{/if}
+					<label for="autoSync">
+						<input type="checkbox" name="autoSync" bind:checked={$codeStore.autoSync} />
+						Auto sync
+					</label>
 				</div>
-			</Card>
-			<History />
-		</div>
+			</div>
 
-		<Card class="w-3/5 h-3/5">
-			<div slot="title" class="text-white">Diagram</div>
-			<View />
+			<div class="h-full flex-grow flex flex-col">
+				<div class="flex-grow" style="position: relative;">
+					<Editor on:update={updateHandler} {language} {text} {errorMarkers} />
+				</div>
+			</div>
 		</Card>
+		<History />
+		<History />
+	</div>
+
+	<div class="flex-1 flex bg-gray-100 overflow-hidden">
+		<!-- Scrollable container -->
+		<div class="flex-1 overflow-auto">
+			<!-- Your content -->
+			<Card>
+				<div slot="title" class="text-white">Diagram</div>
+				<View />
+			</Card>
+		</div>
 	</div>
 </div>