diff --git a/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java b/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java
index d3f019918649a0ef64f0eecf28797c4bf98651a1..2ebcb2677c4f8936648c1ef218675edadb97837f 100644
--- a/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java
+++ b/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java
@@ -137,7 +137,7 @@ public class SearchResource {
 			articles.add(article);
 		}
 
-		res.addHeader("total", articles.size());
+		res.addHeader("total", hits.getTotalHits());
 
 		return res.ok(articles);
 	}
diff --git a/vipra-ui/app/html/index.html b/vipra-ui/app/html/index.html
index a9a87355a852b6a78acd20f20b4d0fc874a75b58..ca74dd38210c07cf7a56921ec65c8b63933bab31 100644
--- a/vipra-ui/app/html/index.html
+++ b/vipra-ui/app/html/index.html
@@ -76,19 +76,20 @@
         <h4>No Results</h4>
       </div>
       <div class="col-md-12" ng-show="searchResults.length > 0" ng-cloak>
-        <h4>Results</h4>
+        <h4>Results <small class="text-muted" ng-bind-template="({{totalResults}} in total)"></small></h4>
+        <p>Showing results 1 to <span ng-bind="searchResults.length"></span></p>
         <ul class="list-unstyled search-results">
           <li class="search-result" ng-repeat="article in searchResults track by article.id">
-            <a ui-sref="articles.show({id:article.id})" ng-bind="article.title"></a>
-            <p>
-              <span class="text" ng-bind="article.text"></span>
+            <article-link details="false" article="article"/>
+            <p class="text-justify">
+              <span class="text" style="text-align:justify" ng-bind="article.text"></span>
               <br>
-              <small class="text-muted" ng-bind-template="{{::article.meta.score.toFixed(3)}} &ndash; {{::Vipra.formatDate(article.date)}}" ng-attr-title="Score: {{::article.meta.score.toFixed(3)}}, Date: {{::Vipra.formatDate(article.date)}}"></small>
+              <small class="text-muted" ng-bind-template="Score: {{::article.meta.score.toFixed(3)}}" ng-attr-title="Score: {{::article.meta.score.toFixed(3)}}"></small>
             </p>
           </li>
         </ul>
         <div class="text-center" ng-hide="noMoreResults">
-          <button class="btn btn-default" ng-click="loadMoreResults()" analytics-on analytics-event="Index Search Results (More)" analytics-category="Index actions">Load more</button>
+          <button class="btn btn-default" ng-click="loadMoreResults()" style="margin-bottom:70px" analytics-on analytics-event="Index Search Results (More)" analytics-category="Index actions">Load more</button>
         </div>
       </div>
     </div>
diff --git a/vipra-ui/app/js/controllers.js b/vipra-ui/app/js/controllers.js
index 50c43a34748e78317ef38b6f7b833e1ea51c06bd..ac05975b0853ea8549580dbb6b9d892e990cc104 100644
--- a/vipra-ui/app/js/controllers.js
+++ b/vipra-ui/app/js/controllers.js
@@ -283,7 +283,7 @@
           $scope.searchResults.push.apply($scope.searchResults, data);
           $scope.skip += $scope.searchResultsStep;
           $scope.totalResults = headers("V-Total");
-          $scope.noMoreResults = data.length < $scope.searchResultsStep;
+          $scope.noMoreResults = $scope.skip >= $scope.totalResults;
         }, function() {
           $scope.searching = false;
         });