diff --git a/front/app/scripts/dirPagination.js b/front/app/scripts/dirPagination.js
diff --git a/front/app/scripts/services.js b/front/app/scripts/services.js
@@ -1,8 +1,6 @@
 'use strict';
 
 angular.module('sps')
-    .constant("httpBaseUrl","http://localhost:80/")
-    .constant("wsBaseUrl","ws://localhost:4000/party")
     .factory('songFactory',['$http', 'httpBaseUrl', function($http,httpBaseUrl) {
         var songfac = {};
         var inGroup = false;

diff --git a/front/app/search.html b/front/app/search.html
@@ -1,14 +1,28 @@
-<div class="panel panel-default" ng-controller="SearchController">
-    <input ng-model="searchText" class="form-control">
-    <div ng-show="searchText">
-        <a href="#/showsong/{{song.id}}" class="list-group-item" ng-controller="GroupController" ng-repeat="song in songsInfo | filter:searchText">
-            <div class="col-xs-9">
-                <big>{{song.author}} - {{song.title}} </big>
-            </div>
-            <div class="col-xs-3 text-align-right">
-                <button class="{{isProposed(song.id) ? 'btn btn-info pull-right disabled ' : 'btn btn-info pull-right'}}">Propose</button>
-            </div>
-            <div class="clearfix"></div>
-        </a>
+<div ng-controller="SearchController">
+    <div ng-show="found">
+        <div class="panel panel-default">
+            <table class="table table-responsive table-hover table-striped">
+                <tbody>
+                    <tr dir-paginate="song in songs| itemsPerPage: 10" total-items="totalItems">
+                        <td>
+                            <a href="#/songs/{{song.id}}">{{song.artist}} - {{song.title}}</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <dir-pagination-controls boundary-links="true"
+            on-page-change="searcher(newPageNumber)" 
+            template-url="./pagination-panel.html" 
+            src="./pagination-panel.html">
+        </dir-pagination-controls>
+    </div>
+    <div ng-hide="found">
+        <div class="alert alert-dismissible alert-warning">
+          <button type="button" class="close" data-dismiss="alert">×</button>
+          <h4>Nothing found</h4>
+
+          <p>Try again with a different query</p>
+        </div>
     </div>
 </div>
diff --git a/front/app/styles/master.css b/front/app/styles/master.css
@@ -13,7 +13,7 @@ p {
     text-align: center;
 }
 .container-padding {
-    padding-top: 70px;
+    padding-top: 30px;
 }
 .search-limiter {
     max-height: 300px;

diff --git a/front/dist/index.html b/front/dist/index.html
diff --git a/front/dist/scripts/main-85d6ba3708.js b/front/dist/scripts/main-85d6ba3708.js
diff --git a/front/dist/search.html b/front/dist/search.html
@@ -1,14 +1,28 @@
-<div class="panel panel-default" ng-controller="SearchController">
-    <input ng-model="searchText" class="form-control">
-    <div ng-show="searchText">
-        <a href="#/showsong/{{song.id}}" class="list-group-item" ng-controller="GroupController" ng-repeat="song in songsInfo | filter:searchText">
-            <div class="col-xs-9">
-                <big>{{song.author}} - {{song.title}} </big>
-            </div>
-            <div class="col-xs-3 text-align-right">
-                <button class="{{isProposed(song.id) ? 'btn btn-info pull-right disabled ' : 'btn btn-info pull-right'}}">Propose</button>
-            </div>
-            <div class="clearfix"></div>
-        </a>
+<div ng-controller="SearchController">
+    <div ng-show="found">
+        <div class="panel panel-default">
+            <table class="table table-responsive table-hover table-striped">
+                <tbody>
+                    <tr dir-paginate="song in songs| itemsPerPage: 10" total-items="totalItems">
+                        <td>
+                            <a href="#/songs/{{song.id}}">{{song.artist}} - {{song.title}}</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <dir-pagination-controls boundary-links="true"
+            on-page-change="searcher(newPageNumber)" 
+            template-url="./pagination-panel.html" 
+            src="./pagination-panel.html">
+        </dir-pagination-controls>
+    </div>
+    <div ng-hide="found">
+        <div class="alert alert-dismissible alert-warning">
+          <button type="button" class="close" data-dismiss="alert">×</button>
+          <h4>Nothing found</h4>
+
+          <p>Try again with a different query</p>
+        </div>
     </div>
 </div>
diff --git a/front/dist/styles/main-fc6f9f3bbd.css b/front/dist/styles/main-fc6f9f3bbd.css