diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 1cfc13007..760c89052 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -695,12 +695,23 @@ body > header,
 .subnavigation {
   @include full-width-background;
 
+  @include breakpoint(small only) {
+    @include grid-row-nest;
+  }
+
   @include breakpoint(medium) {
     background: $body-background;
     color: $text;
     padding-bottom: 0;
   }
 
+  .search-form-header {
+
+    @include breakpoint(small only) {
+      padding-left: rem-calc(map-get($grid-column-gutter, small) / 2);
+    }
+  }
+
   ul {
     list-style-type: none;
     margin: 0;
diff --git a/app/components/sdg/goals/help_page_component.html.erb b/app/components/sdg/goals/help_page_component.html.erb
index 43be5ac17..7f167c4a0 100644
--- a/app/components/sdg/goals/help_page_component.html.erb
+++ b/app/components/sdg/goals/help_page_component.html.erb
@@ -4,7 +4,7 @@
   <%= render "shared/canonical", href: sdg_help_url %>
 <% end %>
 
-<section class="row sdg-help-content">
+<section class="sdg-help-content">
   <h1><%= t("sdg.goals.help.title") %></h1>
   <p><%= t("sdg.goals.help.description") %></p>
   <ul class="tabs" id="help_tabs" data-deep-link="true" data-tabs>
diff --git a/app/components/widget/feeds/participation_component.html.erb b/app/components/widget/feeds/participation_component.html.erb
index e20bd6f34..f3314b46f 100644
--- a/app/components/widget/feeds/participation_component.html.erb
+++ b/app/components/widget/feeds/participation_component.html.erb
@@ -1,4 +1,4 @@
-<div class="row margin-bottom feeds-list feeds-participation">
+<div class="margin-bottom feeds-list feeds-participation">
   <% feeds.each do |feed| %>
     <% if feed_proposals?(feed) || feed_debates?(feed) %>
       <%= render Widget::Feeds::FeedComponent.new(feed) %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d11c57fe4..0cb2704e9 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -12,36 +12,33 @@
     </div>
   </div>
 
-  <div class="row">
-    <div class="top-bar">
+  <div class="top-bar">
+    <span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
+      <button type="button" class="menu-button" data-toggle>
+        <span class="menu-icon"></span>
+        <%= t("application.menu") %>
+      </button>
+    </span>
 
-      <span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
-        <button type="button" class="menu-button" data-toggle>
-          <span class="menu-icon"></span>
-          <%= t("application.menu") %>
-        </button>
-      </span>
+    <h1 class="top-bar-title">
+      <%= link_to root_path, accesskey: "0" do %>
+        <%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: setting["org_name"]) %>
+      <% end %>
+    </h1>
 
-      <h1 class="top-bar-title">
-        <%= link_to root_path, accesskey: "0" do %>
-          <%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: setting["org_name"]) %>
-        <% end %>
-      </h1>
+    <div id="responsive-menu">
+      <div class="top-bar-right">
+        <ul class="menu" data-responsive-menu="medium-dropdown">
+          <%= render "shared/admin_login_items" %>
+          <%= render "layouts/notification_item" %>
+          <%= render "devise/menu/login_items" %>
+        </ul>
 
-      <div id="responsive-menu">
-        <div class="top-bar-right">
-          <ul class="menu" data-responsive-menu="medium-dropdown">
-            <%= render "shared/admin_login_items" %>
-            <%= render "layouts/notification_item" %>
-            <%= render "devise/menu/login_items" %>
-          </ul>
-
-          <div class="show-for-small-only">
-            <div class="subnavigation row">
-              <%= render "shared/subnavigation" %>
-              <div class="small-12 column">
-                <%= render "shared/top_links" %>
-              </div>
+        <div class="show-for-small-only">
+          <div class="subnavigation row">
+            <%= render "shared/subnavigation" %>
+            <div class="small-12 column">
+              <%= render "shared/top_links" %>
             </div>
           </div>
         </div>