diff --git a/dev/demo/all.html b/dev/demo/all.html
index ff77d97..be720b8 100644
--- a/dev/demo/all.html
+++ b/dev/demo/all.html
@@ -72,7 +72,7 @@
     </aside>
 
     <main>
-      <div id="resultinfo">
+      <div id="resultinfo" class="found">
 	<div id="pagination">
 	  <a rel="prev"><span><span>&lt;</span></span></a>
 	  <a rel="self"><span>1</span></a>
diff --git a/dev/scss/base.scss b/dev/scss/base.scss
index 395613f..2fe143d 100644
--- a/dev/scss/base.scss
+++ b/dev/scss/base.scss
@@ -34,7 +34,7 @@
 
 
 a {
-  &:link, &.button {
+  &:link {
     color: $dark-orange;
     text-decoration: none;
     &:hover {
diff --git a/dev/scss/main/resultinfo.scss b/dev/scss/main/resultinfo.scss
index ba3c70a..5abc95e 100644
--- a/dev/scss/main/resultinfo.scss
+++ b/dev/scss/main/resultinfo.scss
@@ -1,6 +1,8 @@
 @charset "utf-8";
 @import "../util";
 
+$border-size : 1px;
+
 #resultinfo {
   clear: both;
   text-align: right;
@@ -12,15 +14,49 @@
     margin: 0;
     text-align: right;
   }
-  div.result.button {
+
+  div.result {
     display: inline-block;
+    margin: 2pt 0 0 2pt;
     > a {
+      display: inline-block;
       cursor:pointer;
       position: relative;
-      margin: 0 2pt;
       > span {
 	@include blind;
       }
+      box-shadow: $choose-box-shadow;
+      @include standard-text-padding;
+      padding-top: 1pt;
+      padding-bottom: 1pt;
+      
+      @include choose-item;
+      border: {
+	top-width: $border-size;
+	bottom-width:  $border-size;
+	top-style: solid;
+	bottom-style: solid;
+      }
+      &:hover {
+	@include choose-hover;
+      }
+    }
+
+    > a:last-child {
+      border: {
+	top-right-radius: $standard-border-radius;
+	bottom-right-radius: $standard-border-radius;
+	right-width: $border-size;
+	right-style: solid;
+      }
+    }
+    > a:first-child {
+      border: {
+	top-left-radius: $standard-border-radius;
+	bottom-left-radius: $standard-border-radius;
+	left-width: $border-size;
+	left-style: solid;
+      }
     }
     > a::after {
       font-family: 'FontAwesome';
@@ -37,11 +73,28 @@
   }
 }
 
+#resultinfo.found {
+  position: relative;
+  z-index: 20;
+  margin-bottom: 0px;
+  div.result > a {
+    margin-bottom: 0;
+    border-bottom-width: 0;
+    box-shadow: none;
+    &:first-child {
+      border-bottom-left-radius: 0;
+    }
+    &:last-child {
+      border-bottom-right-radius: 0;
+    }
+  }
+}
+
 #total-results {
   color: $total-results;
   font-weight: bold;
 }
-
+/*
 #no-results {
   margin: 0 auto;
   text-align: center;
@@ -55,3 +108,5 @@
     font-weight: bold;
   }
 }
+
+*/
\ No newline at end of file
diff --git a/dev/scss/media.scss b/dev/scss/media.scss
index ef942cd..84d3a56 100644
--- a/dev/scss/media.scss
+++ b/dev/scss/media.scss
@@ -61,6 +61,10 @@
     margin-right: $standard-margin;
   }
 
+  header .button {
+    margin-right: $standard-margin;    
+  }
+
   #search ol {
     > li:target, > li.active {
       > div > div.snippet {
diff --git a/templates/search.html.ep b/templates/search.html.ep
index 4673c0e..27dfa53 100644
--- a/templates/search.html.ep
+++ b/templates/search.html.ep
@@ -1,9 +1,9 @@
 % layout 'main', title => loc('searchtitle', q => search->query, ql => search->query_language);
 
-<div id="resultinfo">
+<div id="resultinfo" <% if (search->results->size) { %> class="found"<%} %>>
   <div id="pagination"><%= pagination(search->start_page, search->total_pages, url_with->query(['p' => '{page}'])) =%></div>
-  <p class="found">\
 % my $found = search->total_results;
+  <p class="found">\
 % if ($found != -1) {
 %   my $found_text = loc('numf', number => $found);
 %   if (search->time_exceeded) {
@@ -11,6 +11,8 @@
 %   };
 <span id="total-results"><%= $found_text %></span> <%= loc('matchCount', found => $found) %>\
 %# <% if (search->benchmark) { %> (~ <%= search->benchmark %>)<% } %>
+% } elsif (search->start_index == 0 && search->results->size == 0) {
+<span id="total-results">0</span> <%= loc('matchCount', found => $found) %>\
 % };
 </p>
 </div>
@@ -24,7 +26,7 @@
 %=    include 'match', match => $_
 %   end
   </ol>
-% } else {
+% } elsif (search->results->size == 0) {
 <p id="no-results"><%== loc 'noMatches', q => search->query %></p>
 % }
 </div>