diff --git a/app/view/user/perso.html b/app/view/user/perso.html
index 3e89c939cb68c744de27030cae97187801979a3a..5672c3da54f757aca4d948a0c05b7f24fa91e7c0 100644
--- a/app/view/user/perso.html
+++ b/app/view/user/perso.html
@@ -1,19 +1,44 @@
-<div id="subtitle" class="row">
-    <div class="page-header">
-        <h1 class="text-left">{{ _("Merci de soutenir La Quadrature du Net &lt;3&nbsp;!")}}</h1>
-    </div>
-    <div id="perso" class="row fluid">
-        <div class="col-md-4"><!-- Form infos du compte -->
-            <div class="panel panel-default">
-                <input id="compte" type="checkbox">
-                <label for="compte" class="panel-heading" role="tab" id="headingInfos">
-                <div class="panel-heading" role="tab" id="headingInfos">
-                    <div class="panel-title col-xs text-left">
+<section id="wrapper" class="container-fluid">
+    <div id="subtitle" class="row">
+        <div class="page-header">
+            <h1 class="text-left">{{ _("Merci de soutenir La Quadrature du Net &lt;3&nbsp;!")}}</h1>
+        </div>
+        <div id="perso" class="row fluid">
+            <div class="col-md-4"><!-- Form infos du compte -->
+                <div class="panel panel-default">
+                    <input id="compte" type="checkbox">
+                    <label for="compte" class="panel-heading" role="tab" id="headingInfos">
+                        <div class="panel-title col-xs text-left">
                             {{ _("Compte")}}
-                        <div class="panel-title col-xs-2 text-right">
+                            <div class="panel-title col-xs-2 text-right">
+                            </div>
+                        </div>
+                    </label>
+                    <div id="collapseInfos" class="panel-collapse collapse" aria-labelledby="headingInfos">
+                        <div class="panel-body text-left">
+                            <form method="POST" action="{{ 'infos' | alias }}">
+                                <input type="hidden" name="csrf" value="{{ @CSRF }}" />
+                                <div class="form-group">
+                                    <label for="pseudo">{{ _("Pseudo") }}</label>
+                                    <input type="text" class="form-control" id="pseudo" name="pseudo" value="{{ @infos.pseudo }}">
+                                </div>
+                                <div class="form-group">
+                                    <label for="email">{{ _("Adresse mail")}}</label>
+                                    <input type="email" class="form-control" name="email" id="email" value="{{ @infos.email }}">
+                                </div>
+                                <div class="form-group">
+                                    <label for="password">{{ _("Mot de passe")}}</label>
+                                    <input type="password" class="form-control" name="password" id="password">
+                                </div>
+                                <div class="form-group">
+                                    <label for="password_confirmation">{{ _("Confirmation de mot de passe")}}</label>
+                                    <input type="password" class="form-control" name="password_confirmation" id="password_confirmation">
+                                </div>
+                                <input type="submit" class="btn btn-lg btn-primary c-boutonslongs" value="{{ _("Mettre à jour") }}">
+                            </form>
                         </div>
                     </div>
-                </label>
+                </div>
                 <div id="collapseInfos" class="panel-collapse collapse" aria-labelledby="headingInfos">
                     <div class="panel-body text-left">
                         <form method="POST" action="{{ 'infos' | alias }}">
@@ -38,154 +63,129 @@
                         </form>
                     </div>
                 </div>
-            </div>
-            <div id="collapseInfos" class="panel-collapse collapse" aria-labelledby="headingInfos">
-                <div class="panel-body text-left">
-                    <form method="POST" action="{{ 'infos' | alias }}">
-                        <input type="hidden" name="csrf" value="{{ @CSRF }}" />
-                        <div class="form-group">
-                            <label for="pseudo">{{ _("Pseudo") }}</label>
-                            <input type="text" class="form-control" id="pseudo" name="pseudo" value="{{ @infos.pseudo }}">
-                        </div>
-                        <div class="form-group">
-                            <label for="email">{{ _("Adresse mail")}}</label>
-                            <input type="email" class="form-control" name="email" id="email" value="{{ @infos.email }}">
-                        </div>
-                        <div class="form-group">
-                            <label for="password">{{ _("Mot de passe")}}</label>
-                            <input type="password" class="form-control" name="password" id="password">
+            </div><!-- /Form infos du compte -->
+            <div class="col-md-4"><!-- Form addresses -->
+                <div class="panel panel-default">
+                    <input id="adresses" type="checkbox">
+                    <label for="adresses" class="panel-heading" role="tab" id="headingInfos">
+                        <div class="panel-title col-xs text-left">
+                            {{ _("Adresses")}}
+                            <div class="panel-title col-xs-2 text-right">
+                            </div>
                         </div>
