diff --git a/members_lumbung_space/templates/admin.html b/members_lumbung_space/templates/admin.html
index e620acb..899368d 100644
--- a/members_lumbung_space/templates/admin.html
+++ b/members_lumbung_space/templates/admin.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% include 'nav.html' %}
+
 {% block content %}
 <div class="logo">
   <img src="{{ url_for('static', path='svg/lumbung_space_logo.svg') }}" alt="lumbung.space logo">
diff --git a/members_lumbung_space/templates/base.html b/members_lumbung_space/templates/base.html
index f092c0c..df13671 100644
--- a/members_lumbung_space/templates/base.html
+++ b/members_lumbung_space/templates/base.html
@@ -16,23 +16,6 @@
   </head>
   <body>
   <div class="container">
-    <nav class="navbar" role="navigation" aria-label="main navigation">
-      <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar">
-        <span aria-hidden="true"></span>
-        <span aria-hidden="true"></span>
-        <span aria-hidden="true"></span>
-      </a>
-      <div id="navbar" class="navbar-menu">
-        <div class="navbar-end">
-          <div class="navbar-item">
-            <a href="/"><strong>services</strong></a>
-          </div>
-          <div class="navbar-item">
-            <a href="/invites"><strong>invites</strong></a>
-          </div>
-        </div>
-      </div>
-    </nav>
     <div id="content">{% block content %}{% endblock %}</div>
   </div>
   <footer class="footer">
diff --git a/members_lumbung_space/templates/invalid.html b/members_lumbung_space/templates/invalid.html
index 987489b..5873f19 100644
--- a/members_lumbung_space/templates/invalid.html
+++ b/members_lumbung_space/templates/invalid.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% include 'nav.html' %}
+
 {% block content %}
   <p>Woops, something went wrong: {{ message }}</p>
   <p>Please contact your system adminstrator if this is unexpected.</p>
diff --git a/members_lumbung_space/templates/invites.html b/members_lumbung_space/templates/invites.html
index bfba437..e7dc42e 100644
--- a/members_lumbung_space/templates/invites.html
+++ b/members_lumbung_space/templates/invites.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% include 'nav.html' %}
+
 {% block content %}
 <div class="logo">
   <img src="{{ url_for('static', path='svg/lumbung_space_logo.svg') }}" alt="lumbung.space logo">
diff --git a/members_lumbung_space/templates/nav.html b/members_lumbung_space/templates/nav.html
new file mode 100644
index 0000000..eb6a5af
--- /dev/null
+++ b/members_lumbung_space/templates/nav.html
@@ -0,0 +1,19 @@
+{% block nav %}
+<nav class="navbar" role="navigation" aria-label="main navigation">
+  <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar">
+    <span aria-hidden="true"></span>
+    <span aria-hidden="true"></span>
+    <span aria-hidden="true"></span>
+  </a>
+  <div id="navbar" class="navbar-menu">
+    <div class="navbar-end">
+      <div class="navbar-item">
+        <a href="/"><strong>services</strong></a>
+      </div>
+      <div class="navbar-item">
+        <a href="/invites"><strong>invites</strong></a>
+      </div>
+    </div>
+  </div>
+</nav>
+{% endblock %}
diff --git a/members_lumbung_space/templates/submit.html b/members_lumbung_space/templates/submit.html
index 2317226..de6489d 100644
--- a/members_lumbung_space/templates/submit.html
+++ b/members_lumbung_space/templates/submit.html
@@ -4,7 +4,9 @@
   <div id="welcome-message">
     <p>Welcome, Lumbungers!</p>
 
-    <img src="/static/logotype-01.png" />
+    <div class="logo">
+      <img src="{{ url_for('static', path='svg/lumbung_space_logo.svg') }}" alt="lumbung.space logo">
+    </div>
 
     <p>Thanks for joining {{ first_name }}!</p>
 
