diff --git a/app/js/directives/droitsEligiblesList.js b/app/js/directives/droitsEligiblesList.js
index 991bb3017e..0fcffdaf48 100644
--- a/app/js/directives/droitsEligiblesList.js
+++ b/app/js/directives/droitsEligiblesList.js
@@ -1,23 +1,76 @@
 'use strict';
 
+var SmoothScroll = require('smooth-scroll');
+var scroll = new SmoothScroll();
+
+var mergeDroits = function(prestationsNationales, partenairesLocaux) {
+
+    var droits = _.values(prestationsNationales);
+    _.forEach(partenairesLocaux, function(partenaireLocal) {
+        droits = droits.concat(_.values(partenaireLocal.prestations));
+    });
+
+    droits.sort(function(a, b) {
+        return a.label < b.label ? -1 : 1;
+    });
+
+    return droits;
+};
+
+angular.module('ddsApp').controller('droitsEligiblesListCtrl', function($scope, TrampolineService) {
+
+    $scope.isNumber = _.isNumber;
+    $scope.isString = _.isString;
+    $scope.isBoolean = _.isBoolean;
+
+    $scope.$watch('droits', function(value) {
+        if (value) {
+            var list = mergeDroits(value.prestationsNationales, value.partenairesLocaux);
+            if ($scope.filter) {
+                list = _.filter(list, function(value) {
+
+                    return _.includes($scope.filter, value.id);
+                });
+            }
+            $scope.list = list;
+        }
+    });
+
+    $scope.trampoline = TrampolineService;
+    $scope.isNumber = _.isNumber;
+    $scope.isString = _.isString;
+    $scope.list = [];
+
+    $scope.scrollTo = function(droit, $event) {
+        $event.preventDefault();
+        scroll.animateScroll(document.querySelector('#' + droit.id), $event.target, {
+            updateURL: false,
+            offset: function () {
+                return document.querySelector('header').offsetHeight;
+            }
+        });
+    };
+
+    $scope.scrollToTop = function($event) {
+        $event.preventDefault();
+        scroll.animateScroll(document.querySelector('body'), $event.target, {
+            updateURL: false
+        });
+    };
+
+});
+
 var controllerOptions = function(templateUrl) {
     return function() {
         return {
             restrict: 'E',
             templateUrl: templateUrl,
-            scope: true,
+            scope: {
+                droits: '=',
+                yearMoins2: '=',
+                filter: '=',
+            },
             controller: 'droitsEligiblesListCtrl',
-            // Inject list into scope, filtered by benefits specified via the "filter" attribute
-            link: function ($scope, $element, $attributes) {
-                if ($attributes.hasOwnProperty('filter')) {
-                    var filter = $scope.$eval($attributes.filter);
-                    $scope.list = _.pickBy($scope.$eval($attributes.list), function(value, key) {
-                        return _.includes(filter, key);
-                    });
-                } else {
-                    $scope.list = $scope.$eval($attributes.list);
-                }
-            }
         };
     };
 };
@@ -26,20 +79,22 @@ angular.module('ddsApp')
     .directive('droitEligiblesList', controllerOptions('/partials/droits-eligibles-list.html'));
 
 angular.module('ddsApp')
-    .directive('droitNonEligiblesList', controllerOptions('/partials/droits-non-eligibles-list.html'));
-
-angular.module('ddsApp').controller('droitsEligiblesListCtrl', function($scope, TrampolineService) {
-    $scope.isNumber = _.isNumber;
-    $scope.isString = _.isString;
-    $scope.shouldDisplayYM2Warning = function(droit) {
-        return droit.isBaseRessourcesYearMoins2 && ! $scope.ressourcesYearMoins2Captured && ! _.isString(droit.montant);
-    };
+    .directive('droitEligiblesDetails', controllerOptions('/partials/droits-eligibles-details.html'));
 
-    $scope.trampoline = TrampolineService;
+angular.module('ddsApp')
+    .directive('droitNonEligiblesList', controllerOptions('/partials/droits-non-eligibles-list.html'));
 
-    // ng-class and uib-accordion don't work well together, hence this extra function.
-    // See https://github.com/angular-ui/bootstrap/issues/4172
-    $scope.getAccordionClass = function(droit) {
-        return [$scope.shouldDisplayYM2Warning(droit) ? 'needs-n-2' : '', droit.open ? 'panel-opened': ''].join(' ');
-    };
-});
+angular.module('ddsApp')
+    .directive('droitMontant', function() {
+        return {
+            restrict: 'E',
+            templateUrl: '/partials/droit-montant.html',
+            scope: {
+                droit: '=',
+            },
+            link: function(scope) {
+                scope.isNumber = _.isNumber;
+                scope.isString = _.isString;
+            }
+        };
+    });
diff --git a/app/scripts.js b/app/scripts.js
index a91cd64208..d2fd347825 100644
--- a/app/scripts.js
+++ b/app/scripts.js
@@ -29,7 +29,7 @@ require('./styles/enfants.css');
 require('./styles/foyer/capture-montant-ressource.css');
 require('./styles/foyer/capture-continuation-ressource.css');
 require('./styles/recap-situation.css');
