diff --git a/tildes/scss/_layout.scss b/tildes/scss/_layout.scss
index 73188ad..eff024f 100644
--- a/tildes/scss/_layout.scss
+++ b/tildes/scss/_layout.scss
@@ -57,9 +57,6 @@ body {
 #site-header {
   grid-area: header;
 
-  display: flex;
-  align-items: center;
-
   max-width: 100vw;
 
   padding: 0.2rem;
diff --git a/tildes/scss/modules/_site-header.scss b/tildes/scss/modules/_site-header.scss
index e9e3a50..b8b86cd 100644
--- a/tildes/scss/modules/_site-header.scss
+++ b/tildes/scss/modules/_site-header.scss
@@ -14,33 +14,28 @@
       display: flex;
     }
 
-    margin-left: auto;
+    float: right;
+    margin-top: 0.2rem;
   }
 
   .toast {
+    display: inline-block;
     width: auto;
-    margin: 0 0.2rem 0 -1rem;
+    margin: 0.2rem 0.2rem 0 0;
     padding: 0.2rem 0.4rem;
-
-    @media (min-width: $size-xs) {
-      margin-left: 0;
-      text-indent: -1rem;
-      padding-left: 1.4rem;
-
-      a {
-        white-space: nowrap;
-      }
-    }
+    vertical-align: top;
   }
 }
 
 .site-header-context {
+  vertical-align: text-bottom;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
 .site-header-logo {
+  display: inline-block;
   background-image: url("/favicon-32x32.png");
   background-repeat: no-repeat;
 
@@ -52,7 +47,10 @@
     image-rendering: crisp-edges;
   }
 
-  margin-right: 1rem;
+  @media (min-width: $size-xs) {
+    margin-right: 1rem;
+  }
+
   padding-left: 40px;
   padding-right: 8px;
   line-height: 32px;
@@ -72,8 +70,8 @@
     display: none;
   }
 
-  margin-left: auto;
-  flex-shrink: 0;
+  float: right;
+  margin-top: 0.2rem;
 
   &.badge {
     margin-right: 0.6rem;
diff --git a/tildes/tildes/templates/base.jinja2 b/tildes/tildes/templates/base.jinja2
index a401139..7995297 100644
--- a/tildes/tildes/templates/base.jinja2
+++ b/tildes/tildes/templates/base.jinja2
@@ -68,10 +68,6 @@
 
 <header id="site-header" data-js-hide-sidebar-if-open>
   <a class="site-header-logo" href="/">Tildes</a>
-  {% block header_context_link %}{% endblock %}
-
-  {{ logged_in_user_info() }}
-
   <button
     class="btn btn-sm btn-link site-header-sidebar-button
     {% if request.user and request.user.num_unread_total > 0 %}
@@ -84,6 +80,9 @@
     {% endif %}
   >Sidebar</button>
 
+  {% block header_context_link %}{% endblock %}
+
+  {{ logged_in_user_info() }}
 </header>
 
 <main class="{% block main_classes %}{% endblock %}" data-js-hide-sidebar-if-open>