diff --git a/public/html/part_results.html b/public/html/part_results.html
index 0a282f5..ef36955 100644
--- a/public/html/part_results.html
+++ b/public/html/part_results.html
@@ -1,28 +1,26 @@
-<div class="col-md-9">
-    <table class="table table-striped table-hover" style="table-layout: fixed; word-wrap: break-word;">
-        <thead>
-            <tr class="row">
-                <th class="col-md-12" style='text-align:left;'>Résultats obtenus :</th>
-            </tr>
-        </thead>
-        <tbody id="tableResult">
-            <tr class="row" ng-repeat="result in results">
-                <td>
-                    <h4 class="alert-success col-md-12"><b>{{result.title}}</b>
-                    </h4>
-                    <p style="font-size:X-small;" class="col-md-12">{{result.abstract}}</p>
-                    <div style="text-align:left;" class="label label-default"><b>{{result.corpusName}}</b>
-                    </div>
-                    <div style="text-align:center;" class="col-md-10">
-                        des liens...
-                    </div>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-</div>
-<!-- 
+<table class="table table-striped table-hover" style="table-layout: fixed; word-wrap: break-word;">
+    <thead>
+        <tr class="row">
+            <th class="col-md-12" style='text-align:left;'>Résultats obtenus :</th>
+        </tr>
+    </thead>
+    <tbody id="tableResult">
+        <tr class="row" ng-repeat="result in searchFields.results">
+            <td>
+                <h4 class="alert-success col-md-12"><b>{{result.title}}</b>
+                </h4>
+                <p style="font-size:X-small;" class="col-md-12">{{result.abstract}}</p>
+                <div style="text-align:left;" class="label label-default"><b>{{result.corpusName}}</b>
+                </div>
+                <div style="text-align:center;" class="col-md-10">
+                    des liens...
+                </div>
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<!--  
 <div id="paginRow" class="row hide">
     <ul id="pagination" class="pager">
         <li id="first"><a href="#">&#8676;</a>
@@ -35,9 +33,9 @@
         </li>
     </ul>
 </div> 
--->
+
 
 <div id="pageNumber" class="row hide">
     <span id=currentPage>*</span>/
     <span id=totalPages>*</span>
-</div>
\ No newline at end of file
+</div> -->
\ No newline at end of file
diff --git a/public/html/part_search.html b/public/html/part_search.html
index 49372df..8da9115 100644
--- a/public/html/part_search.html
+++ b/public/html/part_search.html
@@ -1,18 +1,16 @@
-<div class="container">
-    <div id="searchFieldRow" class="row">
-        <form role="form" class="form-inline" id="searchform">
-            <div class="form-group">
-                <div class="input-group">
-                    <input type="text" class="form-control" id="searchField" placeholder="Titre ou mot clef" ng-model="searchField" ng-change="search()">
-                    <span class="input-group-btn">
-                        <button id="searchButton" type="submit" class="btn" data-loading-text='<img src="http://caron.ads.intra.inist.fr:53390/img/loading.gif" class="loading" id="loading"/>'>
-                            <span class="glyphicon glyphicon-search"></span>
-                        </button>
-                    </span>
-                </div>
+<div id="searchFieldRow" class="row">
+    <form role="form" class="form-inline" id="searchform">
+        <div class="form-group">
+            <div class="input-group">
+                <input type="text" class="form-control" id="searchField" placeholder="Titre ou mot clef" ng-model="searchFields.searchField" ng-change="search()">
+                <span class="input-group-btn">
+                    <button id="searchButton" type="submit" class="btn" data-loading-text='<img src="http://caron.ads.intra.inist.fr:53390/img/loading.gif" class="loading" id="loading"/>'>
+                        <span class="glyphicon glyphicon-search"></span>
+                    </button>
+                </span>
             </div>
-        </form>
-    </div>
+        </div>
+    </form>
 </div>
 
 <!-- <div class="row">
diff --git a/public/index.html b/public/index.html
index 054fe0e..689a9a8 100644
--- a/public/index.html
+++ b/public/index.html
@@ -11,8 +11,14 @@
     <div ng-include="'./html/part_search.html'"></div>
     <div ng-include="'./html/part_results.html'"></div>
     <div ng-include="'./html/part_facets.html'"></div>
+
+    <div id="istex-widget-search"></div>
+    <div id="istex-widget-facets"></div>    
+    <div id="istex-widget-results"></div>
+
 </body>
 
