diff --git a/src/TryMudBlazor.Client/App.razor b/src/TryMudBlazor.Client/App.razor
index 36693d37..f3a0f11b 100644
--- a/src/TryMudBlazor.Client/App.razor
+++ b/src/TryMudBlazor.Client/App.razor
@@ -1,5 +1,6 @@
 <Router AppAssembly="@typeof(Program).Assembly"
-        AdditionalAssemblies="@(new List<System.Reflection.Assembly> { typeof(Try.UserComponents.__Main).Assembly })">
+        AdditionalAssemblies="@(new List<System.Reflection.Assembly> { typeof(Try.UserComponents.__Main).Assembly })"
+        @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(EmptyLayout)" />
     </Found>
@@ -9,3 +10,4 @@
         </LayoutView>
     </NotFound>
 </Router>
+@* <HeadOutlet @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)"/> *@
\ No newline at end of file
diff --git a/src/TryMudBlazor.Client/Pages/Index/Index.razor b/src/TryMudBlazor.Client/Pages/Index/Index.razor
index 5d9d4c40..9a7be3a6 100644
--- a/src/TryMudBlazor.Client/Pages/Index/Index.razor
+++ b/src/TryMudBlazor.Client/Pages/Index/Index.razor
@@ -1,12 +1,11 @@
 @page "/"
 
-
 <MudLayout Class="try-mudblazor-index">
     <MudAppBar Color="Color.Transparent" Fixed="false" Elevation="0">
         <div class="brand">Try<span>MudBlazor</span></div>
         <MudSpacer />
-        <MudButton Link="https://mudblazor.com/" Color="Color.Default" Size="Size.Large">MudBlazor</MudButton>
-        <MudButton Link="https://github.com/MudBlazor/TryMudBlazor" Color="Color.Primary" Size="Size.Large">Source Code</MudButton>
+        <MudButton Href="https://mudblazor.com/" Color="Color.Default" Size="Size.Large">MudBlazor</MudButton>
+        <MudButton Href="https://github.com/MudBlazor/TryMudBlazor" Color="Color.Primary" Size="Size.Large">Source Code</MudButton>
     </MudAppBar>
     <MudMainContent>
         <MudContainer Class="my-16" MaxWidth="MaxWidth.Large">
@@ -152,8 +151,6 @@
     </MudMainContent>
 </MudLayout>
 
-
-
 @code { 
     string Version { get { var v = typeof(MudText).Assembly.GetName().Version; return $"v{v.Major}.{v.Minor}.{v.Build}"; } } 
 }
\ No newline at end of file
diff --git a/src/TryMudBlazor.Client/Program.cs b/src/TryMudBlazor.Client/Program.cs
index 4be6441b..748f1764 100644
--- a/src/TryMudBlazor.Client/Program.cs
+++ b/src/TryMudBlazor.Client/Program.cs
@@ -20,13 +20,13 @@ namespace TryMudBlazor.Client
     using Microsoft.AspNetCore.Components.WebAssembly.Services;
     using Microsoft.AspNetCore.Components.Web;
 
-    public class Program
+    public static class Program
     {
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("#app");
-            builder.RootComponents.Add<HeadOutlet>("head::after");
+            //builder.RootComponents.Add<HeadOutlet>("head::after");
 
             builder.Services.AddSingleton(serviceProvider => (IJSInProcessRuntime)serviceProvider.GetRequiredService<IJSRuntime>());
             builder.Services.AddSingleton(serviceProvider => (IJSUnmarshalledRuntime)serviceProvider.GetRequiredService<IJSRuntime>());
diff --git a/src/TryMudBlazor.Client/Routes.razor b/src/TryMudBlazor.Client/Routes.razor
deleted file mode 100644
index 302d9d85..00000000
--- a/src/TryMudBlazor.Client/Routes.razor
+++ /dev/null
@@ -1,6 +0,0 @@
-<Router AppAssembly="typeof(Program).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)" />
-        <FocusOnNavigate RouteData="routeData" Selector="h1" />
-    </Found>
-</Router>
diff --git a/src/TryMudBlazor.Server/Program.cs b/src/TryMudBlazor.Server/Program.cs
index fceb7fe8..28f36e70 100644
--- a/src/TryMudBlazor.Server/Program.cs
+++ b/src/TryMudBlazor.Server/Program.cs
@@ -1,12 +1,13 @@
+using Microsoft.AspNetCore.Builder;
 using MudBlazor.Examples.Data;
 using TryMudBlazor.Client;
 using TryMudBlazor.Client.Shared;
 
 var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
 builder.Services.AddRazorComponents()
-    .AddInteractiveServerComponents();
+    //.AddInteractiveServerComponents()
+    .AddInteractiveWebAssemblyComponents();
 
 builder.Services.AddScoped<IPeriodicTableService, PeriodicTableService>();
 builder.Services.AddCors(options =>
@@ -52,7 +53,8 @@
 app.UseAntiforgery();
 
 app.MapRazorComponents<App>()
-    .AddInteractiveServerRenderMode();
-    //.AddAdditionalAssemblies([typeof(MainLayout).Assembly]);
+    //.AddInteractiveServerRenderMode()
+    .AddInteractiveWebAssemblyRenderMode();
+    //.AddAdditionalAssemblies(typeof(MainLayout).Assembly);
 
 app.Run();
diff --git a/src/UserComponents/__Main.razor b/src/UserComponents/__Main.razor
index 0b8592f4..14af5b6e 100644
--- a/src/UserComponents/__Main.razor
+++ b/src/UserComponents/__Main.razor
@@ -1,4 +1,6 @@
 @page "/__main"
+@rendermode @(new InteractiveWebAssemblyRenderMode(prerender: false))
 
 @namespace Try.UserComponents
+@using Microsoft.AspNetCore.Components.Web
 @*This serves as a stub, which is then replaced with the user's components on the fly*@
\ No newline at end of file