-                        <div class="form-group">
-                            <label for="password_confirmation">{{ _("Confirmation de mot de passe")}}</label>
-                            <input type="password" class="form-control" name="password_confirmation" id="password_confirmation">
+                    </label>
+                    <div id="collapseAdresses" class="panel-collapse collapse" href="#collapseAdresses" aria-expanded="false" aria-controls="collapseAdresses">
+                        <div class="panel-body text-left">
+                            <check if="{{ count(@adresses) > 0 }}">
+                            <h3>{{ _("Modifier une adresse")}}</h3>
+                            <form>
+                                <div class="form-group">
+                                    <label for="">{{ _("Modifier une adresse")}}</label>
+                                    <select class="form-control">
+                                        <repeat group="{{ @adresses }}" value="{{ @adresse }}">
+                                        <option value="{{ @adresse.id }}">{{ @adresse.alias }}</option>
+                                        </repeat>
+                                    </select>
+                                </div>
+                            </form>
+                            <h3>{{ _("Ajouter une nouvelle adresse.")}}</h3>
+                            <form method="POST" action="{{ 'adresses' | alias }}" id="create-adress-form">
+                                <input type="hidden" name="csrf" value="{{ @CSRF }}" />
+                                <input type="hidden" name="action" value="ADD" />
+                                <input type="hidden" name="id" value="" />
+                                <div class="form-group">
+                                    <label for="alias">{{ _("Nom de l'adresse")}}</label>
+                                    <input type="text" class="form-control" name="alias" value="">
+                                </div>
+                                <div class="form-group">
+                                    <label for="nom">{{ _("Destinataire") }}</label>
+                                    <input type="text" class="form-control" name="nom" value="">
+                                </div>
+                                <div class="form-group">
+                                    <label for="adresse">{{ _("Adresse")}}</label>
+                                    <input type="text" class="form-control" name="adresse" value="">
+                                </div>
+                                <div class="form-group">
+                                    <label for="adresse2">{{ _("Complément d'adresse")}}</label>
+                                    <input type="text" class="form-control" name="adresse2" value="">
+                                </div>
+                                <div class="form-group">
+                                    <label for="codepostal">{{ _("Code Postal")}}</label>
+                                    <input type="text" class="form-control" name="codepostal" value="">
+                                </div>
+                                <div class="form-group">
+                                    <label for="ville">{{ _("Ville")}}</label>
+                                    <input type="text" class="form-control" name="ville" value="">
+                                </div>
+                                <div class="form-group">
+                                    <label for="state">{{ _("Province / État")}}</label>
+                                    <input type="text" class="form-control" name="state" value="">
+                                </div>
+                                <div class="form-group">
+                                    <label for="pays">{{ _("Pays")}}</label>
+                                    <input type="text" class="form-control" name="pays" value="">
+                                </div>
+                                <div class="form-group">
+                                    <label for="default">
+                                        <input type="checkbox" name="defaut" value="true" >{{ _("Utiliser comme adresse par défaut.") }}
+                                    </label>
+                                </div>
+                                <input type="submit" class="btn btn-lg c-boutonslongs" value="{{ _("Créer cette adresse")}}">
+                            </form>
                         </div>
