diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index ca6bf15bc..990a23c76 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -21,7 +21,6 @@
 
     .navbar-collapse.collapse#navbar-collapse
       .navbar-right
-        = render 'shared/global_actions'
         %ul.nav.navbar-nav.navbar-right
           %li.dropdown<
             %a.dropdown-toggle{ 'data-toggle': 'dropdown', href: crops_path }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8fc527ff1..2b1c2e982 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -6,15 +6,23 @@
     = render partial: "layouts/header"
 
     #maincontainer
-      - if content_for?(:title)
-        %h1#title
-          = yield(:title)
-          - if content_for?(:subtitle)
-            %small= yield(:subtitle)
-
-      - if content_for?(:buttonbar)
-        .btn-group.layout-actions= yield(:buttonbar)
       = render partial: "shared/flash_messages", flash: flash
+      .row
+        .col-md-8
+          - if content_for?(:title)
+            %h1#title
+              = yield(:title)
+              - if content_for?(:subtitle)
+                %small= yield(:subtitle)
+
+
+
+        .col-md-4
+          - if content_for?(:buttonbar)
+            .btn-group.layout-actions= yield(:buttonbar)
+          - else
+            = render 'shared/global_actions'
+
       = yield
 
     %footer