diff --git a/server/http_server.ts b/server/http_server.ts
index 8cf57932..38dc2536 100644
--- a/server/http_server.ts
+++ b/server/http_server.ts
@@ -13,6 +13,9 @@ import { SpaceServer, SpaceServerConfig } from "./instance.ts";
 import { KvPrimitives } from "../plugos/lib/kv_primitives.ts";
 import { PrefixedKvPrimitives } from "../plugos/lib/prefixed_kv_primitives.ts";
 import { base64Encode } from "../plugos/asset_bundle/base64.ts";
+import { extendedMarkdownLanguage } from "../common/markdown_parser/parser.ts";
+import { parse } from "../common/markdown_parser/parse_tree.ts";
+import { renderMarkdownToHtml } from "../plugs/markdown/markdown_render.ts";
 
 const authenticationExpirySeconds = 60 * 60 * 24 * 7; // 1 week
 
@@ -108,19 +111,39 @@ export class HttpServer {
   }
 
   // Replaces some template variables in index.html in a rather ad-hoc manner, but YOLO
-  renderIndexHtml(spaceServer: SpaceServer) {
+  async renderHtmlPage(spaceServer: SpaceServer, pageName: string) {
+    console.log("Server side rendering", pageName);
+    let html = "";
+    try {
+      const { data } = await spaceServer.spacePrimitives.readFile(
+        `${pageName}.md`,
+      );
+      const text = new TextDecoder().decode(data);
+      const tree = parse(extendedMarkdownLanguage, text);
+      html = renderMarkdownToHtml(tree);
+    } catch (e: any) {
+      if (e.message !== "Not found") {
+        console.error("Error server-side rendering page", e);
+      }
+    }
     return this.clientAssetBundle.readTextFileSync(".client/index.html")
-      .replaceAll(
+      .replace(
         "{{SPACE_PATH}}",
         spaceServer.pagesPath.replaceAll("\\", "\\\\"),
-        // );
-      ).replaceAll(
+      )
+      .replace(
+        "{{TITLE}}",
+        pageName,
+      ).replace(
         "{{SYNC_ONLY}}",
         spaceServer.syncOnly ? "true" : "false",
-      ).replaceAll(
+      ).replace(
         "{{READ_ONLY}}",
         spaceServer.readOnly ? "true" : "false",
-      ).replaceAll(
+      ).replace(
+        "{{CONTENT}}",
+        html,
+      ).replace(
         "{{CLIENT_ENCRYPTION}}",
         spaceServer.clientEncryption ? "true" : "false",
       );
@@ -135,7 +158,9 @@ export class HttpServer {
     // Fallback, serve the UI index.html
     this.app.use("*", async (c) => {
       const spaceServer = await this.ensureSpaceServer(c.req);
-      return c.html(this.renderIndexHtml(spaceServer), 200, {
+      const url = new URL(c.req.url);
+      const pageName = decodeURI(url.pathname.slice(1));
+      return c.html(await this.renderHtmlPage(spaceServer, pageName), 200, {
         "Cache-Control": "no-cache",
       });
     });
@@ -175,9 +200,16 @@ export class HttpServer {
       ) {
         // Serve the UI (index.html)
         // Note: we're explicitly not setting Last-Modified and If-Modified-Since header here because this page is dynamic
-        return c.html(this.renderIndexHtml(spaceServer), 200, {
-          "Cache-Control": "no-cache",
-        });
+        return c.html(
+          await this.renderHtmlPage(
+            spaceServer,
+            spaceServer.settings?.indexPage!,
+          ),
+          200,
+          {
+            "Cache-Control": "no-cache",
+          },
+        );
       }
       try {
         const assetName = url.pathname.slice(1);
diff --git a/server/instance.ts b/server/instance.ts
index 8bcd633e..9f20d8ea 100644
--- a/server/instance.ts
+++ b/server/instance.ts
@@ -35,7 +35,7 @@ export class SpaceServer {
   authToken?: string;
   hostname: string;
 
-  private settings?: BuiltinSettings;
+  settings?: BuiltinSettings;
   spacePrimitives!: SpacePrimitives;
 
   jwtIssuer: JWTIssuer;
diff --git a/web/editor_ui.tsx b/web/editor_ui.tsx
index 0143da31..742707eb 100644
--- a/web/editor_ui.tsx
+++ b/web/editor_ui.tsx
@@ -309,6 +309,7 @@ export class MainUI {
 
   render(container: Element) {
     // const ViewComponent = this.ui.ViewComponent.bind(this.ui);
+    container.innerHTML = "";
     preactRender(h(this.ViewComponent.bind(this), {}), container);
   }
 }
diff --git a/web/index.html b/web/index.html
index 543595e6..7a866e3d 100644
--- a/web/index.html
+++ b/web/index.html
@@ -10,7 +10,7 @@
   <meta name="theme-color" content="#e1e1e1" media="(prefers-color-scheme: light)">
   <meta name="theme-color" content="#262626" media="(prefers-color-scheme: dark)">
 
-  <title>SilverBullet</title>
+  <title>{{TITLE}}</title>
   <script>
     // Some global variables we need to make this work
     Deno = {
@@ -61,6 +61,16 @@
 
 <body>
   <div id="sb-root">
+
+    <div id="sb-main">
+      <div id="sb-editor">
+        <div class="cm-editor">
+          <div class="cm-content">
+            {{CONTENT}}
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </body>