-                        <input type="submit" class="btn btn-lg btn-primary c-boutonslongs" value="{{ _("Mettre à jour") }}">
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div><!-- /Form infos du compte -->
-    <div class="col-md-4"><!-- Form addresses -->
-        <div class="panel panel-default">
-            <input id="adresses" type="checkbox">
-            <label for="adresses" class="panel-heading" role="tab" id="headingInfos">
-                <div class="panel-title col-xs text-left">
-                    {{ _("Adresses")}}
-                    <div class="panel-title col-xs-2 text-right">
                     </div>
                 </div>
-            </label>
-            <div id="collapseAdresses" class="panel-collapse collapse" href="#collapseAdresses" aria-expanded="false" aria-controls="collapseAdresses">
-                <div class="panel-body text-left">
-                    <check if="{{ count(@adresses) > 0 }}">
-                    <h3>{{ _("Modifier une adresse")}}</h3>
-                    <form>
-                        <div class="form-group">
-                            <label for="">{{ _("Modifier une adresse")}}</label>
-                            <select class="form-control">
-                                <repeat group="{{ @adresses }}" value="{{ @adresse }}">
-                                <option value="{{ @adresse.id }}">{{ @adresse.alias }}</option>
-                                </repeat>
-                            </select>
-                        </div>
-                    </form>
-                    <h3>{{ _("Ajouter une nouvelle adresse.")}}</h3>
-                    <form method="POST" action="{{ 'adresses' | alias }}" id="create-adress-form">
-                        <input type="hidden" name="csrf" value="{{ @CSRF }}" />
-                        <input type="hidden" name="action" value="ADD" />
-                        <input type="hidden" name="id" value="" />
-                        <div class="form-group">
-                            <label for="alias">{{ _("Nom de l'adresse")}}</label>
-                            <input type="text" class="form-control" name="alias" value="">
-                        </div>
-                        <div class="form-group">
-                            <label for="nom">{{ _("Destinataire") }}</label>
-                            <input type="text" class="form-control" name="nom" value="">
-                        </div>
-                        <div class="form-group">
-                            <label for="adresse">{{ _("Adresse")}}</label>
-                            <input type="text" class="form-control" name="adresse" value="">
-                        </div>
-                        <div class="form-group">
-                            <label for="adresse2">{{ _("Complément d'adresse")}}</label>
-                            <input type="text" class="form-control" name="adresse2" value="">
-                        </div>
-                        <div class="form-group">
-                            <label for="codepostal">{{ _("Code Postal")}}</label>
-                            <input type="text" class="form-control" name="codepostal" value="">
-                        </div>
-                        <div class="form-group">
-                            <label for="ville">{{ _("Ville")}}</label>
-                            <input type="text" class="form-control" name="ville" value="">
-                        </div>
-                        <div class="form-group">
-                            <label for="state">{{ _("Province / État")}}</label>
-                            <input type="text" class="form-control" name="state" value="">
-                        </div>
-                        <div class="form-group">
-                            <label for="pays">{{ _("Pays")}}</label>
-                            <input type="text" class="form-control" name="pays" value="">
+            </div><!-- / Form Adresses -->
+            <div class="col-md-4"><!-- Form historique -->
+                <div class="panel panel-default">
+                    <input id="histo" type="checkbox">
+                    <label for="histo" class="panel-heading" role="tab" id="headingInfos">
+                        <div class="panel-title col-xs text-left">
+                            {{ _("Historique")}}
+                            <div class="panel-title col-xs-2 text-right">
+                            </div>
                         </div>
