diff --git a/apps_in_progress.md b/apps_in_progress.md
index 18a7a83b..8a164474 100644
--- a/apps_in_progress.md
+++ b/apps_in_progress.md
@@ -29,11 +29,23 @@ The packagers will appreciate your remarks. If you test them and find issues, or
 <div class="btn btn-default btn-xs pull-right" data-toggle="collapse" data-target="#app-accordion2 .collapse">View all</div>
 </div>
 
+<h2>Declared as working applications</h2>
+<p><b style="color: red">Important: it's the application maintaineur that qualify his application as working, not the YunoHost core team. Install it at your own risks. We won't provide support for it.</b></p>
 
-<div class="panel-group" id="app-accordion2"></div>
+<div class="panel-group" id="app-accordion2-working"></div>
+
+<h2>Work in progress applications</h2>
+<p>Those are <b>not yet finished</b> applications, we <b>strongly advise against installing them</b> except if you know what you are doing.</p>
+
+<div class="panel-group" id="app-accordion2-inprogress"></div>
+
+<h2>Borken applications</h2>
+<p>Do <b>NOT</b> install them, they are here as reference while they aren't fixed.</p>
+
+<div class="panel-group" id="app-accordion2-notworking"></div>
 
 <script type="text/template" id="app-template2">
-  <div class="panel panel-default">
+  <div class="panel panel-default panel-{app_state_bootstrap}">
     <div class="panel-heading">
       <div class="panel-title">
         <a data-toggle="collapse" data-parent="#app-accordion" href="apps_in_progress/#app_{app_id}">{app_name} <em><small>({app_id})</small></em></a>
@@ -41,7 +53,6 @@ The packagers will appreciate your remarks. If you test them and find issues, or
     </div>
     <div class="panel-collapse collapse app_{app_id}">
       <div class="panel-body">
-        <div class="{app_state}"/>
         <p><strong>Description</strong>: {app_description}</p>
         <p><strong>Last update (UTC)</strong>: {app_update}</p>
         <p><strong>Maintainer</strong>: {app_maintainer} <small class="text-muted">({app_mail})</small></p>
@@ -78,6 +89,14 @@ $(document).ready(function () {
     });
     $.each(app_list, function(k, infos) {
       app_id = infos.manifest.id;
+      if (infos.state === "working") {
+        app_state_bootstrap = "default";
+      } else if (infos.state === "inprogress") {
+        app_state_bootstrap = "warning";
+      } else if (infos.state === "notworking") {
+        app_state_bootstrap = "danger";
+      }
+
       html = $('#app-template2').html()
              .replace(/{app_id}/g, app_id)
              .replace(/{app_name}/g, infos.manifest.name)
@@ -86,6 +105,7 @@ $(document).ready(function () {
              .replace('{app_branch}', infos.git.branch)
              .replace('{app_update}', timeConverter(infos.lastUpdate))
              .replace('{app_state}', infos.state)
+             .replace('{app_state_bootstrap}', app_state_bootstrap)
              .replace('{app_license}', infos.manifest.license);
 
       if (infos.manifest.developer) {
@@ -100,20 +120,8 @@ $(document).ready(function () {
           .replace('{app_mail}', infos.manifest.maintainer.email);
       }
 
-      $('#app-accordion2').append(html);
+      $('#app-accordion2-' + infos.state).append(html);
       $('.app_'+ app_id).attr('id', 'app_'+ app_id);
-
-      setTimeout(function() {
-          $(".notworking").each(function() {
-              $(this).html( '<a class="btn btn-small btn-danger disabled" href="#">Not working</a>' );
-          });
-          $(".inprogress").each(function() {
-              $(this).html( '<a class="btn btn-small btn-warning disabled" href="#">In progress</a>' );
-          });
-          $(".working").each(function() {
-              $(this).html( '<a class="btn btn-small btn-success disabled" href="#">Working</a>' );
-          });
-      }, 3000);
     });
   });
 });
