diff --git a/app/assets/stylesheets/objects/_search-result.scss b/app/assets/stylesheets/objects/_search-result.scss
index 29f6632..dafa78d 100644
--- a/app/assets/stylesheets/objects/_search-result.scss
+++ b/app/assets/stylesheets/objects/_search-result.scss
@@ -1,3 +1,4 @@
 .search-result {
   border-bottom: 1px solid $table-border-color;
+  padding-bottom: 0.25em;
 }
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index 776e58f..1fa4cba 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -8,17 +8,13 @@ head
 
 body
   .row
-    - flash.each do |name, msg|
-      = content_tag :div, msg, class: name
-  .row
-    .large-8.columns
-      h1#title
-       = link_to 'Stadtratmonitor Leipzig', root_path
-    .large-4.columns
-      ul.inline-list.right
-        li = render 'login_button'
-  .row
-    = yield
+    .small-12.columns
+      .clearfix
+        .right = render 'login_button'
+      h1#title = link_to 'Stadtratmonitor Leipzig', root_path
+      - flash.each do |name, msg|
+        = content_tag :div, msg, class: name
+      = yield
 
   script src="https://login.persona.org/include.js"
   = javascript_include_tag 'application', 'data-turbolinks-track' => true
diff --git a/app/views/search/index.html.slim b/app/views/search/index.html.slim
index 51c71a1..9b44600 100644
--- a/app/views/search/index.html.slim
+++ b/app/views/search/index.html.slim
@@ -1,21 +1,22 @@
-= form_tag(search_path, method: :get)
-  = text_field_tag(:q, params[:q], placeholder: 'Suche…')
+div
+  = form_tag(search_path, method: :get)
+    = text_field_tag(:q, params[:q], placeholder: 'Suche…')
 
-.row
+.clearfix
   - if @result
-    .small-9.columns
+    .left
       | #{@result['hits']['total']} Treffer
-    .small-3.columns
-      button.button.right TODO: Suche Abbonieren
-
-- if @result
-  ul.no-bullet
-    - @result['hits']['hits'].each do |doc|
-      li.search-result
-        small = doc['_source']['paperType']
-        '
-        small = doc['_source']['originator'].join(', ')
-        '
-        small = doc['_source']['publishedDate']
-        = link_to "https://ratsinfo.leipzig.de/bi/#{doc['_source']['mainFile']}", target: '_blank' do
-          div = doc['_source']['name']
+    .right
+      button.button. TODO: Suche Abbonieren
+div
+  - if @result
+    ul.no-bullet
+      - @result['hits']['hits'].each do |doc|
+        li.search-result
+          small = doc['_source']['paperType']
+          '
+          small = doc['_source']['originator'].join(', ')
+          '
+          small = doc['_source']['publishedDate']
+          = link_to "https://ratsinfo.leipzig.de/bi/#{doc['_source']['mainFile']}", target: '_blank' do
+            div = doc['_source']['name']