-                        <div class="form-group">
-                            <label for="default">
-                                <input type="checkbox" name="defaut" value="true" >{{ _("Utiliser comme adresse par défaut.") }}
-                            </label>
+                    </label>
+                    <div id="collapseHistorique" class="panel-collapse collapse" aria-labelledby="headingHistorique">
+                        <div class="panel-body text-left">
+                            <table class="table text-left">
+                                <tr>
+                                    <th>{{ _("Date") }}</th>
+                                    <th>{{ _("Dons") }}</th>
+                                    <th>{{ _("Récurent") }}</th>
+                                    <th>{{ _("Contreparties") }}</th>
+                                </tr>
+                                <repeat group="{{ @dons_recurrents }}" value="{{ @don }}">
+                                <tr>
+                                    <td>{{ @don.datec }}</td>
+                                    <td>{{ @don.somme }}</td>
+                                    <td>{{ _("Oui")}}</td>
+                                    <td></td>
+                                </tr>
+                                </repeat>
+                                <repeat group="{{ @dons }}" value="{{ @don }}">
+                                <tr>
+                                    <td>{{ @don.datec }}</td>
+                                    <td>{{ @don.somme }}</td>
+                                    <td>{{ _("Non")}}</td>
+                                    <td></td>
+                                </tr>
+                                </repeat>
+                                <repeat group="{{ @contreparties }}" value="{{ @contrepartie }}">
+                                <tr>
+                                    <td>{{ @contrepartie.datec }}</td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>{{ @contrepartie.quoi }}</td>
+                                </tr>
+                                </repeat>
+                            </table>
                         </div>
-                        <input type="submit" class="btn btn-lg c-boutonslongs" value="{{ _("Créer cette adresse")}}">
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div><!-- / Form Adresses -->
-    <div class="col-md-4"><!-- Form historique -->
-        <div class="panel panel-default">
-            <input id="histo" type="checkbox">
-            <label for="histo" class="panel-heading" role="tab" id="headingInfos">
-                <div class="panel-title col-xs text-left">
-                    {{ _("Historique")}}
-                    <div class="panel-title col-xs-2 text-right">
                     </div>
                 </div>
-            </label>
-            <div id="collapseHistorique" class="panel-collapse collapse" aria-labelledby="headingHistorique">
-                <div class="panel-body text-left">
-                    <table class="table text-left">
-                        <tr>
-                            <th>{{ _("Date") }}</th>
-                            <th>{{ _("Dons") }}</th>
-                            <th>{{ _("Récurent") }}</th>
-                            <th>{{ _("Contreparties") }}</th>
-                        </tr>
-                        <repeat group="{{ @dons_recurrents }}" value="{{ @don }}">
-                        <tr>
-                            <td>{{ @don.datec }}</td>
-                            <td>{{ @don.somme }}</td>
-                            <td>{{ _("Oui")}}</td>
-                            <td></td>
-                        </tr>
-                        </repeat>
-                        <repeat group="{{ @dons }}" value="{{ @don }}">
-                        <tr>
-                            <td>{{ @don.datec }}</td>
-                            <td>{{ @don.somme }}</td>
-                            <td>{{ _("Non")}}</td>
-                            <td></td>
-                        </tr>
-                        </repeat>
-                        <repeat group="{{ @contreparties }}" value="{{ @contrepartie }}">
-                        <tr>
-                            <td>{{ @contrepartie.datec }}</td>
-                            <td></td>
-                            <td></td>
-                            <td>{{ @contrepartie.quoi }}</td>
-                        </tr>
-                        </repeat>
-                    </table>
-                </div>
-            </div>
+            </div><!-- / Form historique -->
         </div>
-    </div><!-- / Form historique -->
-</div>
+</section>
 <section id="wrapper" class="text-center fluid">
     <div id="subtitle" class="row">
         <div class="page-header">
@@ -220,30 +220,31 @@
     </div>
     <div class="row"><!-- nouveau don -->
         <div class="row">
-            <button type="button" class="btn btn-lg btn-primary c-boutonscourts" data-toggle="modal" data-target="#ModaleConfirmation">{{ _("Faire un nouveau don")}}</button>
+            <div class="col-md-4 col-md-offset-4">
+                <a href="/#step1" type=""class="btn btn-lg btn-primary c-boutonscourts">{{ _("Faire un nouveau don")}}</a>
+            </div>
         </div>
     </div>
 </section>
 
 <section id="wrapper" class="text-center fluid">
