diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss
index 7536a00..86ddf4b 100644
--- a/web/themes/custom/geofresco/src/global/_elements.scss
+++ b/web/themes/custom/geofresco/src/global/_elements.scss
@@ -2,7 +2,7 @@
 // Extend or override Bulma's elements ../../node_modules/bulma/sass/elements
 
 
-.geo-title {
+.site-title {
   display: inline-block;
   width: 4.5em;
   font-size: 37px;
diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss
index 3fdd6ca..d46bb18 100644
--- a/web/themes/custom/geofresco/src/global/_layout.scss
+++ b/web/themes/custom/geofresco/src/global/_layout.scss
@@ -1,9 +1,2 @@
 @charset "UTF-8";
 // Extend or override Bulma's layouts ../../node_modules/bulma/sass/layout
-
-// Hiding or making the top empty have no padding screws
-// up the layout and i have no idea why, but cut the
-// padding in half and it comes out perfect. *shrug*
-.empty-top {
-  padding: 0.375rem;
-}
diff --git a/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig b/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig
index 56d446d..4b3cf97 100644
--- a/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig
+++ b/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig
@@ -1,4 +1,3 @@
-{% extends "block.html.twig" %}
 {#
 /**
  * @file
@@ -15,16 +14,18 @@
  * @ingroup themeable
  */
 #}
-{% block content %}
-  {% if site_logo %}
-    <figure class="image is-pulled-left">
-      <a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
-        <img src="{{ site_logo }}" alt="{{ site_name }} Home" />
-      </a>
-    </figure>
-  {% endif %}
-  <a class="geo-title title is-3" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
+{% if site_logo %}
+<div class="column is-narrow logo">
+  <figure class="image is-pulled-left">
+    <a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
+      <img src="{{ site_logo }}" alt="{{ site_name }} Home" />
+    </a>
+  </figure>
+</div>
+{% endif %}
+<div class="column is-narrow sitename">
+  <a class="site-title title is-3" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
     <span class="green">Grassroots
       Economic</span>
     <span class="yellow">Organizing</span></a>
-{% endblock content %}
+</div>
diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig
index ff2c2d6..c42a93e 100644
--- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig
+++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig
@@ -16,27 +16,42 @@
   %}
 {% endif %}
 {% block navbar %}
-{# Add a new region #}
-{% if page.header_user or page.header_search %}
-<div class="container">
-  <div class="columns">
-    <div class="column empty-top"></div>
-    {% if page.header_user %}
-    <div class="column user-account-menu">
-    {{ page.header_user }}
-    </div>
-    {% endif %}
-    {% if page.header_search %}
-    <div class="column search-bar is-hidden-mobile">
-      {{ page.header_search }}
-    </div>
-    {% endif %}
-  </div>
-</div>
-{% endif %}
-{{ parent() }}
+{# We put everything in Bulma columns so must do navbar in header block #}
 {% endblock navbar %}
 {% block header %}
+<div class="columns header">
+  {% block navbar_branding %}
+  {{ page.navbar_branding }}
+  {% endblock navbar_branding %}
+  <nav class="column navigation">
+    <div class="columns">
+      {% if page.header_search %}
+      <div class="column search-bar is-hidden-mobile">
+        {{ page.header_search }}
+      </div>
+      {% endif %}
+      {% if page.header_user %}
+      <div class="column user-account-menu">
+        {{ page.header_user }}
+      </div>
+      {% endif %}
+      {% block navbar_social %}
+      {% if page.navbar_social %}
+      <div class="column">
+        {{ page.navbar_social }}
+      </div>
+      {% endif %}
+      {% endblock navbar_social %}
+      {% block primary_menu %}
+      {% if page.primary_menu %}
+      <div class="column">
+        {{ page.primary_menu }}
+      </div>
+      {% endif %}
+      {% endblock primary_menu %}
+    </div>
+  </nav>
+</div>
 <p class="slogan"><strong class="title">{{ site_slogan }}</strong></p>
 {% if not is_front %}
 <section>