diff --git a/src/SharpIDE.Application/SharpIDE.Application.csproj b/src/SharpIDE.Application/SharpIDE.Application.csproj
index 4deb4f8..a360d28 100644
--- a/src/SharpIDE.Application/SharpIDE.Application.csproj
+++ b/src/SharpIDE.Application/SharpIDE.Application.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
 <!-- If any Microsoft.Build.dll ends up in the output, it will be prioritised for loading by MSBuild Nodes  -->
     <PackageReference Include="Ardalis.GuardClauses" Version="5.0.0" />
-    <PackageReference Include="AsyncReadProcess" Version="1.0.0-preview4" />
+    <PackageReference Include="AsyncReadProcess" Version="1.0.0-preview5" />
     <PackageReference Include="Microsoft.Build" Version="17.14.8" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Framework" Version="17.14.8" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Locator" Version="1.9.1" />
diff --git a/src/SharpIDE.Photino/Layout/MainLayout.razor b/src/SharpIDE.Photino/Layout/MainLayout.razor
index 4f883ab..4cb49ed 100644
--- a/src/SharpIDE.Photino/Layout/MainLayout.razor
+++ b/src/SharpIDE.Photino/Layout/MainLayout.razor
@@ -8,7 +8,7 @@
 @inject BuildService BuildService
 @inject AppState AppState
 
-<MudLayout>
+<MudLayout Style="height: 100%">
 	<MudAppBar Dense="true" Gutters="false" Class="px-2">
 		<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
 			<MudButton OnClick="@DrawerToggle" Style="min-width: 20px;">
@@ -40,21 +40,27 @@
 			</MudButton>
 		</MudStack>
 	</MudAppBar>
-	<MudDrawer @bind-Open="@_drawerOpen" Width="400px" ClipMode="DrawerClipMode.Always">
-		@if (_solutionFilePath is not null)
-		{
-			<SolutionExplorer @bind-SelectedFile="@_selectedFile" SolutionModel="@_solutionModel"/>
-		}
-		@* <NavMenu/> *@
-	</MudDrawer>
-	<MudMainContent>
-		<MudContainer MaxWidth="MaxWidth.False" Class="mt-2">
-			@* @Body *@
-			@if (_solutionFilePath is not null)
-			{
-				<CodeViewer SelectedFile="@_selectedFile" />
-			}
-		</MudContainer>
+
+	<MudMainContent Style="height: 100%">
+		<MudPaper Height="100%" Class="" Style="overflow:hidden; position:relative;">
+			<MudDrawerContainer Style="height: 100%" Class="mud-height-full">
+				<MudDrawer @bind-Open="@_drawerOpen" Style="height: 100%" Width="400px" Fixed="false" Elevation="0" Variant="@DrawerVariant.Persistent">
+					@if (_solutionFilePath is not null)
+					{
+						<SolutionExplorer @bind-SelectedFile="@_selectedFile" SolutionModel="@_solutionModel"/>
+					}
+				</MudDrawer>
+				<div class="d-flex justify-center align-center mud-height-full">
+					<MudContainer MaxWidth="MaxWidth.False" Class="mt-2">
+						@* @Body *@
+						@if (_solutionFilePath is not null)
+						{
+							<CodeViewer SelectedFile="@_selectedFile" />
+						}
+					</MudContainer>
+				</div>
+			</MudDrawerContainer>
+		</MudPaper>
 	</MudMainContent>
 	<MudDrawer @bind-Open="@_terminalDrawerOpen" Elevation="2" Variant="DrawerVariant.Temporary" Overlay="false" Anchor="Anchor.Bottom">
 		@if (_solutionFilePath is not null)
diff --git a/src/SharpIDE.Photino/wwwroot/index.html b/src/SharpIDE.Photino/wwwroot/index.html
index f0571f9..ea57661 100644
--- a/src/SharpIDE.Photino/wwwroot/index.html
+++ b/src/SharpIDE.Photino/wwwroot/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html style="background-color: #32333d">
+<html style="background-color: #32333d; height: 100%">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
@@ -10,7 +10,7 @@
 	<link href="_content/XtermBlazor/XtermBlazor.min.css" rel="stylesheet" />
     <link href="SharpIDE.Photino.styles.css" rel="stylesheet" />
 </head>
-<body>
+<body style="height: 100%">
     <app>Loading...</app>
 
     <div id="blazor-error-ui">