-<div id="subtitle" class="row">
-    <div class="page-header">
-        <h2 class="text-left">{{ _("Demander des contreparties")}}</h2>
-    </div>
-    <!-- FIXME: Lien page contrepartie -->
-    <p class="text-left">{{ _("Pour débloquer les objets associés à un bonus, cliquez sur l'icône de celui-ci. Le montant disponible pour les objets sera déduit du montant du palier et les objets seront disponibles sur la page <a href=\"#\">Mes contreparties</a> pour en demander la livraison.")}}</p>
-    <div id="" class="row">
-        <form method="GET" action="{{ 'perso' | alias }}" name="contreparties">
-            <input type="hidden" name="validate" value="true">
-            <check if="{{ @infos.cumul >= 30 }}">
-            <div class="col-md-8 col-md-offset-2"><!-- piplome -->
-                <div class="panel panel-default">
-                    <div class="panel-body c-panelcontrepartie">
-                        <div class="col-md-1">
-                            <input type="checkbox" name="quoi" id="quoi1" class="" checked <check if="{{ @infos.cumul < 30 }}">disabled</check> value="piplome">
-                        </div>
-                        <div class="col-md-3 text-center">
-                            <p>
+    <div id="subtitle" class="row">
+        <div class="page-header">
+            <h2 class="text-left">{{ _("Demander des contreparties")}}</h2>
+        </div>
+        <p class="text-left">{{ _("Pour débloquer les objets associés à un bonus, cliquez sur l'icône de celui-ci. Le montant disponible pour les objets sera déduit du montant du palier et les objets seront disponibles sur la page <a href=\"#\">Mes contreparties</a> pour en demander la livraison.")}}</p>
+        <div id="" class="row">
+            <form method="GET" action="{{ 'perso' | alias }}" name="contreparties">
+                <input type="hidden" name="validate" value="true">
+                <check if="{{ @infos.cumul >= 30 }}">
+                <div class="col-md-8 col-md-offset-2"><!-- piplome -->
+                    <div class="panel panel-default">
+                        <div class="panel-body c-panelcontrepartie">
+                            <div class="col-md-1">
+                                <input type="radio" name="quoi" id="quoi1" class="" checked <check if="{{ @infos.cumul < 30 }}">disabled</check> value="piplome">
+                            </div>
+                            <div class="col-md-3 text-center">
+                                <p>
                                 <img class="" src="/static/img/piplome.svg" alt="">
                                 </p>
                             </div>
@@ -263,58 +264,59 @@
                             </div>
                         </div>
                     </div>
-                </div>
-            </div><!-- piplome -->
-            </check>
-            <check if="{{ @infos.cumul >= 50 }}">
-            <div class="col-md-8 col-md-offset-2"><!-- Pibag -->
-                <div class="panel panel-default">
-                    <div class="panel-body c-panelcontrepartie">
-                        <div class="col-md-1">
-                            <input type="checkbox" class="" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 50 }}">disabled</check> value="pibag">
-                        </div>
-                        <div class="col-md-3 text-center">
-                            <p>
+                </div><!-- piplome -->
+                </check>
+                <check if="{{ @infos.cumul >= 50 }}">
+                <div class="col-md-8 col-md-offset-2"><!-- Pibag -->
+                    <div class="panel panel-default">
+                        <div class="panel-body c-panelcontrepartie">
+                            <div class="col-md-1">
+                                <input type="radio" class="" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 50 }}">disabled</check> value="pibag">
+                            </div>
+                            <div class="col-md-3 text-center">
+                                <p>
                                 <img class="" src="/static/img/pibag2.svg" alt="">
