diff --git a/web-app/src/lib/components/WebsiteEditor.svelte b/web-app/src/lib/components/WebsiteEditor.svelte
index 639cb06..267831d 100644
--- a/web-app/src/lib/components/WebsiteEditor.svelte
+++ b/web-app/src/lib/components/WebsiteEditor.svelte
@@ -65,7 +65,10 @@
   {#if fullPreview}
     <iframe src={previewContent.value} title="Preview"></iframe>
   {:else}
-    {@html md(previewContent.value, Object.keys($page.params).length > 1 ? true : false)}
+    {@html md(
+      previewContent.value || "Write some markdown content to see a live preview here",
+      Object.keys($page.params).length > 1 ? true : false
+    )}
   {/if}
 </div>
 
diff --git a/web-app/src/routes/(authenticated)/account/+page.svelte b/web-app/src/routes/(authenticated)/account/+page.svelte
index c465b2e..d089728 100644
--- a/web-app/src/routes/(authenticated)/account/+page.svelte
+++ b/web-app/src/routes/(authenticated)/account/+page.svelte
@@ -66,3 +66,9 @@
     </form>
   </Modal>
 </section>
+
+<style>
+  form[action="?/logout"] > button {
+    max-inline-size: fit-content;
+  }
+</style>
diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.server.ts b/web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.server.ts
index c574301..0854363 100644
--- a/web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.server.ts
+++ b/web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.server.ts
@@ -41,6 +41,10 @@ export const actions: Actions = {
       )
     ).data;
 
+    if (!user) {
+      return { success: false, message: "Specified user could not be found" };
+    }
+
     return await apiRequest(fetch, `${API_BASE_PREFIX}/collab`, "POST", {
       body: {
         website_id: params.websiteId,
diff --git a/web-app/src/routes/+layout.svelte b/web-app/src/routes/+layout.svelte
index 0f96940..7f3e807 100644
--- a/web-app/src/routes/+layout.svelte
+++ b/web-app/src/routes/+layout.svelte
@@ -42,12 +42,12 @@
 </svelte:head>
 
 <nav>
-  <img src="/favicon.svg" width="24" height="24" alt="" />
+  <div class="logo-wrapper">
+    <img src="/favicon.svg" width="24" height="24" alt="" />
+    <a href="/">archtika</a>
+  </div>
   <ul class="link-wrapper unpadded">
     {#if data.user}
-      <li>
-        <a href="/">Dashboard</a>
-      </li>
       <li>
         <a href="/account">Account</a>
       </li>
@@ -100,6 +100,12 @@
     justify-content: space-between;
   }
 
+  nav > .logo-wrapper {
+    display: flex;
+    align-items: center;
+    gap: var(--space-2xs);
+  }
+
   nav > .link-wrapper {
     display: flex;
     align-items: center;