diff --git a/src/Foundation.hs b/src/Foundation.hs
index f9d882a..a7fd3db 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -97,8 +97,7 @@ instance Yesod App where
         -- Get the breadcrumbs, as defined in the YesodBreadcrumbs instance.
         (title, parents) <- breadcrumbs
 
-        let navbarLeftMenuItems = leftMenuItems muser
-            navbarRightMenuItems = rightMenuItems muser
+        let navbars = [leftMenuItems, rightMenuItems] <*> [muser]
 
         -- We break up the default layout into two components:
         -- default-layout is the contents of the body tag, and
diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius
index d7e957f..5a72db5 100644
--- a/templates/default-layout.cassius
+++ b/templates/default-layout.cassius
@@ -15,6 +15,8 @@ body
     padding-bottom: 1em
     display: flex
     justify-content: space-evenly
+#navbar
+  justify-content: space-between
 .breadcrumb
   background-color: #404449
   border-radius: 0
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 22c5b9a..a97bd3d 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -6,15 +6,12 @@
             <span .navbar-toggler-icon>
 
         <div #navbar .collapse.navbar-collapse>
-            <ul .navbar-nav.mr-auto>
-                $forall MenuItem label route <- navbarLeftMenuItems
-                    <li .nav-item :Just route == mcurrentRoute:.active>
-                        <a .nav-link href=@{route}>#{label}
+            $forall bar <- navbars
+                <ul .navbar-nav>
+                    $forall MenuItem label route <- bar
+                        <li .nav-item :Just route == mcurrentRoute:.active>
+                            <a .nav-link href=@{route}>#{label}
 
-            <ul .navbar-nav>
-                $forall MenuItem label route <- navbarRightMenuItems
-                    <li .nav-item :Just route == mcurrentRoute:.active>
-                        <a .nav-link href=@{route}>#{label}
     $if not $ null parents
         <ul .breadcrumb>
             $forall bc <- parents