-require('./styles/droits-eligibles-list.css');
+require('./styles/droits-eligibles-list.scss');
 require('./styles/breadcrumb.css');
 
 require('./js/common.js');
diff --git a/app/styles/droits-eligibles-list.css b/app/styles/droits-eligibles-list.css
deleted file mode 100644
index 672268b2eb..0000000000
--- a/app/styles/droits-eligibles-list.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.result .panel-opened .panel-heading {
-  background-color: whitesmoke;
-}
-
-.result .panel-heading {
-  background-color: white;
-  padding: 5px 0;
-}
-
-.result .panel-heading:hover {
-  background-color: #ededed;
-}
-
-.result .panel-heading .montant {
-  font-weight: 600;
-  font-size: 18px;
-}
-
-.result .panel-heading .montant-inconnu {
-  position: relative;
-  top: .25em;
-}
-
-.result .panel-heading .montant-detail {
-  font-size: 12px;
-}
-
-.result .panel-title .description {
-  padding-top: 0.5em;
-}
-
-.needs-n-2 .panel-heading {
-  background-color: whitesmoke;
-  color: #888;
-}
-
-.montant i {
-  position: relative;
-  top: .4em;
-}
-
-.droit-logo {
-  height: 2em;
-  padding-left: 20px;
-}
-
-.droit-logo img {
-  height: 100%;
-}
-
-@media print {
-    .result .cta, .result .fa-chevron-down, .result .fa-chevron-right {
-      display: none;
-    }
-    .result .panel-collapse {
-        display: inline;
-    }
-}
-
-.result {
-    page-break-inside: avoid;
-}
diff --git a/app/styles/droits-eligibles-list.scss b/app/styles/droits-eligibles-list.scss
new file mode 100644
index 0000000000..f72920f9a9
--- /dev/null
+++ b/app/styles/droits-eligibles-list.scss
@@ -0,0 +1,211 @@
+@import '~font-awesome/scss/variables';
+$fa-font-path: '~font-awesome/fonts';
+@import '~font-awesome/scss/mixins';
+@import '~bootstrap-sass/assets/stylesheets/bootstrap/variables';
+@import 'variables';
+@import 'theme-variables';
+
+.result .panel-opened .panel-heading {
+  background-color: whitesmoke;
+}
+
+.result .panel-heading {
+  background-color: white;
+  padding: 5px 0;
+}
+
+.result .panel-heading:hover {
+  background-color: #ededed;
+}
+
+.result .panel-heading .montant {
+  font-weight: 600;
+  font-size: 18px;
+}
+
+.result .panel-heading .montant-detail {
+  font-size: 12px;
+}
+
+.result .panel-title .description {
+  padding-top: 0.5em;
+}
+
+.needs-n-2 .panel-heading {
+  background-color: whitesmoke;
+  color: #888;
+}
+
+.montant i {
+  position: relative;
+  top: .4em;
+}
+
+.droit-logo {
+  height: 2em;
+  padding-left: 20px;
+}
+
+.droit-logo img {
+  height: 100%;
+}
+
+@media print {
+    .result .cta, .result .fa-chevron-down, .result .fa-chevron-right {
+      display: none;
+    }
+    .result .panel-collapse {
+        display: inline;
+    }
+}
+
+.result {
+    page-break-inside: avoid;
+}
+
+.dotted-line {
+    flex: 1;
+    display: block;
+    border-top: 1px dotted lighten(#333, 20%);
+    margin: 0 15px;
+}
+
+.dotted-line:last-child {
+    margin-right: 0;
+}
+
+.droits-eligibles-list {
+    display: block;
+    background-color: white;
+    box-shadow: 0px 2px 5px 0 rgba(0, 0, 0, 0.26);
+    margin-bottom: 40px;
+}
+
+.droits-eligibles-list-item {
+
+    padding: 10px 15px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    color: #333;
+    position: relative;
+
+    @media (max-width: $screen-sm-max) {
+
+        padding: 10px 15px;
+        border-bottom: 1px solid #e0e0e0;
+
+        &:after {
+            @include fa-icon();
+            content: $fa-var-chevron-right;
+            color: #ccc;
+            text-align: right;
+            margin-left: 15px;
+        }
+    }
+
+    &:active,
+    &:focus,
+    &:hover {
+        text-decoration: none;
+        color: #999;
+    }
+
+    &-left {
+
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+
+        @media (max-width: $screen-sm-max) {
+            width: 80%;
+        }
+
+        img {
+            width: 60px;
+            margin-right: 15px;
+            @media (max-width: $screen-xs-max) {
+                width: 40px;
+            }
+        }
+
+        h2 {
+            margin: 0;
+            @media (max-width: $screen-xs-max) {
+                font-size: ($font-size-h2 * 0.6);
+            }
+            small {
+                display: block;
+                color: $link-color;
+                margin-top: 6px;
+            }
+        }
+
+        &:hover {
+            h2 {
+                small {
+                    text-decoration: underline;
+                }
+            }
+        }
+    }
+}
+
+.droit-montant {
+
+    display: inline-block;
+    text-align: right;
+
+    .montant {
+        font-weight: 600;
+        font-size: 18px;
+        @media (min-width: $screen-md-min) {
+            font-size: 22px;
+        }
+    }
+    .montant-detail {
+        display: inline-block;
+    }
+}
+
+.droit-detail {
+
+    margin-bottom: 30px;
+
+    &-heading {
+
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        position: relative;
+        margin-bottom: 15px;
+        padding: 15px 0;
+
+        h3 {
+            margin: 0;
+            font-weight: 600;
+        }
+
+    }
+
+    &-description {
+        margin-bottom: 15px;
+    }
+
+    &-buttons {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 15px;
+    }
+
+    .alert-warning {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        font-weight: 400;
+    }
+}
diff --git a/app/views/partials/droit-montant.html b/app/views/partials/droit-montant.html
new file mode 100644
index 0000000000..6593c42ef3
--- /dev/null
+++ b/app/views/partials/droit-montant.html
@@ -0,0 +1,11 @@
+<div class="droit-montant" itemscope itemtype="http://schema.org/Offer" itemprop="offers">
+  <span itemprop="price" ng-if="isNumber(droit.montant)" class="montant">
+    {{ droit.montant | currency : ( droit.unit || '€' ) : (droit.roundToNearestCent ? 2 : 0 ) }}
+  </span>
+  <span ng-if="isString(droit.montant)">
+    <i class="fa fa-question-circle fa-2x"></i>
+  </span>
+  <span ng-if="isNumber(droit.montant)" class="montant-detail">
+    {{ droit.legend || (droit.isMontantAnnuel ? '/ an' : '/ mois') }}
+  </span>
+</div>
diff --git a/app/views/partials/droits-eligibles-details.html b/app/views/partials/droits-eligibles-details.html
new file mode 100644
index 0000000000..908180c9e7
--- /dev/null
+++ b/app/views/partials/droits-eligibles-details.html
@@ -0,0 +1,95 @@
+<div class="droit-details">
+  <div ng-repeat="droit in list" id="{{ droit.id }}" class="droit-detail"
+    itemscope itemtype="http://schema.org/GovernmentService">
+
+    <div class="droit-detail-heading">
+      <h3 itemprop="name">{{ droit.label }}</h3>
+      <div class="dotted-line"></div>
+      <droit-montant droit="droit" ng-if="droit.montant && (isString(droit.montant) || isNumber(droit.montant))"></droit-montant>
+    </div>
+
+    <div class="alert alert-warning" ng-if="droit.isBaseRessourcesYearMoins2 && ! ressourcesYearMoins2Captured && ! isString(droit.montant)">
+      <span>
+        <i class="fa fa-warning" aria-hidden="true"></i>  Cette aide se base sur vos ressources de l'année {{ yearMoins2 }}
+      </span>
+      <a class="btn btn-sm btn-warning" ui-sref="foyer.ressourcesYearMoins2">Déclarez vos ressources {{ yearMoins2 }}</a>
+    </div>
+
+    <div class="droit-detail-description">
+      <p ng-bind-html="droit.description" itemprop="description"></p>
+      <div ng-if="droit.conditions">
+        <p>Pour en bénéficier, vous devez également :</p>
+        <ul class="list-unstyled">
+          <li ng-repeat="condition in droit.conditions">
+            <i class="fa fa-check" aria-hidden="true"></i>
+            <span ng-bind-html="condition"></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <div class="droit-detail-buttons">
+      <a href="{{ droit.teleservice || droit.form || droit.instructions }}"
+        target="_blank"
+        rel="noopener"
+        class="btn"
+        ng-class="{
+          'btn-success': droit.teleservice,
+          'btn-primary': droit.form,
+          'btn-default': droit.instructions,
+        }"
+        analytics-on="click"
+        analytics-name="{{ droit.label }}"
+        analytics-event="{{ droit.teleservice || droit.form || droit.instructions }}"
+        analytics-category="Action"
+        >
+        <span ng-if="droit.teleservice">Faire une demande</span>
+        <span ng-if="droit.form">Accéder au formulaire</span>
+        <span ng-if="droit.instructions">Accéder aux instructions</span>
+      </a>
+      <a ng-if="droit.id == 'ppa'"
+        class="btn btn-sm btn-secondary"
+        href="http://www.msa.fr/lfr/web/msa/espace-prive">
+        Démarches pour les professions agricoles
+      </a>
+      <a
+        ng-if="droit.link && ! droit.internalLink"
+        class="btn btn-default"
+        href="{{ droit.link }}"
+        target="_blank"
+        rel="noopener"
+        itemprop="termsOfService"
+        analytics-on="click"
+        analytics-name="{{ droit.label }}"
+        analytics-event="{{ droit.link }}"
+        analytics-category="Info"
+        >
+        <i class="fa fa-external-link" aria-hidden="true" role="presentation"></i>
+        Plus d'informations
+      </a>
+      <a
+        ng-if="droit.internalLink"
+        class="btn btn-default"
+        ng-click="trampoline.set({ situationId: situation._id, montant: droit.montant })"
+        ui-sref="{{ droit.internalLink }}"
+        target="_blank"
+        rel="noopener"
+        itemprop="termsOfService"
+        analytics-on="click"
+        analytics-name="{{ droit.label }}"
+        analytics-event="{{ droit.internalLink }}"
+        analytics-category="Info"
+        >
+        <i class="fa fa-external-link" aria-hidden="true" role="presentation"></i>
+        Plus d'informations
+      </a>
+    </div>
+
+    <div class="text-center">
+      <a href ng-click="scrollToTop($event)">
+        <i class="fa fa-arrow-up"></i> <small>Revenir en haut</small>
+      </a>
+    </div>
+
+  </div>
+</div>
diff --git a/app/views/partials/droits-eligibles-list.html b/app/views/partials/droits-eligibles-list.html
index 8867a4d36f..3eded42621 100644
--- a/app/views/partials/droits-eligibles-list.html
+++ b/app/views/partials/droits-eligibles-list.html
@@ -1,129 +1,19 @@
-<uib-accordion close-others="false" class="droits-eligibles">
-  <uib-accordion-group is-open="droit.open"
-     class="result {{ getAccordionClass(droit) }}"
-     ng-repeat="(droitId, droit) in list|orderObjectBy:'label'">
-    <uib-accordion-heading>
-      <div class="row">
-        <div class="col-xs-2 col-sm-1 droit-logo">
-          <img
-               ng-src="/img/{{ droit.provider.imgSrc }}"
-               alt="">
-        </div>
-
-        <div class="col-xs-6 col-sm-8 description">
-          <span>{{ droit.label }}<span>
-          <span ng-if="droit.isExperimental">(en test)</span>
-        </div>
-
-        <div class="col-xs-2 col-sm-2">
-          <div class="montant">
-            <span ng-if="isNumber(droit.montant)">{{ droit.montant | currency : ( droit.unit || '€' ) : (droit.roundToNearestCent ? 2 : 0 ) }}</span>
-            <span ng-if="isString(droit.montant)" class="montant-inconnu">?</span>
-            <i class="fa fa-warning text-warning" ng-if="shouldDisplayYM2Warning(droit)"></i>
-          </div>
-
-          <div ng-if="isNumber(droit.montant)" class="montant-detail">
-            {{ droit.legend || (droit.isMontantAnnuel ? '/ an' : '/ mois') }}
-          </div>
-
-        </div>
-
-        <div class="col-sm-1 col-xs-1 description">
-          <i class="fa"
-            ng-class="{'fa-chevron-down': droit.open, 'fa-chevron-right': !droit.open}"
-            aria-hidden="true"
-            role="presentation"
-          ></i>
-        </div>
-      </div>
-    </uib-accordion-heading>
-
-    <div class="caption">
-      <div ng-if="droit.montant">
-        <p ng-bind-html="droit.description"></p>
-        <div ng-if="droit.conditions">
-          Pour en bénéficier, vous devez également :
-          <ul>
-            <li ng-repeat="condition in droit.conditions">
-              <i class="fa fa-check" aria-hidden="true"></i>
-              <span ng-bind-html="condition"></span>
-            </li>
-          </ul>
-        </div>
-
-        <div ng-if="isString(droit.montant)" class="alert alert-warning-inverse">
-          <p>L'application Mes Aides ne peut pas calculer le montant de cette prestation, car <span ng-bind-html="droit.uncomputability[droit.montant].reason.user"></span>.</p>
-          <p ng-if="droit.uncomputability[droit.montant].solution"><strong ng-bind-html="droit.uncomputability[droit.montant].solution"></strong></p>
-        </div>
-
-        <div class="alert alert-warning-inverse" ng-if="droit.isBaseRessourcesYearMoins2 && ! ressourcesYearMoins2Captured && ! isString(droit.montant)">
-          <i class="fa fa-warning" aria-hidden="true"></i> Cette aide se base sur vos ressources de l'année {{ yearMoins2 }}.
-          <a ui-sref="foyer.ressourcesYearMoins2">Déclarez vos ressources {{ yearMoins2 }}</a>
-        </div>
-      </div>
-
-      <div class="row cta">
-        <div class="col-sm-3">
-          <a
-            ng-if="droit.link && ! droit.internalLink"
-            class="btn btn-sm btn-default btn-block"
-            href="{{ droit.link }}"
-            target="_blank"
-            rel="noopener"
-            analytics-on="click"
-            analytics-name="{{ droit.label }}"
-            analytics-event="{{ droit.link }}"
-            analytics-category="Info"
-            >
-            <i class="fa fa-external-link" aria-hidden="true" role="presentation"></i>
-            Plus d'informations
-          </a>
-          <a
-            ng-if="droit.internalLink"
-            class="btn btn-sm btn-default btn-block"
-            ng-click="trampoline.set({ situationId: situation._id, montant: droit.montant })"
-            ui-sref="{{ droit.internalLink }}"
-            target="_blank"
-            rel="noopener"
-            analytics-on="click"
-            analytics-name="{{ droit.label }}"
-            analytics-event="{{ droit.internalLink }}"
-            analytics-category="Info"
-            >
-            <i class="fa fa-external-link" aria-hidden="true" role="presentation"></i>
-            Plus d'informations
-          </a>
-        </div>
-        <div ng-if="droit.id == 'ppa'"
-          class="col-sm-5 col-sm-offset-1">
-          <a
-            class="btn btn-sm btn-secondary btn-block"
-            href="http://www.msa.fr/lfr/web/msa/espace-prive">
-            Démarches pour les professions agricoles
-          </a>
-        </div>
-        <div ng-if="droit.teleservice || droit.form || droit.instructions"
-          class="col-sm-3 {{ (droit.id != 'ppa') && 'col-sm-offset-6' }}">
-          <a href="{{ droit.teleservice || droit.form || droit.instructions }}"
-            target="_blank"
-            rel="noopener"
-            class="btn btn-sm btn-block"
-            ng-class="{
-              'btn-success': droit.teleservice,
-              'btn-primary': droit.form,
-              'btn-default': droit.instructions,
-            }"
-            analytics-on="click"
-            analytics-name="{{ droit.label }}"
-            analytics-event="{{ droit.teleservice || droit.form || droit.instructions }}"
-            analytics-category="Action"
-            >
-            <span ng-if="droit.teleservice">Faire une demande</span>
-            <span ng-if="droit.form">Accéder au formulaire</span>
-            <span ng-if="droit.instructions">Accéder aux instructions</span>
-          </a>
-        </div>
+<div class="droits-eligibles-list">
+  <a ng-repeat="droit in list" href ng-click="scrollTo(droit, $event)" class="droits-eligibles-list-item"
+    itemscope itemtype="http://schema.org/GovernmentService">
+    <div class="droits-eligibles-list-item-left">
+      <img ng-src="/img/{{ droit.provider.imgSrc }}" alt="{{ droit.label }}">
+      <div>
+        <h2>
+          <span itemprop="name">{{ droit.label }}</span>
+          <small>Comment l'obtenir ?</small>
+        </h2>
       </div>
     </div>