-                            </p>
-                        </div>
-                        <div class="col-md-8">
-                            <div class="form-group text-left">
-                                <label for="quoi2">
-                                    <h3 class="text-left">{{ _("Pibag")}}</h3>
-                                </label>
+                                </p>
+                            </div>
+                            <div class="col-md-8">
+                                <div class="form-group text-left">
+                                    <label for="quoi2">
+                                        <h3 class="text-left">{{ _("Pibag")}}</h3>
+                                        <p>{{ _("Ainsi que le piplome.") }}</p>
+                                    </label>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
-            </div><!-- / Pibag -->
-            </check>
-            <check if="{{ @infos.cumul >= 100 }}">
-            <div class="col-md-8 col-md-offset-2"><!-- Pishirt -->
-                <div class="panel panel-default">
-                    <div class="panel-body c-panelcontrepartie">
-                        <div class="col-md-1">
-                            <input type="checkbox" class="" id="quoi3" name="quoi"<check if="{{ @infos.cumul < 100 }}">disabled</check> value="pishirt">
-                        </div>
-                        <div class="col-md-3 text-center">
-                            <p>
+                </div><!-- / Pibag -->
+                </check>
+                <check if="{{ @infos.cumul >= 100 }}">
+                <div class="col-md-8 col-md-offset-2"><!-- Pishirt -->
+                    <div class="panel panel-default">
+                        <div class="panel-body c-panelcontrepartie">
+                            <div class="col-md-1">
+                                <input type="radio" class="" id="quoi3" name="quoi" <check if="{{ @infos.cumul < 100 }}">disabled</check> value="pishirt">
+                            </div>
+                            <div class="col-md-3 text-center">
+                                <p>
                                 <img class="" src="/static/img/pishirt2.svg" alt="">
-                            </p>
-                        </div>
-                        <div class="col-md-8">
-                            <div class="form-group text-left">
-                                <label for="quoi3">
-                                    <h3 class="text-left">{{ _("Pi-Shirt")}}</h3>
-                                </label>
-                                <form class="text-left">
-                                    <div class="form-group text-left">
-                                        <label for="taille">{{ _("Taille") }}</label>
-                                        <select class="form-control" name="taille">
-                                        <repeat group="{{ @atailles }}" key="{{ @key }}" value="{{ @value }}">
-                                        <option value="{{ @key }}">{{ @value }}</option>
-                                        </repeat>
-                                        </select>
-                                    </div>
+                                </p>
+                            </div>
+                            <div class="col-md-8">
+                                <div class="form-group text-left">
+                                    <label for="quoi3">
+                                        <h3 class="text-left">{{ _("Pi-Shirt")}}</h3>
+                                        <p>{{ _("Ainsi que le piplome et le pibag.") }}</p>
+                                    </label>
+                                    <form class="text-left">
+                                        <div class="form-group text-left">
+                                            <label for="taille">{{ _("Taille") }}</label>
+                                            <select class="form-control" name="taille">
+                                                <repeat group="{{ @atailles }}" key="{{ @key }}" value="{{ @value }}">
+                                                <option value="{{ @key }}">{{ @value }}</option>
+                                                </repeat>
+                                            </select>
+                                        </div>
                                 </div>
                             </div>
                             <div class="c-prixcontrepartie">
@@ -322,35 +324,35 @@
                             </div>
                         </div>
                     </div>
-                </div>
-            </div><!-- / Pishirt -->
-            </check>
-            <check if="{{ @infos.cumul >= 250 }}">
-            <div class="col-md-8 col-md-offset-2"><!-- Hoopi -->
-                <div class="panel panel-default">
-                    <div class="panel-body c-panelcontrepartie">
-                        <div class="col-md-1">
-                            <input type="checkbox" class="" id="quoi4" name="quoi"<check if="{{ @infos.cumul < 250 }}">disabled</check> value="hoopie">
-                        </div>
-                        <div class="col-md-3 text-center">
-                            <p>
+                </div><!-- / Pishirt -->
+                </check>
+                <check if="{{ @infos.cumul >= 250 }}">
+                <div class="col-md-8 col-md-offset-2"><!-- Hoopi -->
+                    <div class="panel panel-default">
+                        <div class="panel-body c-panelcontrepartie">
+                            <div class="col-md-1">
+                                <input type="radio" class="" id="quoi4" name="quoi"<check if="{{ @infos.cumul < 250 }}">disabled</check> value="hoopie">
+                            </div>
+                            <div class="col-md-3 text-center">
+                                <p>
                                 <img class="media-object" src="/static/img/hoopie2.svg" alt="">