+<script src="js/istex-widget.js" type="text/javascript"></script>
 <script type="text/javascript" src="js/vendor/less-1.6.3.min.js"></script>
 <script src="js/vendor/modernizr-2.6.2.min.js"></script>
 <script src="js/vendor/jquery-1.10.2.min.js" type="text/javascript"></script>
diff --git a/public/js/app.js b/public/js/app.js
index d85e361..a19b30e 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -1,15 +1,21 @@
 'use strict';
 
-angular.module('istex-widget', []).controller('istexWidgetCtrl', function($scope) {
-    $scope.searchField = "";
-    $scope.results = [];
-    $scope.facets = [];
+var searchFieldsService = function() {
+    var searchFields = {
+        searchField: "",
+        results: [],
+        facets: []
+    };
+    return searchFields;
+};
 
+angular.module('istex-widget', []).controller('istexWidgetCtrl', function($scope, searchFields) {
+    $scope.searchFields = searchFields;
     $scope.search = function() {
-        var query = "document/?q=";
-        var fields = [];
 
-        query += this.searchField;
+        var query = "document/?q=";
+
+        query += $scope.searchFields.searchField;
         query += "&size=10";
         query += "&from=0";
         query += "&output=*";
@@ -21,12 +27,12 @@
             jsonp: true,
             crossDomain: true,
             success: function(data) {
-            	$scope.results = data.hits;
+                $scope.searchFields.results = data.hits;
                 $("button").button('reset');
                 $("#result").css("opacity", 1);
             },
-            error: function(){
-            	console.log("Une erreur est survenue!!!!");
+            error: function() {
+                console.log("Une erreur est survenue!!!!");
             }
         };
 
@@ -34,7 +40,12 @@
 
         $("#result").removeClass('hide');
         $("#paginRow").removeClass('hide');
-        $("#pageNumber").removeClass('hide');        
+        $("#pageNumber").removeClass('hide');
 
     };
+}).service('searchFields', searchFieldsService);
+
+
+angular.element(document).ready(function() {
+    angular.bootstrap(document, ['istex-widget']);
 });
\ No newline at end of file
diff --git a/public/js/istex-widget.js b/public/js/istex-widget.js
index dbdfbfe..424d2e6 100644
--- a/public/js/istex-widget.js
+++ b/public/js/istex-widget.js
@@ -4,17 +4,18 @@
 
 IstexWidget.prototype = {
     injectHTML: function() {
+
+        var searchWidget = document.getElementById('istex-widget-search');
+        searchWidget.setAttribute('class', 'container');
+        searchWidget.setAttribute('ng-controller', 'istexWidgetCtrl');
+        var resultsWidget = document.getElementById('istex-widget-results');
+        resultsWidget.setAttribute('ng-controller', 'istexWidgetCtrl');
         addHtml("istex-widget-search", "http://caron.ads.intra.inist.fr:53390/html/part_search.html");
         addHtml("istex-widget-results", "http://caron.ads.intra.inist.fr:53390/html/part_results.html");
         //addHtml("istex-widget-facets", "http://caron.ads.intra.inist.fr:53390/html/part_facets.html");
 
     },
 
-    injectAngularDirectives: function(){
-        document.body.setAttribute("ng-app","istex-widget");
-        document.body.setAttribute("ng-controller","istexWidgetCtrl");
-    },
-
     injectCSS: function() {
         addCSS("//caron.ads.intra.inist.fr:53390/css/part_search.css");
         addCSS("//caron.ads.intra.inist.fr:53390/css/part_results.css");
@@ -67,6 +68,5 @@
 
 var istexWidget = new IstexWidget();
 istexWidget.injectHTML();
-istexWidget.injectAngularDirectives();
 istexWidget.injectCSS();
 istexWidget.injectJS();
\ No newline at end of file
diff --git a/test/testpage.html b/test/testpage.html
index 32eaf7a..4b1afbf 100644
--- a/test/testpage.html
+++ b/test/testpage.html
@@ -8,8 +8,9 @@
 
 <body>
     <div id="istex-widget-search"></div>
-    <div id="istex-widget-facets"></div>
+    <div id="istex-widget-facets"></div>    
     <div id="istex-widget-results"></div>
+
 </body>
 
 <script src="../public/js/istex-widget.js" type="text/javascript"></script>