-  </uib-accordion-group>
-</uib-accordion>
+    <div class="dotted-line"></div>
+    <droit-montant droit="droit" ng-if="droit.montant && (isString(droit.montant) || isNumber(droit.montant))"></droit-montant>
+    <div ng-if="droit.montant && isBoolean(droit.montant)">
+      <i class="fa fa-check-circle fa-2x"></i>
+    </div>
+  </a>
+</div>
diff --git a/app/views/partials/resultat.html b/app/views/partials/resultat.html
index ded8fb695c..b805ab59da 100644
--- a/app/views/partials/resultat.html
+++ b/app/views/partials/resultat.html
@@ -44,48 +44,35 @@ <h2>Juste une dernière étape…</h2>
 
   <div ng-if="! (droits.prestationsNationales | isEmpty)">
     <p>
-      D'après la situation que vous avez décrite, vous êtes a priori éligible à ces aides <strong>{{ droits.partenairesLocaux ? "nationales" : "" }}</strong>.
+      D'après la situation que vous avez décrite, vous êtes a priori éligible à ces aides.
       <span id="print-disclaimer">Ces résultats sont fondés sur les seules informations que vous avez indiquées et ne constituent en aucune façon un engagement de la part des organismes cités.</span>
       Les montants avancés sont arrondis à une dizaine d'euros près :
     </p>