-                            </p>
-                        </div>
-                        <div class="col-md-8">
-                            <div class="form-group text-left">
-                                <label for="quoi4">
-                                    <h3 class="text-left">{{ _("Hoodie")}}</h3>
-                                </label>
-                                <form class="text-left">
-                                    <div class="form-group text-left">
-                                        <label for="taille">{{ _("Taille") }}</label>
-                                        <select name="taille_h" class="form-control">
-                                            <repeat group="{{ @atailles }}" key="{{ @key }}" value="{{ @value }}">
-                                            <option value="{{ @key }}">{{ @value }}</option>
-                                            </repeat>
-                                        </select>
-                                    </div>
+                                </p>
+                            </div>
+                            <div class="col-md-8">
+                                <div class="form-group text-left">
+                                    <label for="quoi4">
+                                        <h3 class="text-left">{{ _("Hoodie")}}</h3>
+                                        <p>{{ _("Ainsi que le pi-shirt, le piplome et le pibag.") }}</p>
+                                    </label>
+                                    <form class="text-left">
+                                        <div class="form-group text-left">
+                                            <label for="taille">{{ _("Taille") }}</label>
+                                            <select name="taille_h" class="form-control">
+                                                <repeat group="{{ @atailles }}" key="{{ @key }}" value="{{ @value }}">
+                                                <option value="{{ @key }}">{{ @value }}</option>
+                                                </repeat>
+                                            </select>
+                                        </div>
                                 </div>
                             </div>
                             <div class="c-prixcontrepartie">
@@ -358,30 +360,29 @@
                             </div>
                         </div>
                     </div>
-                </div>
-            </div><!-- / Hoopi -->
-            </check>
-            <check if="{{ count(@adresses) > 0 }}">
-            <div class="col-md-8 col-md-offset-2"><!-- Adresse -->
-                <div class="form-group form-inline">
-                    <label for="adresses">{{ _("Envoyer à l'adresse :")}}</label>
-                    <select class="form-control" name="adresse_id">
-                        <repeat group="{{ @adresses }}" value="{{ @adresse }}">
-                        <option value="{{ @adresse.id }}" <check if="{{ @adresse.defaut != 0 }}">selected</check>>{{ @adresse.alias }} - {{ @adresse.adresse }} {{@adresse.adresse2 }}</option>
-                        </repeat>
-                    </select>
-                </div>
-            </div><!-- / Adresse -->
-            <div class="col-md-8 col-md-offset-2"><!-- Bouton -->
-                <input type="submit" class="btn btn-lg btn-primary c-boutonscourts" value="{{ _('Envoyer')}}">
-            </div><!-- / bouton -->
-            </check>
-        </form>
+                </div><!-- / Hoopi -->
+                </check>
+                <check if="{{ count(@adresses) > 0 }}">
+                <div class="col-md-8 col-md-offset-2"><!-- Adresse -->
+                    <div class="form-group form-inline">
+                        <label for="adresses">{{ _("Envoyer à l'adresse :")}}</label>
+                        <select class="form-control" name="adresse_id">
+                            <repeat group="{{ @adresses }}" value="{{ @adresse }}">
+                            <option value="{{ @adresse.id }}" <check if="{{ @adresse.defaut != 0 }}">selected</check>>{{ @adresse.alias }} - {{ @adresse.adresse }} {{@adresse.adresse2 }}</option>
+                            </repeat>
+                        </select>
+                    </div>
+                </div><!-- / Adresse -->
+                <div class="col-md-8 col-md-offset-2"><!-- Bouton -->
+                    <input type="submit" class="btn btn-lg btn-primary c-boutonscourts" value="{{ _('Envoyer')}}">
+                </div><!-- / bouton -->
+                </check>
+            </form>
+        </div>
     </div>
 </section>
 
 <!-- Modale de confirmation -->
-<!-- TODO: Récupérer le contenu de la modale -->
 <!-- On utilise un GET /perso avec le formulaire précent pour peupler la modale -->
 <check if="{{ @modal_counterparts == 1 }}">
 <div class="modal fade show in" id="ModaleConfirmation" tabindex="-1" role="dialog">
@@ -398,28 +399,62 @@
                     {{ @adresses[@GET['adresse_id']].ville }}
                     </p>
                     <h3>{{ _("Récapitulatif&nbsp;:") }}</h3>
