diff --git a/undercover/static/styles.css b/undercover/static/styles.css
index e03c165..adb50d5 100644
--- a/undercover/static/styles.css
+++ b/undercover/static/styles.css
@@ -182,6 +182,7 @@ div.user form input {
   flex-direction: row;
   justify-content: end;
   align-items: center;
+  font-size: 90%;
 }
 
 dl {
@@ -336,4 +337,9 @@ textarea {
   .login-button {
     padding: 0;
   }
+  .logged-in {
+    position: absolute;
+    top: 0.5em;
+    right: 1em;
+  }
 }
diff --git a/undercover/templates/base.jinja2 b/undercover/templates/base.jinja2
index 04a760e..254a281 100644
--- a/undercover/templates/base.jinja2
+++ b/undercover/templates/base.jinja2
@@ -10,6 +10,14 @@
 </head>
 
 <body>
+{% if username %}
+  <div class="user logged-in">
+      <p style="margin: 0 1em 0 0;">{{ username }}</p>
+      <form action="/logout">
+          <input class="black-white-button" style="margin: 0; padding: 0.4em;" type="submit" value="Logout">
+      </form>
+  </div>
+{% endif %}
 <a href="/" style="text-decoration: none;">
     <h1><span class="logo left">Under</span><span class="logo right">Cover</span></h1>
 </a>
diff --git a/undercover/templates/writing.jinja2 b/undercover/templates/writing.jinja2
index efae5c7..a2d94a5 100644
--- a/undercover/templates/writing.jinja2
+++ b/undercover/templates/writing.jinja2
@@ -38,14 +38,7 @@
 {% endblock head %}
 
 {% block content %}
-  {% if username %}
-    <div class="user logged-in">
-      <p style="margin: 0 1em 0 0;">{{ username }}</p>
-      <form action="/logout">
-        <input class="black-white-button" style="margin: 0; padding: 0.4em;" type="submit" value="Logout">
-      </form>
-    </div>
-  {% else %}
+  {% if not username %}
       <div class="user logged-out">
         <p>You are working as a <strong>Guest</strong>.</p>
         <form action="/login" method="post">