-    <div class="frame-resultats">
-      <droit-eligibles-list list="droits.prestationsNationales"></droit-eligibles-list>
-      <ym2-ressources-call-to-action ng-hide="ressourcesYearMoins2Captured"></ym2-ressources-call-to-action>
-
-      <div class="row additional-info-cta" ng-show="! noDroits && shouldPatrimoineBeCaptured()">
-        <div class="col-sm-8">
+    <droit-eligibles-list droits="droits"></droit-eligibles-list>
+    <ym2-ressources-call-to-action ng-hide="ressourcesYearMoins2Captured"></ym2-ressources-call-to-action>
+    <!--
+    <div class="row additional-info-cta" ng-show="! noDroits && shouldPatrimoineBeCaptured()">
+      <div class="col-sm-8">
+        <p>
           <i class="fa fa-info-circle" aria-hidden="true"></i>
           Vous avez un patrimoine immobilier, d'épargne, des revenus fonciers et/ou du capital ?
           Vous devez renseigner des informations complémentaires.
-        </div>
-        <div class="col-sm-4 print-hidden">
-          <a class="btn btn-default btn-block" ui-sref="foyer.patrimoine">Déclarez votre patrimoine</a>
-        </div>
+        </p>
+      </div>
+      <div class="col-sm-4 print-hidden">
+        <a class="btn btn-default btn-block" ui-sref="foyer.patrimoine">Déclarez votre patrimoine</a>
       </div>
     </div>
