diff --git a/agaric/templates/layout/page.html.twig b/agaric/templates/layout/page.html.twig
index 43003ce..a46afbf 100644
--- a/agaric/templates/layout/page.html.twig
+++ b/agaric/templates/layout/page.html.twig
@@ -42,26 +42,22 @@
 
 {% block header %}
 <section{{ header_section_attributes }}>
-  {% block header_and_search %}
-  {% if page.header or page.header_search %}
-  {# Header hero region + search #}
-  <div class="hero-body is-primary">
+  {% block header_title %}
+  {% if page.header %}
+  {# Header hero region #}
+  <div class="hero-body">
     <div class="container">
-      <div class="columns is-vcentered">
-        <div class="column">
+      {% if is_front and site_slogan %}
+        <h1 class="title is-2">{{ site_slogan }}</h1>
+      {% elseif %}
+        <div class="titlebar">
           {{ page.header }}
-          {% if is_front and site_slogan %}
-            <h1 class="title">{{ site_slogan }}</h1>
-          {% endif %}
         </div>
-        <div class="column is-narrow">
-          {{ page.header_search }}
-        </div>
-      </div>
+      {% endif %}
     </div>
   </div>
   {% endif %}
-  {% endblock header_and_search %}
+  {% endblock header_title %}
   {% block tabs %}
   {# Drupal tabs #}
   {% if page.header_tabs %}