diff --git a/apps_in_progress_fr.md b/apps_in_progress_fr.md
index aaeac4b9..269fe03f 100644
--- a/apps_in_progress_fr.md
+++ b/apps_in_progress_fr.md
@@ -28,10 +28,23 @@ N’hésitez pas à vous créer un compte GitHub pour faire part de vos remarque
 <div class="btn btn-default btn-xs pull-right" data-toggle="collapse" data-target="#app-accordion2 .collapse">Tout déplier</div>
 </div>
 
-<div class="panel-group" id="app-accordion2"></div>
+<h2>Applications dites fonctionnelles</h2>
+<p><b style="color: red">Remarque : c'est le mainteneur de l'application qui la décrit comme fonctionnelle, pas l'équipe de YunoHost. Installez la à vos risques et péril. Nous ne fournirrons pas de support dessus.</b></p>
+
+<div class="panel-group" id="app-accordion2-working"></div>
+
+<h2>Applications en cours de développement</h2>
+<p>Il s'agit d'application <b>pas encore fonctionnelles</b> mais en cours de développement, nous vous <b>déconseillons fortement de les installer</b> sauf si vous savez ce que vous faites.</p>
+
+<div class="panel-group" id="app-accordion2-inprogress"></div>
+
+<h2>Applications cassées</h2>
+<p>Ne les installez <b>PAS</b>, elles sont là pour référence le temps d'être réparées.</p>
+
+<div class="panel-group" id="app-accordion2-notworking"></div>
 
 <script type="text/template" id="app-template2">
-  <div class="panel panel-default">
+  <div class="panel panel-default panel-{app_state_bootstrap}">
     <div class="panel-heading">
       <div class="panel-title">
         <a data-toggle="collapse" data-parent="#app-accordion" href="#app_{app_id}">{app_name} <em><small>({app_id})</small></em></a>
@@ -44,7 +57,6 @@ N’hésitez pas à vous créer un compte GitHub pour faire part de vos remarque
         <p><strong>Mainteneur</strong> : {app_maintainer} <small class="text-muted">({app_mail})</small></p>
         <p><strong>Dépôt git</strong> : <a href="{app_git}" target="_blank">{app_git}</a> <small class="text-muted">({app_branch})</small></p>
         <p><strong>Licence de l’application</strong> : {app_license}</p>
-        <div class="{app_state}"/>
     </div>
   </div>
 </script>
@@ -79,6 +91,15 @@ $(document).ready(function () {
       if (typeof infos.manifest.description.fr === 'undefined') {
         infos.manifest.description.fr = infos.manifest.description.en;
       }
+
+      if (infos.state === "working") {
+        app_state_bootstrap = "default";
+      } else if (infos.state === "inprogress") {
+        app_state_bootstrap = "warning";
+      } else if (infos.state === "notworking") {
+        app_state_bootstrap = "danger";
+      }
+
       html = $('#app-template2').html()
              .replace(/{app_id}/g, app_id)
              .replace(/{app_name}/g, infos.manifest.name)
@@ -87,6 +108,7 @@ $(document).ready(function () {
              .replace('{app_branch}', infos.git.branch)
              .replace('{app_update}', timeConverter(infos.lastUpdate))
              .replace('{app_state}', infos.state)
+             .replace('{app_state_bootstrap}', app_state_bootstrap)
              .replace('{app_license}', infos.manifest.license);
 
       if (infos.manifest.developer) {
@@ -101,20 +123,8 @@ $(document).ready(function () {
           .replace('{app_mail}', infos.manifest.maintainer.email);
       }
 
-      $('#app-accordion2').append(html);
+      $('#app-accordion2-' + infos.state).append(html);
       $('.app_'+ app_id).attr('id', 'app_'+ app_id);
-
-      setTimeout(function() {
-          $(".notworking").each(function() {
-              $(this).html( '<a class="btn btn-small btn-danger disabled" href="#">Non fonctionnel</a>' );
-          });
-          $(".inprogress").each(function() {
-              $(this).html( '<a class="btn btn-small btn-warning disabled" href="#">En cours</a>' );
-          });
-          $(".working").each(function() {
-              $(this).html( '<a class="btn btn-small btn-success disabled" href="#">Fonctionnel</a>' );
-          });
-      }, 3000);
     });
   });
 });