+    -->
   </div>
 
   <div ng-if="! (droitsNonEligibles.prestationsNationales | isEmpty)" ng-show="droitsNonEligiblesShow">
     <p>
       Les conditions des aides suivantes <strong>ne sont pas</strong> remplies&nbsp;:
     </p>
-    <div class="frame-resultats">
-      <droit-non-eligibles-list list="droitsNonEligibles.prestationsNationales" filter="['cmu_c', 'acs']"></droit-non-eligibles-list>
-    </div>
-  </div>
-
-  <div ng-repeat="(partenaireId, prestationsPartenaire) in droits.partenairesLocaux">
-    <p>Vous êtes {{ droits.prestationsNationales ? "également" : "" }} a priori éligible à ces aides {{ prestationsPartenaire.prefix }} <strong>{{ prestationsPartenaire.label }}</strong>&nbsp;:</p>
-    <div class="frame-resultats">
-      <droit-eligibles-list list="prestationsPartenaire.prestations"></droit-eligibles-list>
-      <div class="additional-info-cta">
-        <p ng-if="prestationsPartenaire.interactionWithNationalPrestationCalculated !== false">
-          <i class="fa fa-info-circle" aria-hidden="true"></i>
-          {{ (! droits.prestationsNationales && (droitsInjectes | isEmpty)) ? "Si vous percevez aussi des aides nationales, le" : "Le" }}
-           montant de ces aides locales pourrait être partiellement déduit de vos aides nationales. Nous travaillons avec nos partenaires pour déterminer plus précisément ces interactions.
-        </p>
-      </div>
-    </div>
+    <droit-non-eligibles-list
+      droits="droitsNonEligibles"
+      filter="['cmu_c', 'acs']"></droit-non-eligibles-list>
   </div>
 
   <div class="frame-resultats" ng-show="noDroits && ressourcesYearMoins2Captured">
