diff --git a/dist/index.css b/dist/index.css
index e7c0bece..39703e0b 100644
--- a/dist/index.css
+++ b/dist/index.css
@@ -102,8 +102,29 @@ main {
   right: 0px;
   bottom: 0px;
   background-color: var(--background);
+  z-index: 2;
 }
-#chat-page {
+#chat-page > div {
+  padding: 0px;
+  overflow: hidden;
+  display: grid;
+  grid-template-columns: var(--control-height) 1fr;
+  grid-template-rows: var(--control-height) 1fr;
+  border-top: 1px solid var(--border);
+}
+#chat-page #ribbon {
+  grid-column: 1 / 2;
+  grid-row: 1 / 3;
+  border-right: 1px solid var(--border);
+}
+#chat-page #toolbar {
+  grid-column: 2 / 3;
+  grid-row: 1 / 2;
+  border-bottom: 1px solid var(--border);
+}
+#chat-page #main {
+  grid-column: 2 / 3;
+  grid-row: 2 / 3;
 }
 
 /* src/View/homePage.css */
diff --git a/dist/index.js b/dist/index.js
index 9cd0c263..1aa1f14c 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -584,7 +584,7 @@
 
   // src/View/chatPage.tsx
   function ChatPage(chatViewModel) {
-    return /* @__PURE__ */ createElement("article", { id: "chat-page" }, /* @__PURE__ */ createElement("header", null, /* @__PURE__ */ createElement("span", { "subscribe:innerText": chatViewModel.primaryChannel })), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("div", { class: "ribbon" }), /* @__PURE__ */ createElement("div", { class: "toolbar" }), /* @__PURE__ */ createElement("div", { class: "main" })));
+    return /* @__PURE__ */ createElement("article", { id: "chat-page" }, /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("div", { id: "ribbon" }), /* @__PURE__ */ createElement("div", { id: "toolbar" }), /* @__PURE__ */ createElement("div", { id: "main" })));
   }
 
   // src/View/chatPageWrapper.tsx
diff --git a/src/View/chatPage.css b/src/View/chatPage.css
index e934bae4..f43e1680 100644
--- a/src/View/chatPage.css
+++ b/src/View/chatPage.css
@@ -1,19 +1,48 @@
 #chat-page-wrapper {
-    display: none;
+  display: none;
 }
 
 #chat-page-wrapper[open] {
-    display: flex;
+  display: flex;
 
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    right: 0px;
-    bottom: 0px;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
 
-    background-color: var(--background);
+  background-color: var(--background);
+
+  z-index: 2;
 }
 
-#chat-page {
-    
-}
\ No newline at end of file
+#chat-page > div {
+  padding: 0px;
+
+  overflow: hidden;
+
+  display: grid;
+  grid-template-columns: var(--control-height) 1fr;
+  grid-template-rows: var(--control-height) 1fr;
+
+  border-top: 1px solid var(--border);
+}
+
+#chat-page #ribbon {
+  grid-column: 1 / 2;
+  grid-row: 1 / 3;
+
+  border-right: 1px solid var(--border);
+}
+
+#chat-page #toolbar {
+  grid-column: 2 / 3;
+  grid-row: 1 / 2;
+
+  border-bottom: 1px solid var(--border);
+}
+
+#chat-page #main {
+  grid-column: 2 / 3;
+  grid-row: 2 / 3;
+}
diff --git a/src/View/chatPage.tsx b/src/View/chatPage.tsx
index be81c82c..ffe30780 100644
--- a/src/View/chatPage.tsx
+++ b/src/View/chatPage.tsx
@@ -8,13 +8,10 @@ import { translations } from "./translations";
 export function ChatPage(chatViewModel: ChatViewModel) {
   return (
     <article id="chat-page">
-      <header>
-        <span subscribe:innerText={chatViewModel.primaryChannel}></span>
-      </header>
       <div>
-        <div class="ribbon"></div>
-        <div class="toolbar"></div>
-        <div class="main"></div>
+        <div id="ribbon"></div>
+        <div id="toolbar"></div>
+        <div id="main"></div>
       </div>
     </article>
   );