diff --git a/app/assets/stylesheets/_responsive.sass b/app/assets/stylesheets/_responsive.sass
index 5d8e7c57..b9eaadb9 100644
--- a/app/assets/stylesheets/_responsive.sass
+++ b/app/assets/stylesheets/_responsive.sass
@@ -3,10 +3,20 @@ body.use-responsive-design
         max-width: 100%
         padding-inline: 1rem
         box-sizing: border-box
+        padding-top: 0
+
+    #main-nav
+        display: flex
+        flex-wrap: wrap
+
+    #home-link, #userbar
+        position: static
 
     #home-link
-        margin-left: 1rem
-        padding-inline: 0
+        padding-inline: .5rem
+        margin-inline: -.5rem
+        margin-right: auto
 
     #userbar
-        margin-right: 1rem
+        margin-left: auto
+        text-align: right
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 37d219f5..4fca8fda 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -29,6 +29,26 @@
     = render 'analytics'
   %body{:class => body_class}
     #container
+      %nav#main-nav
+        - if home_link?
+          %a#home-link{:href => root_path}
+            %span= t 'app_name'
+
+        #userbar
+          - if user_signed_in?
+            %span
+              = t '.userbar.greeting', :user_name => current_user.name
+              = userbar_contributions_summary(current_user)
+            = link_to t('.userbar.items'), user_closet_hangers_path(current_user), :id => 'userbar-items-link'
+            = link_to t('.userbar.outfits'), current_user_outfits_path
+            = link_to t('.userbar.settings'), edit_auth_user_path
+            = button_to t('.userbar.logout'), destroy_auth_user_session_path, method: :delete,
+              params: {return_to: request.fullpath}
+          - else
+            = link_to auth_user_sign_in_path_with_return_to,
+              id: 'userbar-log-in', "data-turbo-prefetch": false do
+              %span= t('.userbar.login')
+
       = yield :before_title
       = render 'announcement'
       - if content_for?(:title) && show_title_header?
@@ -41,25 +61,6 @@
       - else
         = yield
 
-      - if home_link?
-        %a#home-link{:href => root_path}
-          %span= t 'app_name'
-
-      #userbar
-        - if user_signed_in?
-          %span
-            = t '.userbar.greeting', :user_name => current_user.name
-            = userbar_contributions_summary(current_user)
-          = link_to t('.userbar.items'), user_closet_hangers_path(current_user), :id => 'userbar-items-link'
-          = link_to t('.userbar.outfits'), current_user_outfits_path
-          = link_to t('.userbar.settings'), edit_auth_user_path
-          = button_to t('.userbar.logout'), destroy_auth_user_session_path, method: :delete,
-            params: {return_to: request.fullpath}
-        - else
-          = link_to auth_user_sign_in_path_with_return_to,
-            id: 'userbar-log-in', "data-turbo-prefetch": false do
-            %span= t('.userbar.login')
-
       #footer
         = form_tag choose_locale_path, :id => 'locale-form' do
           = hidden_field_tag 'return_to', request.fullpath