@@ -93,6 +80,11 @@ <h2>Vous n'êtes a priori éligible à aucune des aides calculées par ce simula
       <p>Si vous êtes dans une situation difficile, d'<a ui-sref="sos">autres solutions existent</a>.</p>
   </div>
 
+  <h1 ng-if="! noDroits">Comment obtenir vos aides ?</h1>
+  <droit-eligibles-details
+    droits="droits"
+    year-moins-2="yearMoins2"></droit-eligibles-details>
+
   <div class="print-hidden">
     <etablissements-list code-postal="situation.menage.code_postal" code-insee="situation.menage.depcom"></etablissements-list>
 
diff --git a/package-lock.json b/package-lock.json
index 12a3f731c5..73b1a5edce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11141,6 +11141,12 @@
       "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
       "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
     },
+    "smooth-scroll": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/smooth-scroll/-/smooth-scroll-15.0.0.tgz",
+      "integrity": "sha512-hG0AUxgIea+wduxNArBKH0FpHCqK61+QhcnymF9iHafdBFupD/D1tc2QdLjddXBov4fZe6+iZqteoyyvmpZ0TA==",
+      "dev": true
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
diff --git a/package.json b/package.json
index 383db5ae14..068e90a6ea 100644
--- a/package.json
+++ b/package.json
@@ -97,6 +97,7 @@
     "postcss-loader": "^3.0.0",
     "requirejs": "^2.2.0",
     "sass-loader": "^7.1.0",
