diff --git a/__snapshots__/navbar--default.png b/__snapshots__/navbar--default.png
index 3ae5af1..77ca76e 100644
Binary files a/__snapshots__/navbar--default.png and b/__snapshots__/navbar--default.png differ
diff --git a/__snapshots__/navbar--logged-in.png b/__snapshots__/navbar--logged-in.png
new file mode 100644
index 0000000..9040bb8
Binary files /dev/null and b/__snapshots__/navbar--logged-in.png differ
diff --git a/__snapshots__/navbar--nip-07-loading.png b/__snapshots__/navbar--nip-07-loading.png
new file mode 100644
index 0000000..f3faedf
Binary files /dev/null and b/__snapshots__/navbar--nip-07-loading.png differ
diff --git a/__snapshots__/navbar.test.js.snap b/__snapshots__/navbar.test.js.snap
index a14465d..d63c371 100644
--- a/__snapshots__/navbar.test.js.snap
+++ b/__snapshots__/navbar.test.js.snap
@@ -21,8 +21,78 @@ exports[`Navbar Default smoke-test 1`] = `
           </h4>
         </div>
         <div class="navbar-end gap-4">
-          <div class="btn normal-case btn-sm btn-ghost">
-            Sign up
+          <div class="h-8 skeleton w-20">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Navbar Logged in smoke-test 1`] = `
+<div class="bg-base-400">
+  <div class="mx-auto lg:container">
+    <div class="px-3">
+      <div class="navbar">
+        <div class="navbar-start">
+        </div>
+        <div class="navbar-center">
+          <h4 class="align-middle text-sm font-mono">
+            <span class="text-primary">
+              git
+            </span>
+            <span class="text-primary">
+              workshop
+            </span>
+            <span class>
+              .net
+            </span>
+          </h4>
+        </div>
+        <div class="navbar-end gap-4">
+          <div class="flex my-2">
+            <div class="avatar flex-none">
+              <div class="w-8 h-8 rounded">
+                <img class="my-0"
+                     src="../test-profile-image.jpg"
+                     alt="DanConwayDev"
+                >
+              </div>
+            </div>
+            <div class="flex-auto pl-3 m-auto">
+              DanConwayDev
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Navbar NIP07 Loading smoke-test 1`] = `
+<div class="bg-base-400">
+  <div class="mx-auto lg:container">
+    <div class="px-3">
+      <div class="navbar">
+        <div class="navbar-start">
+        </div>
+        <div class="navbar-center">
+          <h4 class="align-middle text-sm font-mono">
+            <span class="text-primary">
+              git
+            </span>
+            <span class="text-primary">
+              workshop
+            </span>
+            <span class>
+              .net
+            </span>
+          </h4>
+        </div>
+        <div class="navbar-end gap-4">
+          <div class="h-8 skeleton w-20">
           </div>
         </div>
       </div>
diff --git a/src/lib/components/Navbar.stories.svelte b/src/lib/components/Navbar.stories.svelte
index f8ff29a..e32143d 100644
--- a/src/lib/components/Navbar.stories.svelte
+++ b/src/lib/components/Navbar.stories.svelte
@@ -2,6 +2,7 @@
     import type { Meta } from "@storybook/svelte";
     import Navbar from "$lib/components/Navbar.svelte";
     import { Story, Template } from "@storybook/addon-svelte-csf";
+    import { UserVectors } from "$lib/components/users/vectors";
 
     export const meta: Meta<Navbar> = {
         title: "Navbar",
@@ -16,6 +17,16 @@
 
 <Story name="Default" />
 
-<Story name="NoNIP07" args={{ nip07plugin: false }} />
+<Story name="NIP07 Loading" args={{ nip07_plugin: undefined }} />
 
-<Story name="NIP07Exists" args={{ nip07plugin: true }} />
+<Story name="NoNIP07" args={{ nip07_plugin: false }} />
+
+<Story
+    name="NIP07Exists"
+    args={{ nip07_plugin: true, logged_in_user: undefined }}
+/>
+
+<Story
+    name="Logged in"
+    args={{ nip07_plugin: true, logged_in_user: { ...UserVectors.default } }}
+/>
diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte
index d921b66..c8c9f69 100644
--- a/src/lib/components/Navbar.svelte
+++ b/src/lib/components/Navbar.svelte
@@ -1,15 +1,11 @@
 <script lang="ts">
-  import {
-    checkForNip07Plugin,
-    logged_in_user,
-    login,
-    nip07_plugin,
-  } from "$lib/stores/users";
-  import { onMount } from "svelte";
   import Container from "./Container.svelte";
   import UserHeader from "./users/UserHeader.svelte";
+  import type { User } from "./users/type";
 
-  onMount(checkForNip07Plugin);
+  export let logged_in_user: User | undefined = undefined;
+  export let nip07_plugin: boolean | undefined = undefined;
+  export let login_function: Function = () => {};
 </script>
 
 <div class="bg-base-400">
@@ -24,14 +20,14 @@
         </h4>
       </div>
       <div class="navbar-end gap-4">
-        {#if $logged_in_user}
-          <UserHeader user={$logged_in_user} />
-        {:else if $nip07_plugin === undefined}
+        {#if logged_in_user}
+          <UserHeader user={logged_in_user} />
+        {:else if nip07_plugin === undefined}
           <div class="h-8 skeleton w-20"></div>
-        {:else if $nip07_plugin}
+        {:else if nip07_plugin}
           <button
             on:click={() => {
-              login();
+              login_function();
             }}
             class="btn normal-case btn-sm btn-ghost">Login</button
           >
diff --git a/src/lib/wrappers/Navbar.svelte b/src/lib/wrappers/Navbar.svelte
new file mode 100644
index 0000000..a02667e
--- /dev/null
+++ b/src/lib/wrappers/Navbar.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+    import {
+        checkForNip07Plugin,
+        logged_in_user,
+        login,
+        nip07_plugin,
+    } from "$lib/stores/users";
+    import { onMount } from "svelte";
+    import Navbar from "$lib/components/Navbar.svelte";
+
+    onMount(checkForNip07Plugin);
+</script>
+
+<Navbar
+    logged_in_user={$logged_in_user}
+    nip07_plugin={$nip07_plugin}
+    login_function={login}
+/>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 753dfe1..4c6223e 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import "../app.css";
-  import Navbar from "$lib/components/Navbar.svelte";
+  import Navbar from "$lib/wrappers/Navbar.svelte";
 </script>
 
 <Navbar />