-                    <div class="media">
-                        <div class="media-left">
-                            <img class="media-object" src="" alt="{{ @GET['quoi']}}">
-                        </div>
-                        <div class="media-body">
-                            <p>{{ @GET['quoi'] }} {{ @GET['taille'] }}{{ @GET['taille_h']}}{{ @GET['piplome_id'] }}</p>
-                        </div>
-                    </div>
+                    <ul class="list-unstyled">
+                        <check if="{{ in_array(@GET['quoi'], array('piplome', 'pibag', 'pishirt', 'hoopie')) }}">
+                        <li class="media">
+                            <div class="media-left">
+                                <img class="media-object" src="/static/img/piplome.svg" alt="">
+                            </div>
+                            <div class="media-body">
+                                {{ _("Piplome") }}
+                            </div>
+                        </li>
+                        </check>
+                        <check if="{{ in_array(@GET['quoi'], array('pibag', 'pishirt', 'hoopie')) }}">
+                        <li class="media">
+                            <div class="media-left">
+                                <img class="media-object" src="/static/img/pibag.svg" alt="">
+                            </div>
+                            <div class="media-body">
+                                {{ _("Pibag") }}
+                            </div>
+                        </li>
+                        </check>
+                        <check if="{{ in_array(@GET['quoi'], array('pishirt', 'hoopie')) }}">
+                        <li class="media">
+                            <div class="media-left">
+                                <img class="media-object" src="/static/img/pishirt.svg" alt="">
+                            </div>
+                            <div class="media-body">
+                                {{ _("Pi-Shirt - Taille&nbsp;: @atailles[@taille]") }}
+                            </div>
+                        </li>
+                        </check>
+                        <check if="{{ in_array(@GET['quoi'], array('hoopie')) }}">
+                        <li class="media">
+                            <div class="media-left">
+                                <img class="media-object" src="/static/img/hoopie.svg" alt="">
+                            </div>
+                            <div class="media-body">
+                                {{ _("Hoopie - Taille&nbsp;: @atailles[@taille_h]") }}
+                            </div>
+                        </li>
+                        </check>
+                    </ul>
                 </div>
                 <div class="form-group text-left">
                     <label for="commentaire"><h3>{{ _("Un commentaire&nbsp;?") }}</h3></label>
                     <textarea class="form-control" id="commentaire" name="commentaire" placeholder="" row="3"></textarea>
-                <div class="modal-footer">
-                    <input type="hidden" name="csrf" value="{{ @CSRF }}">
-                    <repeat group="{{@GET}}" key="{{ @key }}" value="{{ @value }}">
-                    <input type="hidden" name="{{ @key }}" value="@value">
-                    </repeat>
-                    <a href="{{ 'perso' | alias }}" type="button" class="btn btn-default" data-dismiss="modal">Close</a>
-                    <input type="submit" class="btn btn-primary" value="{{ _('Valider') }}">
+                    <div class="modal-footer">
+                        <input type="hidden" name="csrf" value="{{ @CSRF }}">
+                        <repeat group="{{@GET}}" key="{{ @key }}" value="{{ @value }}">
+                        <input type="hidden" name="{{ @key }}" value="@value">
+                        </repeat>
+                        <a href="{{ 'perso' | alias }}" type="button" class="btn btn-default" data-dismiss="modal">Close</a>
+                        <input type="submit" class="btn btn-primary" value="{{ _('Valider') }}">
+                    </div>
                 </div>
             </div>
-        </div>
-    </form>
-</div>
+        </form>
+    </div>
 </check>
diff --git a/www/static/css/custom.css b/www/static/css/custom.css
index 94a93ccd51498fd3f60b9bf11240ff9acdb2dad5..e11fad69720ee0fc1e27c6d6438fb5a3c20359a7 100644
--- a/www/static/css/custom.css
+++ b/www/static/css/custom.css
@@ -234,4 +234,4 @@ transform: rotate(-90deg);
 }
 p { /* bootstrap.css ligne 1289 marge de 10px sous les p qui n'est utile nullepart  */
     margin:0;
-}
\ No newline at end of file
+}