+    "smooth-scroll": "^15.0.0",
     "style-loader": "^0.23.1",
     "time-grunt": "^1.3.0",
     "url-loader": "^1.1.2",
diff --git a/test/integration/base-suite/8 - Results scenario.js b/test/integration/base-suite/8 - Results scenario.js
index 5c09bf9f04..9d57080006 100644
--- a/test/integration/base-suite/8 - Results scenario.js	
+++ b/test/integration/base-suite/8 - Results scenario.js	
@@ -4,21 +4,14 @@ steps: [
     {
         'ResultComponent.title': /Résultats/,
     },
-    {
-        'ResultComponent.resultatFrame': true,
-    },
     {
         'ResultComponent.prestationName': PRESTATION_NAME,
-        'ResultComponent.prestationMontant': /\d+ €/,
-        'ResultComponent.prestationMontantDetail': /mois/,
-        'ResultComponent.prestationYM2Warning': HAS_PRESTATION_WARNING,
-        'ResultComponent.greyedPrestation': HAS_PRESTATION_WARNING,
+        'ResultComponent.prestationMontant': /(\d+)[\S\n\r\s]+€[\S\n\r\s]+\/ mois/,
         'ResultComponent.declareYM2ResourcesLink': true,
     },
-    ResultComponent.togglePrestationTab(),
     {
         'ResultComponent.prestationDescription': PRESTATION_DESCRIPTION,
         'ResultComponent.prestationMoreInfoLink': true,
+        'ResultComponent.prestationYM2Warning': HAS_PRESTATION_WARNING,
     },
-    ResultComponent.togglePrestationTab()
 ]
diff --git a/test/integration/base-suite/9 - Declare YM2 resources scenario.js b/test/integration/base-suite/9 - Declare YM2 resources scenario.js
index acd5d554f8..b07b7a9e30 100644
--- a/test/integration/base-suite/9 - Declare YM2 resources scenario.js	
+++ b/test/integration/base-suite/9 - Declare YM2 resources scenario.js	
@@ -10,14 +10,9 @@ steps: [
     },
     YM2ResourcesComponent.setDemandeurRevenuActiviteInput(12000),
     YM2ResourcesComponent.submit(),
-    {
-        'ResultComponent.declareYM2ResourcesLink': false,
-    },
     {
         'ResultComponent.title': /Résultats/,
-    },
-    {
-        'ResultComponent.resultatFrame': true,
+        'ResultComponent.declareYM2ResourcesLink': false,
     },
 ]
 
diff --git a/test/integration/base-suite/ResultsFixture.js b/test/integration/base-suite/ResultsFixture.js
index 1a67ed5b88..54020766a5 100644
--- a/test/integration/base-suite/ResultsFixture.js
+++ b/test/integration/base-suite/ResultsFixture.js
@@ -1,5 +1,6 @@
 PRESTATION_TO_TEST_POSITION = 1
 PRESTATION_NAME = /Prime d’activité/
+PRESTATION_ID = 'ppa'
 PRESTATION_DESCRIPTION = /revenus/
 HAS_PRESTATION_WARNING = false
 HAS_PRESTATION_ENGAGER_DEMARCHES_LINK = true
diff --git a/test/integration/components/ResultComponent.js b/test/integration/components/ResultComponent.js
index 22ec60c691..82a68281f2 100644
--- a/test/integration/components/ResultComponent.js
+++ b/test/integration/components/ResultComponent.js
@@ -1,14 +1,10 @@
 title: 'h1',
 
-resultatFrame: '.frame-resultats .droits-eligibles',
-
-prestationName: '.droits-eligibles .result:nth-child(' + PRESTATION_TO_TEST_POSITION + ') .description',
-prestationMontant: '.droits-eligibles .result:nth-child(' + PRESTATION_TO_TEST_POSITION + ') .montant',
-prestationMontantDetail: '.droits-eligibles .result:nth-child(' + PRESTATION_TO_TEST_POSITION + ') .montant-detail',
-prestationYM2Warning: '.droits-eligibles .result:nth-child(' + PRESTATION_TO_TEST_POSITION + ') i.fa-warning',
-togglePrestationTabLink: '.droits-eligibles .result:nth-child(' + PRESTATION_TO_TEST_POSITION + ') a',
-prestationDescription: '.droits-eligibles .result:nth-child(' + PRESTATION_TO_TEST_POSITION + ') p',
-prestationMoreInfoLink: '.droits-eligibles .result:nth-child(' + PRESTATION_TO_TEST_POSITION + ') .btn-default',
+prestationName: '.droits-eligibles-list [itemtype="http://schema.org/GovernmentService"]:nth-of-type(' + PRESTATION_TO_TEST_POSITION + ') [itemprop="name"]',
+prestationMontant: '.droits-eligibles-list [itemtype="http://schema.org/GovernmentService"]:nth-of-type(' + PRESTATION_TO_TEST_POSITION + ') [itemprop="offers"]',
+prestationYM2Warning: '#' + PRESTATION_ID + ' .alert-warning',
+prestationDescription: '#' + PRESTATION_ID + ' [itemprop="description"]',
+prestationMoreInfoLink: '#' + PRESTATION_ID + ' [itemprop="termsOfService"]',
 
 openPrimeActiviteLink: { a: 'Prime d’activité' },
 requestPrimeActiviteLink: { a: 'Faire une demande' },
diff --git a/test/integration/family-suite/81 - Request link scenario.js b/test/integration/family-suite/81 - Request link scenario.js
index 6c848277cf..eb77110029 100644
--- a/test/integration/family-suite/81 - Request link scenario.js	
+++ b/test/integration/family-suite/81 - Request link scenario.js	
@@ -1,7 +1,6 @@
 description: 'Ensure links are shown',
 
 steps: [
-    ResultComponent.openPrimeActivite(),
     {
         'ResultComponent.requestPrimeActiviteLink': true,
     }
diff --git a/test/integration/family-suite/ResultsFixture.js b/test/integration/family-suite/ResultsFixture.js
index b0360134b3..e442070c9a 100644
--- a/test/integration/family-suite/ResultsFixture.js
+++ b/test/integration/family-suite/ResultsFixture.js
@@ -1,5 +1,6 @@
 PRESTATION_TO_TEST_POSITION = 2
 PRESTATION_NAME = /Allocations familiales/
+PRESTATION_ID = 'af'
 PRESTATION_DESCRIPTION = /au moins 2 enfants/
 HAS_PRESTATION_WARNING = true
 HAS_PRESTATION_ENGAGER_DEMARCHES_LINK = false