diff --git a/templates/web/common/dialog_export.twig b/templates/web/common/dialog_export.twig
index acc0a4caed..27e8de089e 100644
--- a/templates/web/common/dialog_export.twig
+++ b/templates/web/common/dialog_export.twig
@@ -2,81 +2,61 @@
 
 {% macro print_ftp_form(datas) %}
     <div class="ftp_form ftp_form_{{datas.usr_id}}">
-        <table cellspacing="0" cellpadding="0" border="0" style="width:100%;">
-            <tr>
-                <td>
-                    <label for="addrFTP_{{datas.usr_id}}">{% trans 'phraseanet:: adresse' %}  ftp://</label>
-                </td>
-                <td>
-                    <input style="width:250px;" type="text" name="addr" id="addrFTP_{{datas.usr_id}}" value="{{datas.addrFTP}}" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="ftpssl_{{datas.usr_id}}">{% trans 'phraseanet:: utiliser SSL' %} </label>
-                </td>
-                <td>
-                    <input class="checkbox" type="checkbox" name="ssl" id="ftpssl_{{datas.usr_id}}" value="1" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="loginFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur identifiant' %} </label>
-                </td>
-                <td>
-                    <input style="width:250px;" type="text" name="login" id="loginFTP_{{datas.usr_id}}" value="{{datas.loginFTP}}" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="pwdFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur mot de passe' %} </label>
-                </td>
-                <td>
-                    <input style="width:250px;" type="password" name="pwd" id="pwdFTP_{{datas.usr_id}}" value="{{datas.pwdFTP}}" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="passifFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: Utiliser le mode passif' %} </label>
-                </td>
-                <td>
-                    <input value="1" type="checkbox" class="checkbox" name="passif" id="passifFTP_{{datas.usr_id}}" {% if datas.passifFTP %}checked="checked"{% endif %}  />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="retryFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: Nombre d\'essais max' %}   </label>
-                </td>
-                <td>
-                    <input style="width:250px;" type="text" name="nbretry" id="retryFTP_{{datas.usr_id}}" value="{{datas.retryFTP}}" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="destFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp:  repertoire de destination ftp' %} </label>
-                </td>
-                <td>
-                    <input style="width:250px;" type="text" name="destfolder" id="destFTP_{{datas.usr_id}}" value="{{datas.destFTP}}"" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="idMKDFOLD_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: creer un dossier' %}  </label>
-                </td>
-                <td>
-                    <input type="checkbox" class="checkbox ftp_folder_check" {% if datas.prefixFTPfolder != '' %}checked="checked"{% endif %} name="MKDFOLD" id="idMKDFOLD_{{datas.usr_id}}" value="MKDFOLD"  />
-                    <input style="width:250px;" type="text" name="NAMMKDFOLD" id="prefixFTPfolder_{{datas.usr_id}}" value="{{datas.prefixFTPfolder}}" {% if datas.prefixFTPfolder == '' %}disabled="disabled"{% endif %}/>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="logfile_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: ecrire un fichier de log' %}  </label>
-                </td>
-                <td>
-                    <input type="checkbox" class="checkbox ftp_logfile_check" name="logfile" id="logfile_{{datas.usr_id}}" value="1"  />
-                </td>
-            </tr>
-        </table>
+        <div class="control-group">
+            <label class="control-label" for="addrFTP_{{datas.usr_id}}">{% trans 'phraseanet:: adresse' %}  ftp://</label>
+            <div class="controls">
+                <input type="text" name="addr" id="addrFTP_{{datas.usr_id}}" value="{{datas.addrFTP}}" />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="ftpssl_{{datas.usr_id}}">{% trans 'phraseanet:: utiliser SSL' %}</label>
+            <div class="controls">
+                <input type="checkbox" name="ssl" id="ftpssl_{{datas.usr_id}}" value="1" />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="loginFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur identifiant' %}</label>
+            <div class="controls">
+                <input type="text" name="login" id="loginFTP_{{datas.usr_id}}" value="{{datas.loginFTP}}" />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="pwdFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur mot de passe' %}</label>
+            <div class="controls">
+                <input type="password" name="pwd" id="pwdFTP_{{datas.usr_id}}" value="{{datas.pwdFTP}}" />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="passifFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: Utiliser le mode passif' %}</label>
+            <div class="controls">
+                <input value="1" type="checkbox" name="passif" id="passifFTP_{{datas.usr_id}}" {% if datas.passifFTP %}checked="checked"{% endif %}  />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="retryFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: Nombre d\'essais max' %}</label>
+            <div class="controls">
+                <input type="text" name="nbretry" id="retryFTP_{{datas.usr_id}}" value="{{datas.retryFTP}}" />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="destFTP_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp:  repertoire de destination ftp' %}</label>
+            <div class="controls">
+                <input type="text" name="destfolder" id="destFTP_{{datas.usr_id}}" value="{{datas.destFTP}}" />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="idMKDFOLD_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: creer un dossier' %}</label>
+            <div class="controls">
+                <input type="checkbox" class="ftp_folder_check" {% if datas.prefixFTPfolder != '' %}checked="checked"{% endif %} name="MKDFOLD" id="idMKDFOLD_{{datas.usr_id}}" value="MKDFOLD"  />
+                <input type="text" name="NAMMKDFOLD" id="prefixFTPfolder_{{datas.usr_id}}" value="{{datas.prefixFTPfolder}}" {% if datas.prefixFTPfolder == '' %}disabled="disabled"{% endif %} />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="logfile_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: ecrire un fichier de log' %}</label>
+            <div class="controls">
+                <input type="checkbox" class=ftp_logfile_check" name="logfile" id="logfile_{{datas.usr_id}}" value="1" />
+            </div>
+        </div>
     </div>
 {% endmacro %}
 
@@ -170,7 +150,7 @@
                     <form action="/include/sendmailpage.php" method="post" target="sendmail_target" style="text-align: left;">
                         <input type="hidden" name="lst" value="{{lst}}"/>
                         <input type="hidden" name="ssttid" value="{{ssttid}}"/>
-                        <div style="margin: 10px 0 20px 0; padding: 0 10px;">
+                        <div>
                             {% trans 'export::mail: destinataire' %}
                             <input type="text" value="" name="destmail" class="required span4">
                             {% set my_email = user.get_email() %}
@@ -218,7 +198,7 @@
                         </div>
                         {% if download.has_business_fields_access() %}
                             <div class="businessfields" style="margin-left:20px;display:none;">
-                                <label for="business_sendmail">
+                                <label for="business_sendmail" class="checkbox">
                                     <input type="checkbox" name="businessfields" id="business_sendmail" value="1"  />
                                     {% trans 'Include Business-fields in caption' %}
                                 </label>
@@ -237,9 +217,9 @@
         {% endif %}
         {% if download.get_total_order() > 0 %}
             <div id="order">
-                <div style="margin:10px;">
-                    <h1>{% trans 'export::commande: bon de commande' %}</h1>
-                    <form method="post">
+                <div style="padding:10px; text-align: center;">
+                    <h4>{% trans 'export::commande: bon de commande' %}</h4>
+                    <form method="post" class="form-horizontal" style="text-align: left;">
                         <input type="hidden" name="lst" value="{{lst}}"/>
                         <input type="hidden" name="ssttid" value="{{ssttid}}"/>
                         <table cellspacing="0" cellpadding="0" border="0" style="width:100%;">
@@ -354,7 +334,7 @@
                         <div>
                             {% for name, values in download.get_display_orderable() %}
                                 {% if values.available > 0 %}
-                                    <div>
+                                    <div style="margin: 10px 0 20px 0; padding: 0 10px;">
                                         {% set docs_orderable = values.available %}
                                         {% trans %}{{docs_orderable}} documents commandes{% endtrans %}
                                         {% set docs_not_orderable = values.total - values.available %}
@@ -378,9 +358,9 @@
                             {% endfor %}
                         </div>
                         <div class="buttons_line">
-                            <button type="button" class="order_button">{% trans 'boutton::commander'%}</button>
+                            <button type="button" class="order_button btn btn-inverse">{% trans 'boutton::commander'%}</button>
                             <img class="order_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
-                            <button type="button" class="close_button">{% trans 'boutton::annuler'%}</button>
+                            <button type="button" class="close_button btn btn-inverse">{% trans 'boutton::annuler'%}</button>
                         </div>
                     </form>
                 </div>
@@ -388,18 +368,22 @@
         {% endif %}
         {% if download.get_total_ftp() > 0 %}
             <div id="ftp">
-                <div style="margin:10px;">
-                    <h1>{% trans 'export:: FTP' %}</h1>
-                    <form action="/include/exportsFTP.php" method="post" target="_blank">
+                <div style="padding:10px; text-align: center;">
+                    <h4>{% trans 'export:: FTP' %}</h4>
+                    <form action="/include/exportsFTP.php" method="post" target="_blank" class="form-horizontal" style="text-align: left;">
                         <input type="hidden" name="lst" value="{{lst}}"/>
                         <input type="hidden" name="ssttid" value="{{ssttid}}"/>
-                        <div>
-                            {% trans 'phraseanet:: prereglages'%}
-                            <select id="ftp_form_selector">
-                            {% for datas in download.get_ftp_datas() %}
-                                <option value="{{datas.usr_id}}">{{datas.name}}</option>
-                            {% endfor %}
-                            </select>
+                        <div class="control-group">
+                            <label class="control-label" for="ftp_form_selector">
+                                {% trans 'phraseanet:: prereglages'%}
+                            </label>
+                            <div class="controls">
+                                <select id="ftp_form_selector" class="span3">
+                                    {% for datas in download.get_ftp_datas() %}
+                                        <option value="{{datas.usr_id}}">{{datas.name}}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
                         </div>
                         <div id="ftp_form">
                             <div id="ftp_form_stock">
@@ -412,9 +396,11 @@
                             <p>{% trans 'export::mail: fichiers joint' %}</p>
                             {% for name, values in download.get_display_ftp() %}
                                 {% if values.available > 0 %}
-                                    <div>
-                                        <input class="checkbox {{values.class}}" type="checkbox" id="ftp_{{name}}" name="obj[]" value="{{name}}" />
-                                        <label for="ftp_{{name}}"> {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size|format_octets}}))</label>
+                                    <div style="margin: 10px 0 20px 0; padding: 0 10px;">
+                                        <label for="ftp_{{name}}" class="checkbox">
+                                            <input class="{{values.class}}" type="checkbox" id="ftp_{{name}}" name="obj[]" value="{{name}}" />
+                                            {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size|format_octets}}))
+                                        </label>
                                         {% set title%}
                                             {% trans 'Documents indisponibles' %}
                                         {% endset %}
@@ -433,16 +419,18 @@
                         </div>
                         {% if download.has_business_fields_access() %}
                             <div class="businessfields" style="margin-left:20px;display:none;">
-                                <input type="checkbox" class="checkbox" name="businessfields" id="business_ftp" value="1"  />
-                                <label for="business_ftp">{% trans 'Include Business-fields in caption' %}</label>
+                                <label for="business_ftp" class="checkbox">
+                                    <input type="checkbox" name="businessfields" id="business_ftp" value="1"  />
+                                    {% trans 'Include Business-fields in caption' %}
+                                </label>
                             </div>
                         {% endif %}
                         <div class="buttons_line">
-                            <button type="button" class="tryftp_button">{% trans 'boutton::essayer'%}</button>
+                            <button type="button" class="tryftp_button btn btn-inverse">{% trans 'boutton::essayer'%}</button>
                             <img class="tryftp_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
-                            <button type="button" class="ftp_button">{% trans 'boutton::envoyer'%}</button>
+                            <button type="button" class="ftp_button btn btn-inverse">{% trans 'boutton::envoyer'%}</button>
                             <img class="ftp_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
-                            <button type="button" class="close_button">{% trans 'boutton::annuler'%}</button>
+                            <button type="button" class="close_button btn btn-inverse">{% trans 'boutton::annuler'%}</button>
                         </div>
                     </form>
                 </div>
diff --git a/templates/web/prod/Baskets/Reorder.html.twig b/templates/web/prod/Baskets/Reorder.html.twig
index e348cda0d9..f685bce94c 100644
--- a/templates/web/prod/Baskets/Reorder.html.twig
+++ b/templates/web/prod/Baskets/Reorder.html.twig
@@ -1,34 +1,34 @@
 {% import 'common/thumbnail.html' as thumbnail %}
-  <div style="top:30px;overflow:auto;" id="reorder_box" class="PNB">
-    <div id="reorder_options" class="PNB" style="top:0; height:30px;bottom:auto;">
+<div id="reorder_box" class="PNB" style="top:10px; overflow:auto; padding:10px;">
+    <div id="reorder_options" style="height:32px; margin-bottom:10px;">
         <span>{% trans 'Reordonner automatiquement' %}</span>
         <select id="auto_order">
             <option value="">{% trans 'Choisir' %}</option>
             <option value="default">{% trans 'Re-initialiser' %}</option>
             <option value="title">{% trans 'Titre' %}</option>
         </select>
-        <button type="button" class="autoorder">{% trans 'Re-ordonner' %}</button>
-        <button type="button" class="reverseorder">{% trans 'Inverser' %}</button>
-        <form name="reorder" method="POST" action="/prod/baskets/{{ basket.getId() }}/reorder/" style="display:inline">
+        <button type="button" class="autoorder btn btn-inverse">{% trans 'Re-ordonner' %}</button>
+        <button type="button" class="reverseorder btn btn-inverse">{% trans 'Inverser' %}</button>
+        <form name="reorder" method="POST" action="/prod/baskets/{{ basket.getId() }}/reorder/" style="display:inline;">
         {% for element in basket.getElements() %}
-            <input type="hidden" name="element[{{ element.getId() }}]" value="{{ element.getOrd() }}"/>
+                <input type="hidden" name="element[{{ element.getId() }}]" value="{{ element.getOrd() }}"/>
         {% endfor %}
-        <button>{% trans 'boutton::valider' %}</button>
+        <button class="btn btn-inverse">{% trans 'boutton::valider' %}</button>
         </form>
     </div>
-    <div class="elements PNB" style="top: 40px;bottom:auto;">
+    <div class="elements">
     {% for element in basket.getElements() %}
-      <div id="ORDER_{{ element.getId() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
-        <div class="title" title="{{ element.getRecord().get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;">
-          <span>{{ element.getRecord().get_title() }}</span>
-          {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80, '', session) }}
-          <form style="display:none;">
-            <input type="hidden" name="id" value="{{ element.getId() }}"/>
-            <input type="hidden" name="title" value="{{ element.getRecord().get_title() }}"/>
-            <input type="hidden" name="default" value="{{ element.getOrd() }}"/>
-          </form>
+        <div id="ORDER_{{ element.getId() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
+            <div class="title" title="{{ element.getRecord().get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;">
+                <span>{{ element.getRecord().get_title() }}</span>
+                {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80, '', session) }}
+                <form style="display:none;">
+                    <input type="hidden" name="id" value="{{ element.getId() }}"/>
+                    <input type="hidden" name="title" value="{{ element.getRecord().get_title() }}"/>
+                    <input type="hidden" name="default" value="{{ element.getOrd() }}"/>
+                </form>
+            </div>
         </div>
-      </div>
     {% endfor %}
     </div>
 </div>
diff --git a/templates/web/prod/Baskets/Update.html.twig b/templates/web/prod/Baskets/Update.html.twig
index 2f14122f00..bcca838994 100644
--- a/templates/web/prod/Baskets/Update.html.twig
+++ b/templates/web/prod/Baskets/Update.html.twig
@@ -1,56 +1,46 @@
 <div>
-  <form action="/prod/baskets/{{ basket.getId() }}/update/" method="POST">
-    <div>
-      <label>{% trans 'panier:: nom' %}</label>
-    </div>
-    <div>
-      <input style="width:100%;margin:10px 0;" type="text" name="name" value="{{ basket.getName() }}"/>
-    </div>
-    <div>
-      <label>{% trans 'panier:: description' %}</label>
-    </div>
-    <div>
-      <textarea style="width:100%;height:120px;" name="description">{{ basket.getDescription() }}</textarea>
-    </div>
-    <div>
-      <button>{% trans 'boutton::valider' %}</button>
-    </div>
-  </form>
-  <script type="text/javascript">
-    $(document).ready(function(){
+    <form action="/prod/baskets/{{ basket.getId() }}/update/" method="POST" id="basket-rename-box">
+        <label style="margin:5px 0 0 0;">{% trans 'panier:: nom' %}</label>
+        <input type="text" name="name" value="{{ basket.getName() }}" style="width:98%;" />
+        <label style="margin:5px 0 0 0;">{% trans 'panier:: description' %}</label>
+        <textarea style="width:98%;height:120px;" name="description">{{ basket.getDescription() }}</textarea>
+        <button class="btn btn-inverse" style="margin: 5px 40%;">{% trans 'boutton::valider' %}</button>
+    </form>
+    <script type="text/javascript">
+      $(document).ready(function(){
 
-      $('#DIALOG form').bind('submit', function(event){
+        $('#DIALOG form').bind('submit', function(event){
 
-        //$this.SetLoader(true);
+          //$this.SetLoader(true);
 
-        var $form = $(this);
+          var $form = $(this);
 
-        $.ajax({
-          type: $form.attr('method'),
-          url: $form.attr('action'),
-          dataType: 'json',
-          data: $form.serializeArray(),
-          beforeSend:function(){
+          $.ajax({
+            type: $form.attr('method'),
+            url: $form.attr('action'),
+            dataType: 'json',
+            data: $form.serializeArray(),
+            beforeSend:function(){
 
-          },
-          success: function(data){
+            },
+            success: function(data){
 
-            return p4.WorkZone.refresh(data.basket.id);
-            $('#DIALOG').dialog('close').empty();
+              return p4.WorkZone.refresh(data.basket.id);
+              $('#DIALOG').dialog('close').empty();
 
-            return;
-          },
-          error: function(){
+              return;
+            },
+            error: function(){
 
-          },
-          timeout: function(){
+            },
+            timeout: function(){
 
-          }
+            }
+          });
+
+          return false;
         });
 
-        return false;
       });
-
-    });
-  </script>
+    </script>
 </div>
diff --git a/templates/web/prod/actions/Bridge/index.twig b/templates/web/prod/actions/Bridge/index.twig
index b6380e1cc1..3a451aa3c7 100644
--- a/templates/web/prod/actions/Bridge/index.twig
+++ b/templates/web/prod/actions/Bridge/index.twig
@@ -2,90 +2,84 @@
 {% import "common/thumbnail.html" as thumb %}
 
 <div class="PNB main_window">
-  <div id='publicator_selection' class="PNB10 ui-corner-all" style="height:190px;bottom:auto;background-color:#404040;">
-    <div class="PNB10" style="overflow:auto;bottom:50px;background-color:#111111;">
-      {% for id, record in route.get_elements %}
-        <div id='pub_record_{{record.get_serialize_key()}}' class="diapo">
-          <div class="title">{{ record.get_title() }}</div>
-          {{thumb.format(record.get_thumbnail, 80, 80, "", session, true)}}
+    <div id='publicator_selection' class="PNB10 ui-corner-all" style="height:190px;bottom:auto;background-color:#404040;">
+        <div class="PNB10" style="overflow:auto;bottom:50px;background-color:#111111;">
+            {% for id, record in route.get_elements %}
+                <div id='pub_record_{{record.get_serialize_key()}}' class="diapo">
+                    <div class="title">{{ record.get_title() }}</div>
+                    {{thumb.format(record.get_thumbnail, 80, 80, "", session, true)}}
+                </div>
+            {% endfor %}
         </div>
-      {% endfor %}
-    </div>
-    <form name="upload_form" method="GET" action="/prod/bridge/upload/">
-      <div class="PNB10 record_actions" style="top:auto;height:30px;text-align:right;">
-        <button class="single_menu act_upload">{% trans 'Upload' %}</button>
-      </div>
-      <input name="lst" type="hidden" value=""/>
-      <input name="account_id" type="hidden" value=""/>
-    </form>
-    <form name="current_datas">
-      {% for id, record in route.get_elements %}
-        <input type="hidden" name="element[]" value="{{record.get_serialize_key()}}" />
-      {% endfor %}
-      <input name="lst" type="hidden" value="{{route.get_serialize_list()}}"/>
-      <input name="account_id" type="hidden" value="{{current_account_id}}"/>
-    </form>
-  </div>
-
-
-    <div class="PNB" style="top:200px">
-      <div class="PNB10" id="pub_tabs" >
-        <ul id="ul_main_pub_tabs" class="PNB">
-          {% for account in user_accounts %}
-            <li class="li_{{ account.get_id() }} {% if not account.get_api().get_connector().is_configured() %}not_configured{% endif %} bridge_{{ account.get_api().get_connector().get_name() }} {% if account.get_id() == current_account_id %} ui-tabs-selected {% endif %}">
-              <a href="/prod/bridge/adapter/{{ account.get_id() }}/load-elements/{{ account.get_api().get_connector().get_default_element_type() }}/" class='account'>
-                <span style='display:block;float:left;'>{{ account.get_name() }}</span>
-                <input type="hidden" name="account_id" value="{{ account.get_id() }}" />
-              </a>
-            </li>
-          {% endfor %}
-          <li>
-            <a href="#tabs-new-account"> + {% trans 'nouveau' %}</a>
-          </li>
-        </ul>
-
-        <div id='tabs-new-account' class="PNB" >
-          <div class="PNB">
-            <div class="PNB10 container">
-              <div class="PNB10">
-                <div>{% trans 'Vers quel API voulez vous vous connecter ?' %}</div>
-                {% if available_apis|length > 0 %}
-                  {% for api in available_apis %}
-                    {% if api.get_connector().is_configured() %}
-                      <form style="float:left;margin:5px;">
-                        <button class="login_button new_bridge_button">
-                          <table style="border:none;width:250px;">
-                            <tr style="vertical-align:middle;">
-                              <td style="width:130px;">
-                                {% if api.get_connector().get_image_url() %}
-                                  <img src="{{ api.get_connector().get_image_url() }}" class="bridge_icon" />
-                                {% endif %}
-                              </td>
-                              <td>
-                                {{ api.get_connector().get_name() }}
-                              </td>
-                            </tr>
-                          </table>
-                        </button>
-                        <input type="hidden" name="url" value="{{api.generate_login_url(registry, api.get_connector().get_name()) }}" />
-                      </form>
-                    {% endif %}
-                  {% endfor %}
-                {% else %}
-                  {% trans 'Aucun bridge disponible. Veuillez contacté un administrateur.' %}
-                {% endif %}
-              </div>
+        <form name="upload_form" method="GET" action="/prod/bridge/upload/">
+            <div class="PNB10 record_actions" style="top:auto;height:30px;text-align:right;">
+                <button class="single_menu act_upload">{% trans 'Upload' %}</button>
+            </div>
+            <input name="lst" type="hidden" value=""/>
+            <input name="account_id" type="hidden" value=""/>
+        </form>
+        <form name="current_datas">
+            {% for id, record in route.get_elements %}
+                <input type="hidden" name="element[]" value="{{record.get_serialize_key()}}" />
+            {% endfor %}
+            <input name="lst" type="hidden" value="{{route.get_serialize_list()}}"/>
+            <input name="account_id" type="hidden" value="{{current_account_id}}"/>
+        </form>
+    </div>
+    <div class="PNB" style="top:200px">
+        <div class="PNB10" id="pub_tabs" >
+            <ul id="ul_main_pub_tabs" class="PNB">
+                {% for account in user_accounts %}
+                    <li class="li_{{ account.get_id() }} {% if not account.get_api().get_connector().is_configured() %}not_configured{% endif %} bridge_{{ account.get_api().get_connector().get_name() }} {% if account.get_id() == current_account_id %} ui-tabs-selected {% endif %}">
+                        <a href="/prod/bridge/adapter/{{ account.get_id() }}/load-elements/{{ account.get_api().get_connector().get_default_element_type() }}/" class='account'>
+                            <span style='display:block;float:left;'>{{ account.get_name() }}</span>
+                            <input type="hidden" name="account_id" value="{{ account.get_id() }}" />
+                        </a>
+                    </li>
+                {% endfor %}
+                <li>
+                    <a href="#tabs-new-account"> + {% trans 'nouveau' %}</a>
+                </li>
+            </ul>
+            <div id='tabs-new-account' class="PNB" >
+                <div class="PNB">
+                    <div class="PNB10 container">
+                        <div class="PNB10">
+                            <div>{% trans 'Vers quel API voulez vous vous connecter ?' %}</div>
+                            {% if available_apis|length > 0 %}
+                                {% for api in available_apis %}
+                                    {% if api.get_connector().is_configured() %}
+                                        <form style="float:left;margin:5px;">
+                                            <button class="login_button new_bridge_button">
+                                                <table style="border:none;width:250px;">
+                                                    <tr style="vertical-align:middle;">
+                                                        <td style="width:130px;">
+                                                            {% if api.get_connector().get_image_url() %}
+                                                                <img src="{{ api.get_connector().get_image_url() }}" class="bridge_icon" />
+                                                            {% endif %}
+                                                        </td>
+                                                        <td>
+                                                            {{ api.get_connector().get_name() }}
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </button>
+                                            <input type="hidden" name="url" value="{{api.generate_login_url(registry, api.get_connector().get_name()) }}" />
+                                        </form>
+                                    {% endif %}
+                                {% endfor %}
+                            {% else %}
+                                {% trans 'Aucun bridge disponible. Veuillez contacté un administrateur.' %}
+                            {% endif %}
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
     </div>
 </div>
-<div class="PNB upload_window" style="display:none;">
-
-</div>
-
 
+<div class="PNB upload_window" style="display:none;"></div>
 
 {# SCRIPT - HORIZONTAL TABS #}
 <script type ="text/javascript">
diff --git a/templates/web/prod/actions/Feedback/list.html.twig b/templates/web/prod/actions/Feedback/list.html.twig
index a35ebce083..dcc96a13ad 100644
--- a/templates/web/prod/actions/Feedback/list.html.twig
+++ b/templates/web/prod/actions/Feedback/list.html.twig
@@ -1,184 +1,174 @@
 {% import 'prod/actions/Feedback/ListsMacros.html.twig' as ListsMacros %}
 
 <div class="PNB10">
-  <div class="PNB" style="height:40px;bottom:auto;">
-    <table>
-      <tr>
-        <td style="white-space:nowrap;">
-          {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
-          <form method="POST" name="SaveName" action="/prod/lists/list/{{ list.getId() }}/update/">
-            <label>{% trans 'List Name' %}</label>
-            <input name="name" value="{{ list.getName() }}"/>
-            <button>
-              {% trans 'Save' %}
-            </button>
-          </form>
-          {% else %}
-            <h1>{{ list.getName() }}</h1>
-          {% endif %}
-        </td>
-        <td style="text-align:right;white-space:nowrap;">
-          {% if list.getOwner(user).getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
-          <a href="/prod/lists/list/{{ list.getId() }}/share/" title="{% trans 'Share the list' %}" class="list_sharer">
-            <img src="/skins/prod/Push/list-icon.png" />
-            {% trans "Set sharing permission" %}
-          </a>
-          {% endif %}
-        </td>
-        {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
-        <td style="text-align:right;white-space:nowrap;">
-          <button class="deleter">
-            {% trans 'Delete' %}
-            <input type="hidden" name="list_id" value="{{ list.getId() }}"/>
-          </button>
-        </td>
-        {% endif %}
-      </tr>
-    </table>
-  </div>
-  <div class="PNB content readonly" style="top:40px;">
-    <div class="PNB10">
-      <div class="PNB" style="height:25px;bottom:auto;">
-        <p>
-          {% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
-          {% trans %}
-            {{ length }} peoples
-          {% endtrans %}
-          {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
-            <button class="EditToggle">{% trans 'Edit' %}</button>
-          {% endif %}
-        </p>
-      </div>
-      <div class="PNB" style="top:35px;overflow:auto;">
-        {% set role = list.getOwner(user).getRole() %}
-        {% for entry in list.getEntries() %}
-          {{ ListsMacros.badgeReadonly(entry, role) }}
-        {% endfor %}
-      </div>
-    </div>
-  </div>
-  {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
-  <div class="PNB content readwrite" style="display:none;top:40px;">
-    <form name="list-editor-search" method="POST" action="/prod/push/edit-list/{{ list.getId() }}/">
-      <div class="PNB10" style="height:160px;">
-        <div class="PNB" style="height:40px;bottom:auto;">
-          <button class="Refresher" type="button">&lt;{% trans 'View' %}</button>
-          <select name="like_field">
-            <option value="usr_login">
-              {% trans 'Push::filter on login' %}
-            </option>
-            <option value="name">
-              {% trans 'Push::filter on name' %}
-            </option>
-            <option value="pays">
-              {% trans 'Push::filter on countries' %}
-            </option>
-            <option value="societe">
-              {% trans 'Push::filter on companies' %}
-            </option>
-            <option value="usr_mail">
-              {% trans 'Push::filter on emails' %}
-            </option>
-            <option value="lastModel">
-              {% trans 'Push::filter on templates' %}
-            </option>
-          </select>
-
-          {% trans 'Push::filter starts' %}
-          <input type="text" value="" class="search" name="query">
-          <button type="submit">
-            {% trans 'boutton::chercher' %}
-          </button>
-        </div>
-        <div class="PNB" style="top:40px;height:120px;bottom:auto;">
-          <table style="table-layout:fixed;width:100%;">
+    <div class="PNB theme-bg" style="height:40px; bottom:auto;">
+        <table style="height: 40px;">
             <tr>
-              <td>
-                <label>{% trans 'Activite' %}</label>
-              </td>
-              <td>
-                <label>{% trans 'Template' %}</label>
-              </td>
-              <td >
-                <label>{% trans 'Company' %}</label>
-              </td>
-              <td >
-                <label>{% trans 'Country' %}</label>
-              </td>
-              <td >
-                <label>{% trans 'Position' %}</label>
-              </td>
+                <td style="white-space:nowrap;">
+                    {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+                        <form class="form-inline" method="POST" name="SaveName" action="/prod/lists/list/{{ list.getId() }}/update/">
+                            <label>{% trans 'List Name' %}</label>
+                            <input type="text" name="name" style="margin: 0 5px;" value="{{ list.getName() }}"/>
+                            <button class="btn btn-inverse">{% trans 'Save' %}</button>
+                        </form>
+                    {% else %}
+                        <h1>{{ list.getName() }}</h1>
+                    {% endif %}
+                </td>
+                <td style="text-align:right;white-space:nowrap;">
+                    {% if list.getOwner(user).getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
+                        <a href="/prod/lists/list/{{ list.getId() }}/share/" title="{% trans 'Share the list' %}" class="list_sharer">
+                            <img src="/skins/prod/Push/list-icon.png" />
+                            {% trans "Set sharing permission" %}
+                        </a>
+                    {% endif %}
+                </td>
+                {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
+                    <td style="text-align:right;white-space:nowrap;">
+                        <button class="deleter btn btn-inverse">
+                            {% trans 'Delete' %}
+                            <input type="hidden" name="list_id" value="{{ list.getId() }}"/>
+                        </button>
+                    </td>
+                {% endif %}
             </tr>
-            <tr>
-              <td>
-                <select size="5" multiple="multiple" name="Activity[]" style="width:80%;">
-                  <option value="">{% trans 'All' %}</option>
-                  {% for Activity in query.getRelatedActivities() %}
-                    <option value="{{ Activity }}">{{ Activity }}</option>
-                  {% endfor %}
-                </select>
-              </td>
-              <td>
-                <select size="5" multiple="multiple" name="Template[]" style="width:80%;">
-                  <option value="">{% trans 'All' %}</option>
-                  {% for Template in query.getRelatedTemplates() %}
-                    <option value="{{ Template }}">{{ Template }}</option>
-                  {% endfor %}
-                </select>
-              </td>
-              <td>
-                <select size="5" multiple="multiple" name="Company[]" style="width:80%;">
-                  <option value="">{% trans 'All' %}</option>
-                  {% for Company in query.getRelatedCompanies() %}
-                    <option value="{{ Company }}">{{ Company }}</option>
-                  {% endfor %}
-                </select>
-              </td>
-              <td>
-
-                <select size="5" multiple="multiple" name="Country[]" style="width:80%;">
-                  <option value="">{% trans 'All' %}</option>
-                  {% for Code, Country in query.getRelatedCountries() %}
-                    <option value="{{ Code }}">{{ Country }}</option>
-                  {% endfor %}
-                </select>
-              </td>
-              <td >
-
-                <select size="5" multiple="multiple" name="Position[]" style="width:80%;">
-                  <option value="">{% trans 'All' %}</option>
-                  {% for Position in query.getRelatedPositions() %}
-                    <option value="{{ Position }}">{{ Position }}</option>
-                  {% endfor %}
-                </select>
-              </td>
-            </tr>
-          </table>
-        </div>
-      </div>
-
-      <input type="hidden" name="page" value="" />
-      <input type="hidden" name="srt" value="{{ sort }}" />
-      <input type="hidden" name="ord" value="{{ ord }}" />
-      <input type="hidden" name="type" value="fragment" />
-    </form>
-    <div class="PNB content" style="top:180px;">
-      <div class="PNB10">
-        {{ ListsMacros.ResultTable(query, results, list, sort, ord) }}
-      </div>
+        </table>
     </div>
-  </div>
-  {% endif %}
+    <div class="PNB content readonly grey-bg" style="top:40px;">
+        <div class="PNB10">
+            <div class="PNB" style="height:25px; bottom:auto;">
+                <p>
+                    {% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
+                    {% trans %}{{ length }} peoples{% endtrans %}
+                    {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+                        <button class="EditToggle btn btn-inverse">{% trans 'Edit' %}</button>
+                    {% endif %}
+                </p>
+            </div>
+            <div class="PNB" style="top:35px;overflow:auto;">
+                {% set role = list.getOwner(user).getRole() %}
+                {% for entry in list.getEntries() %}
+                    {{ ListsMacros.badgeReadonly(entry, role) }}
+                {% endfor %}
+            </div>
+        </div>
+    </div>
+    {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+        <div class="PNB content readwrite grey-bg" style="display:none;top:40px;">
+            <form name="list-editor-search" method="POST" action="/prod/push/edit-list/{{ list.getId() }}/">
+                <div class="PNB10" style="height:160px;">
+                    <div class="PNB" style="height:40px;bottom:auto;">
+                        <button class="Refresher btn btn-inverse" type="button">&lt;{% trans 'View' %}</button>
+                        <select name="like_field">
+                            <option value="usr_login">
+                                {% trans 'Push::filter on login' %}
+                            </option>
+                            <option value="name">
+                                {% trans 'Push::filter on name' %}
+                            </option>
+                            <option value="pays">
+                                {% trans 'Push::filter on countries' %}
+                            </option>
+                            <option value="societe">
+                                {% trans 'Push::filter on companies' %}
+                            </option>
+                            <option value="usr_mail">
+                                {% trans 'Push::filter on emails' %}
+                            </option>
+                            <option value="lastModel">
+                                {% trans 'Push::filter on templates' %}
+                            </option>
+                        </select>
+                        {% trans 'Push::filter starts' %}
+                        <input type="text" value="" class="search" name="query">
+                        <button type="submit" class="btn btn-inverse">{% trans 'boutton::chercher' %}</button>
+                    </div>
+                    <div class="PNB" style="top:40px;height:120px;bottom:auto;">
+                        <table style="table-layout:fixed;width:100%;">
+                            <tr>
+                                <td>
+                                    <label>{% trans 'Activite' %}</label>
+                                </td>
+                                <td>
+                                    <label>{% trans 'Template' %}</label>
+                                </td>
+                                <td >
+                                    <label>{% trans 'Company' %}</label>
+                                </td>
+                                <td >
+                                    <label>{% trans 'Country' %}</label>
+                                </td>
+                                <td >
+                                    <label>{% trans 'Position' %}</label>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select size="5" multiple="multiple" name="Activity[]" style="width:80%;">
+                                        <option value="">{% trans 'All' %}</option>
+                                        {% for Activity in query.getRelatedActivities() %}
+                                            <option value="{{ Activity }}">{{ Activity }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </td>
+                                <td>
+                                    <select size="5" multiple="multiple" name="Template[]" style="width:80%;">
+                                        <option value="">{% trans 'All' %}</option>
+                                        {% for Template in query.getRelatedTemplates() %}
+                                            <option value="{{ Template }}">{{ Template }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </td>
+                                <td>
+                                    <select size="5" multiple="multiple" name="Company[]" style="width:80%;">
+                                        <option value="">{% trans 'All' %}</option>
+                                        {% for Company in query.getRelatedCompanies() %}
+                                            <option value="{{ Company }}">{{ Company }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </td>
+                                <td>
+                                    <select size="5" multiple="multiple" name="Country[]" style="width:80%;">
+                                        <option value="">{% trans 'All' %}</option>
+                                        {% for Code, Country in query.getRelatedCountries() %}
+                                            <option value="{{ Code }}">{{ Country }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </td>
+                                <td>
+                                    <select size="5" multiple="multiple" name="Position[]" style="width:80%;">
+                                        <option value="">{% trans 'All' %}</option>
+                                        {% for Position in query.getRelatedPositions() %}
+                                            <option value="{{ Position }}">{{ Position }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+                <input type="hidden" name="page" value="" />
+                <input type="hidden" name="srt" value="{{ sort }}" />
+                <input type="hidden" name="ord" value="{{ ord }}" />
+                <input type="hidden" name="type" value="fragment" />
+            </form>
+            <div class="PNB content" style="top:180px;">
+                <div class="PNB10">
+                    {{ ListsMacros.ResultTable(query, results, list, sort, ord) }}
+                </div>
+            </div>
+        </div>
+    {% endif %}
 </div>
 <script type="text/javascript">
-  $(document).ready(function(){
-    p4.ListManager.workOn({{ list.getId() }});
-    $("#ListManager .readonly .badge .deleter").click(function(){
-      var badge = $(this).closest(".badge");
-      var usr_id = badge.find('input[name="id"]').val();
-      p4.ListManager.getList().removeUser(usr_id, function(list, data){
-        badge.remove();
-      });
+    $(document).ready(function(){
+        p4.ListManager.workOn({{ list.getId() }});
+        $("#ListManager .readonly .badge .deleter").click(function(){
+            var badge = $(this).closest(".badge");
+            var usr_id = badge.find('input[name="id"]').val();
+            p4.ListManager.getList().removeUser(usr_id, function(list, data){
+            badge.remove();
+            });
+        });
     });
-  });
 </script>
diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig
index 7702155416..b2caedc5cb 100644
--- a/templates/web/prod/actions/Push.html.twig
+++ b/templates/web/prod/actions/Push.html.twig
@@ -1,274 +1,247 @@
 <div class="PNB PushBox" id="PushBox" >
-  <div class="PNB" style="width:205px;">
-    <div class="PNB10 LeftColumn">
-      <div class="PNB" style="height:130px;bottom:auto;text-align:center;">
-        {% if context == 'Push' %}
-        <img style="margin:30px 0;" src="/skins/icons/push64.png"/>
-        {% else %}
-        <img style="margin:30px 0;" src="/skins/icons/Feedback60.png"/>
-        {% endif %}
-      </div>
-      <div class="PNB content" style="top:150px;overflow-y:auto;">
-        <div style="padding:10px">
-          <h1>{% trans 'Grant rights' %}</h1>
-          <ul class="general_togglers">
-            {% if context == 'Feedback' %}
-            <li>
-               <button type="button" class="general_toggler" feature="agree">
-                {% trans 'Contributor' %}
-              </button>
-            </li>
-            <li>
-              <button type="button" class="general_toggler" feature="see_others">
-                {% trans 'See others' %}
-              </button>
-            </li>
-            {% endif %}
-            <li>
-                <button type="button" class="general_toggler" feature="HD">
-                {% trans 'HD Download' %}
-                </button>
-            </li>
-          </ul>
-        </div>
-        <div style="padding:10px;">
-          <h1>
-            {% trans 'Lists' %}
-          </h1>
-          <span style="width:100%;display:block;text-align:center;">
-            <a href="#" class="link list_manager">
-              <b>{% trans 'List Manager' %}</b>
-            </a>
-          </span>
-          <div>
-            <form class="list_saver">
-            <table>
-              <tbody>
-                <tr>
-                  <td>
-                    <input name="name" placeholder="{% trans 'Save this list' %}"/>
-                   </td>
-                  <td>
-                    <button>
-                      <img src="/skins/prod/Push/save_list_as.png" />
-                    </button>
-                   </td>
-                 </tr>
-              </tbody>
-            </table>
-            </form>
-          </div>
-          <ul class="list">
-            {% for list in lists %}
-              <li class="list" style="padding:2px;">
-                <a class="list_loader" href="/prod/push/list/{{ list.getId() }}/">
-                  {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
-                    <img src="/skins/prod/Push/list-icon.png" />
-                  {% else %}
-                    <img src="/skins/icons/SHARE16.png" />
-                  {% endif %}
-                  {{ list.getName() }}
-                  ({{ list.getEntries().count() }})
-                </a>
-              </li>
-            {% endfor %}
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="PNB" style="left:205px;">
-    <div class="PNB" style="height:150px;bottom:auto;line-height:26px">
-      <div class="PNB10">
-        <table>
-          <tr style="vertical-align:top;">
-            <td>
-              <div id="find-user">
-                <input class="search" name="users-search" placeholder="{% trans 'Users' %}" type="text" style="width:210px;"/>
-                <br/>
-                {% trans 'Select a user in the list'%} <br/>
-                {% if user.ACL().has_right('manageusers') %}
-                  {% trans 'or' %}
-                  <a href="/prod/push/add-user/" class="user_adder link">{% trans 'Add user' %}</a>
-                {% endif %}
-              </div>
-              <p id="recommanded-users">
-
-                {% set recommendation = '' %}
-
-                {% set total = RecommendedUsers|length %}
-
-                {% for user in RecommendedUsers %}
-
-                  {% if total <= 4 or loop.index <= 4 %}
-                    {% if recommendation != '' and not loop.last %}
-                      {% set recommendation = recommendation ~ ', ' %}
-                    {% elseif recommendation != '' and loop.last %}
-                      {% set recommendation = recommendation %}
-                    {% endif %}
-                    {% set recommendation = recommendation
-                    ~ ' <a href="#" class="recommended_users UserTips" tooltipsrc="/prod/tooltip/user/'
-                    ~ user.get_id() ~ '/" >'
-                    ~ '<input type="hidden" name="usr_id" value="' ~ user.get_id() ~ '" />'
-                    ~ user.get_display_name()
-                    ~ '</a>' %}
-                  {% endif %}
-
-                {% endfor %}
-
-                {% if total > 4 %}
-                  {% set n = total - 4%}
-                  {% set and_many_more %}
-                    {% trans %}
-                      and {{ n }} more peoples
-                    {% endtrans %}
-                  {% endset %}
-                  {% set recommendation = recommendation
-                              ~ '<a href="#" class="recommended_users_list">'
-                              ~ and_many_more ~ '</a>' %}
-                {% endif %}
-
-
-                {% if recommendation != '' %}
-                  {% set recommendation = '<br/>' ~ recommendation %}
-                   {% if context == 'Push' %}
-                        {% trans %}
-                            Please consider send this push to the following users : {{ recommendation }}
-                        {% endtrans %}
-                   {% else %}
-                        {% trans %}
-                            Please consider send this validation to the following users : {{ recommendation }}
-                        {% endtrans %}
-                    {% endif %}
-                {% endif %}
-              </p>
-
-              <div style="display:none;" id="push_user_recommendations" title="{% trans 'Users suggestion' %}" >
-                <table class="users" style="width:100%;">
-                  {% for user in RecommendedUsers %}
-                  <tr>
-                    <td>
-                      <img src="/skins/icons/user.png"/>
-                    </td>
-                    <td>
-                      {{ user.get_display_name() }}
-                      <input type="hidden" name="usr_id" value="{{ user.get_id() }}" />
-                    </td>
-                    <td>
-                      <a href="#" class="adder">
-                        {% trans 'Add' %}
-                      </a>
-                    </td>
-                  </tr>
-                  {% endfor %}
-                </table>
-              </div>
-            </td>
-            <td style="width:10px;">
-            </td>
-            <td>
-              <p>
+    <div class="PNB" style="width:205px;">
+        <div class="PNB10 LeftColumn">
+            <div class="PNB" style="height:130px; text-align:center;">
                 {% if context == 'Push' %}
-                  {% trans 'Push::unpush permet d\'envoyer un lot d\'image a des destinataires' %}
+                    <img style="margin:30px 0;" src="/skins/icons/push64.png"/>
                 {% else %}
-                  {% trans 'Push::une validation est une demande d\'appreciation a d\'autres personnes' %}
+                    <img style="margin:30px 0;" src="/skins/icons/Feedback60.png"/>
                 {% endif %}
-              </p>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div class="PNB" style="top:150px;">
-      <div class="PNB10 content user_content">
-        <div class="PNB10 header">
-          <table style="table-layout:auto;">
-            <tr>
-              <td>
-              </td>
-              <td class="options">
-                <button class="select-all">{% trans 'Select all' %}</button>
-                <button class="unselect-all">{% trans 'Deselect all' %}</button>
-              </td>
-            </tr>
-          </table>
+            </div>
+            <div class="PNB content" style="top:150px; overflow-y:auto;">
+                <div style="padding:10px">
+                    <h1>{% trans 'Grant rights' %}</h1>
+                    <ul class="general_togglers">
+                    {% if context == 'Feedback' %}
+                        <li>
+                            <button type="button" class="general_toggler btn btn-inverse" feature="agree">
+                                {% trans 'Contributor' %}
+                            </button>
+                        </li>
+                        <li>
+                            <button type="button" class="general_toggler btn btn-inverse" feature="see_others">
+                                {% trans 'See others' %}
+                            </button>
+                        </li>
+                    {% endif %}
+                        <li>
+                            <button type="button" class="general_toggler btn btn-inverse" feature="HD">
+                                {% trans 'HD Download' %}
+                            </button>
+                        </li>
+                    </ul>
+                </div>
+                <div style="padding:10px;">
+                    <h1>{% trans 'Lists' %}</h1>
+                    <span style="width:100%; display:block; text-align:center;">
+                        <a href="#" class="link list_manager">
+                            <b>{% trans 'List Manager' %}</b>
+                        </a>
+                    </span>
+                    <form class="list_saver">
+                        <div class="btn-toolbar">
+                            <input type="text" name="name" placeholder="{% trans 'Save this list' %}" />
+                            <button class="btn"><img src="/skins/prod/Push/save_list_as.png" /></button>
+                        </div>
+                    </form>
+                    <ul class="list">
+                        {% for list in lists %}
+                            <li class="list" style="padding:2px;">
+                                <a class="list_loader" href="/prod/push/list/{{ list.getId() }}/">
+                                    {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+                                        <img src="/skins/prod/Push/list-icon.png" />
+                                    {% else %}
+                                        <img src="/skins/icons/SHARE16.png" />
+                                    {% endif %}
+                                    {{ list.getName() }}
+                                    ({{ list.getEntries().count() }})
+                                </a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="PNB" style="left:205px;">
+        <div class="PNB" style="height:150px;bottom:auto;line-height:26px">
+            <div class="PNB10">
+                <table>
+                    <tr style="vertical-align:top;">
+                        <td>
+                            <div id="find-user">
+                                <input class="search" name="users-search" placeholder="{% trans 'Users' %}" type="text" style="width:210px;"/>
+                                <br/>
+                                {% trans 'Select a user in the list'%} <br/>
+                                {% if user.ACL().has_right('manageusers') %}
+                                    {% trans 'or' %}
+                                    <a href="/prod/push/add-user/" class="user_adder link">{% trans 'Add user' %}</a>
+                                {% endif %}
+                            </div>
+                            <p id="recommanded-users">
+                                {% set recommendation = '' %}
+                                {% set total = RecommendedUsers|length %}
+
+                                {% for user in RecommendedUsers %}
+                                    {% if total <= 4 or loop.index <= 4 %}
+                                        {% if recommendation != '' and not loop.last %}
+                                            {% set recommendation = recommendation ~ ', ' %}
+                                        {% elseif recommendation != '' and loop.last %}
+                                            {% set recommendation = recommendation %}
+                                        {% endif %}
+                                        {% set recommendation = recommendation
+                                        ~ ' <a href="#" class="recommended_users UserTips" tooltipsrc="/prod/tooltip/user/'
+                                        ~ user.get_id() ~ '/" >'
+                                        ~ '<input type="hidden" name="usr_id" value="' ~ user.get_id() ~ '" />'
+                                        ~ user.get_display_name()
+                                        ~ '</a>' %}
+                                    {% endif %}
+                                {% endfor %}
+
+                                {% if total > 4 %}
+                                    {% set n = total - 4%}
+                                    {% set and_many_more %}
+                                        {% trans %}
+                                            and {{ n }} more peoples
+                                        {% endtrans %}
+                                    {% endset %}
+                                    {% set recommendation = recommendation
+                                            ~ '<a href="#" class="recommended_users_list">'
+                                            ~ and_many_more ~ '</a>' %}
+                                {% endif %}
+
+                                {% if recommendation != '' %}
+                                    {% set recommendation = '<br/>' ~ recommendation %}
+                                    {% if context == 'Push' %}
+                                        {% trans %}
+                                            Please consider send this push to the following users : {{ recommendation }}
+                                        {% endtrans %}
+                                    {% else %}
+                                        {% trans %}
+                                            Please consider send this validation to the following users : {{ recommendation }}
+                                        {% endtrans %}
+                                    {% endif %}
+                                {% endif %}
+                            </p>
+
+                            <div style="display:none;" id="push_user_recommendations" title="{% trans 'Users suggestion' %}" >
+                                <table class="users" style="width:100%;">
+                                    {% for user in RecommendedUsers %}
+                                        <tr>
+                                            <td>
+                                                <img src="/skins/icons/user.png"/>
+                                            </td>
+                                            <td>
+                                                {{ user.get_display_name() }}
+                                                <input type="hidden" name="usr_id" value="{{ user.get_id() }}" />
+                                            </td>
+                                            <td>
+                                                <a href="#" class="adder">{% trans 'Add' %}</a>
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                </table>
+                            </div>
+                        </td>
+                        <td style="width:10px;"></td>
+                        <td>
+                            <p>
+                                {% if context == 'Push' %}
+                                    {% trans 'Push::unpush permet d\'envoyer un lot d\'image a des destinataires' %}
+                                {% else %}
+                                    {% trans 'Push::une validation est une demande d\'appreciation a d\'autres personnes' %}
+                                {% endif %}
+                            </p>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+        <div class="PNB" style="top:150px;">
+            <div class="PNB10 content user_content grey-bg">
+                <div class="PNB10 header">
+                    <table style="table-layout:auto;">
+                        <tr>
+                            <td>
+                            </td>
+                            <td class="options">
+                                <button class="select-all btn btn-inverse">{% trans 'Select all' %}</button>
+                                <button class="unselect-all btn btn-inverse">{% trans 'Deselect all' %}</button>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <form name="FeedBackForm" method="post"
+                    {% if context == 'Push' %}
+                        action="/prod/push/send/"
+                    {% else %}
+                        action="/prod/push/validate/"
+                    {% endif %}
+                >
+                    <input name="lst" type="hidden" value="{{ push.get_serialize_list() }}" />
+                    <input name="ssel" type="hidden" value="{% if push.get_original_basket() %}{{ push.get_original_basket().getId() }}{% endif %}" />
+                    <input name="name" type="hidden" value="{% if push.get_original_basket() %}{{ push.get_original_basket().getName() }}{% endif %}" />
+                    <textarea name="message" style="display:none;"></textarea>
+                    <input type="hidden" name="duration" value=""/>
+                    <input type="checkbox" value="1" name="recept" style="display:none;"/>
+                    <div class="PNB badges"></div>
+                </form>
+                <div class="PNB10 footer">
+                    <button class="FeedbackSend btn btn-inverse">{% trans "Send" %}</button>
+                </div>
+            </div>
         </div>
-        <form name="FeedBackForm" method="post"
-          {% if context == 'Push' %}
-          action="/prod/push/send/"
-          {% else %}
-          action="/prod/push/validate/"
-          {% endif %}
-           >
-          <input name="lst" type="hidden" value="{{ push.get_serialize_list() }}" />
-          <input name="ssel" type="hidden" value="{% if push.get_original_basket() %}{{ push.get_original_basket().getId() }}{% endif %}" />
-          <input name="name" type="hidden" value="{% if push.get_original_basket() %}{{ push.get_original_basket().getName() }}{% endif %}" />
-          <textarea name="message" style="display:none;"></textarea>
-          <input type="hidden" name="duration" value=""/>
-          <input type="checkbox" value="1" name="recept" style="display:none;"/>
-          <div class="PNB badges">
-          </div>
-        </form>
-        <div class="PNB10 footer">
-        <button class="FeedbackSend">
-          {% trans "Send" %}
-        </button>
-      </div>
-      </div>
     </div>
-  </div>
 </div>
+
 <div id="ListManager" class="PNB PushBox" style="display:none;">
-  <div class="PNB" style="left:10px;height:30px;bottom:auto;">
-    <h1>
-      <button class="back_link">
-        &lt;
-        {% if context == 'Push' %}
-          {% trans 'Back to Push' %}
-        {% else %}
-          {% trans 'Back to Feedback' %}
-        {% endif %}
-      </button>
-      <span class="title">
-        {% trans 'List Manager' %}
-      </span>
-    </h1>
-  </div>
-  <div class="PNB" style="top:30px;">
-    <div class="PNB" style="width:320px;right:auto;">
-      <div class="PNB10 content all-lists LeftColumn">
-        {% include 'prod/actions/Feedback/lists-all.html.twig' %}
-      </div>
+    <div class="PNB theme-bg" style="left:10px;height:30px;bottom:auto;">
+        <h1>
+            <button class="back_link btn btn-inverse" style="margin-right: 5px;">
+                &lt;
+                {% if context == 'Push' %}
+                    {% trans 'Back to Push' %}
+                {% else %}
+                    {% trans 'Back to Feedback' %}
+                {% endif %}
+            </button>
+            <span class="title">
+                {% trans 'List Manager' %}
+            </span>
+        </h1>
     </div>
-    <div class="editor PNB" style="left:320px;">
-      <div class="welcome">
-        <h1>{% trans 'Welcome to the ListManager !' %}</h1>
-        {% if lists|length == 0 %}
-        <p class="welcome">
-          {% trans 'Start by creating one by using the "add" button on the left !' %}
-        </p>
-        {% else %}
-        <p class="welcome">
-          {% trans 'Select a list on the left and edit it !' %}
-        </p>
-        {% endif %}
-      </div>
+    <div class="PNB" style="top:30px;">
+        <div class="PNB" style="width:320px;right:auto;">
+            <div class="PNB10 content all-lists LeftColumn">
+                {% include 'prod/actions/Feedback/lists-all.html.twig' %}
+            </div>
+        </div>
+        <div class="editor PNB" style="left:320px;">
+            <div class="welcome">
+                <h1>{% trans 'Welcome to the ListManager !' %}</h1>
+                {% if lists|length == 0 %}
+                    <p class="welcome">
+                        {% trans 'Start by creating one by using the "add" button on the left !' %}
+                    </p>
+                {% else %}
+                    <p class="welcome">
+                        {% trans 'Select a list on the left and edit it !' %}
+                    </p>
+                {% endif %}
+            </div>
+        </div>
     </div>
-  </div>
 </div>
+
 <div id="FeedbackSendForm">
-  <form method="post">
-
-
-  </form>
+    <form method="post"></form>
 </div>
+
 <script type="text/javascript">
-  $(document).ready(function(){
+    $(document).ready(function(){
 
     p4.Feedback = new Feedback($('#PushBox'), '{{ context }}');
     p4.ListManager = new ListManager($('#ListManager'));
 
-    $(".general_toggler").button();
-
-  });
+    });
 </script>
diff --git a/templates/web/prod/actions/publish/publish.html b/templates/web/prod/actions/publish/publish.html
index 070964bfd4..5cbcebc62a 100644
--- a/templates/web/prod/actions/publish/publish.html
+++ b/templates/web/prod/actions/publish/publish.html
@@ -1,90 +1,92 @@
-
 {% macro format_diapo(record, session) %}
-  {% import 'common/thumbnail.html' as thumbnail %}
-  <div class="diapo">
-    {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
-  </div>
+    {% import 'common/thumbnail.html' as thumbnail %}
+    <div class="diapo">
+        {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
+    </div>
 {% endmacro %}
-<style type="text/css">
-.record_list .sortable.ui-sortable-placeholder{
-  width:112px;
-  height:118px;
-  position:relative;
-  float:left;
-}
-</style>
-<div class="PNB" style="height:200px;bottom:auto;">
-  <div class="PNB10 record_list" style="overflow:auto;">
-  {% for record in publishing.get_elements %}
-      <div class="sortable" style="position:relative;float:left;">
-        {{ _self.format_diapo(record, session) }}
-        <form>
-          <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
-          <input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
-        </form>
-      </div>
-  {% endfor %}
-  </div>
-</div>
-<form class="main_form" method="post" action="/prod/feeds/entry/create/">
-  <input type="hidden" name="lst" value="{{ publishing.get_serialize_list() }}" />
-  <div class="PNB" style="top:200px;bottom:50px;">
-    <div class="PNB" style="width:50%;right:auto;">
-      <div class="PNB10 fields">
-        {% set title = '' %}
-        {% set desc = '' %}
-        {% if publishing.is_basket() %}
-          {% set title = publishing.get_original_basket().getName() %}
-          {% set desc = publishing.get_original_basket().getDescription() %}
-        {% endif %}
-        <div><label for="feed_add_title">{% trans 'publication : titre' %}</label></div>
-        <div><input class="required_text" type="text" name="title" id="feed_add_title" value="{{title}}" /></div>
-        <div><label for="feed_add_subtitle">{% trans 'publication : sous titre' %}</label></div>
-        <div><textarea id="feed_add_subtitle" name="subtitle">{{desc}}</textarea></div>
-        <div><label for="feed_add_author_name">{% trans 'publication : autheur' %}</label></div>
-        <div><input class="required_text" type="text" name="author_name" id="feed_add_author_name" value="{{ user.get_display_name() }}" /></div>
-        <div><label for="feed_add_author_mail">{% trans 'publication : email autheur' %}</label></div>
-        <div><input class="required_text" type="text" name="author_mail" id="feed_add_author_mail" value="{{ user.get_email() }}" /></div>
-      </div>
-    </div>
-    <div class="PNB" style="width:50%;left:auto;">
-      <div class="PNB10 feeds">
-        <h1>{% trans 'Fils disponibles' %}</h1>
-        <div class="list">
-          {% for feed in feeds.get_feeds() %}
-            {% if feed.is_publisher(user) %}
-              <div class="feed {% if loop.index is odd%}odd{% endif %}">
-                <span>{{ feed.get_title() }}</span>
-                {% if feed.is_public() %}
-                <img src="/skins/icons/ligth-on.png" title="{% trans 'This feed is public' %}"/>
-                 {% endif %}
-                <input type="hidden" value="{{ feed.get_id() }}"/>
-              </div>
-            {% endif %}
-          {% endfor %}
-          <input type="hidden" value="" name="feed_id" />
-        </div>
 
-      </div>
+<style type="text/css">
+    .record_list .sortable.ui-sortable-placeholder{
+        width:112px;
+        height:118px;
+        position:relative;
+        float:left;
+    }
+</style>
+
+<div class="PNB" style="height:200px;bottom:auto;">
+    <div class="PNB10 record_list" style="overflow:auto;">
+        {% for record in publishing.get_elements %}
+            <div class="sortable" style="position:relative;float:left;">
+                {{ _self.format_diapo(record, session) }}
+                <form>
+                    <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
+                    <input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
+                </form>
+            </div>
+        {% endfor %}
     </div>
-  </div>
-  <div class="PNB" style="top:auto;height:50px;text-align:center;">
-    <div class="PNB10">
-      <button class="valid_form">{% trans 'boutton::publier' %}</button>
-      <button class="close_dialog">{% trans 'boutton::annuler' %}</button>
+</div>
+
+<form class="main_form" method="post" action="/prod/feeds/entry/create/">
+    <input type="hidden" name="lst" value="{{ publishing.get_serialize_list() }}" />
+    <div class="PNB" style="top:200px; bottom:50px;">
+        <div class="PNB" style="width:50%; right:auto;">
+            <div class="PNB10 fields">
+                {% set title = '' %}
+                {% set desc = '' %}
+                {% if publishing.is_basket() %}
+                    {% set title = publishing.get_original_basket().getName() %}
+                    {% set desc = publishing.get_original_basket().getDescription() %}
+                {% endif %}
+                <label for="feed_add_title">{% trans 'publication : titre' %}</label>
+                <input class="required_text" type="text" name="title" id="feed_add_title" value="{{title}}" />
+                <label for="feed_add_subtitle">{% trans 'publication : sous titre' %}</label>
+                <textarea id="feed_add_subtitle" name="subtitle">{{desc}}</textarea>
+                <label for="feed_add_author_name">{% trans 'publication : autheur' %}</label>
+                <input class="required_text" type="text" name="author_name" id="feed_add_author_name" value="{{ user.get_display_name() }}" />
+                <label for="feed_add_author_mail">{% trans 'publication : email autheur' %}</label>
+                <input class="required_text" type="text" name="author_mail" id="feed_add_author_mail" value="{{ user.get_email() }}" />
+            </div>
+        </div>
+        <div class="PNB" style="width:50%;left:auto;">
+            <div class="PNB10 feeds">
+                <h1>{% trans 'Fils disponibles' %}</h1>
+                <div class="list">
+                    {% for feed in feeds.get_feeds() %}
+                        {% if feed.is_publisher(user) %}
+                            <div class="feed {% if loop.index is odd%}odd{% endif %}">
+                                <span>{{ feed.get_title() }}</span>
+                                {% if feed.is_public() %}
+                                    <img src="/skins/icons/ligth-on.png" title="{% trans 'This feed is public' %}"/>
+                                {% endif %}
+                                <input type="hidden" value="{{ feed.get_id() }}"/>
+                            </div>
+                        {% endif %}
+                    {% endfor %}
+                    <input type="hidden" value="" name="feed_id" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="PNB" style="top:auto; height:50px; text-align:center;">
+        <div class="PNB10">
+            <button class="valid_form btn btn-inverse">{% trans 'boutton::publier' %}</button>
+            <button class="close_dialog btn btn-inverse">{% trans 'boutton::annuler' %}</button>
+        </div>
     </div>
-  </div>
 </form>
+
 <script type="text/javascript">
-  $(document).ready(function(){
-    $('#modal_feed .record_list').sortable({
-      stop:function(event, ui){
-        var lst = [];
-        $('#modal_feed .record_list .sortable form').each(function(i, el){
-          lst.push($('input[name="sbas_id"]', el).val()+'_'+$('input[name="record_id"]', el).val());
+    $(document).ready(function(){
+        $('#modal_feed .record_list').sortable({
+            stop:function(event, ui){
+                var lst = [];
+                $('#modal_feed .record_list .sortable form').each(function(i, el){
+                    lst.push($('input[name="sbas_id"]', el).val()+'_'+$('input[name="record_id"]', el).val());
+                });
+                $('#modal_feed form.main_form input[name="lst"]').val(lst.join(';'));
+            }
         });
-        $('#modal_feed form.main_form input[name="lst"]').val(lst.join(';'));
-      }
     });
-  });
 </script>
\ No newline at end of file
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 98645315c7..9fc6d2ff06 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -376,7 +376,7 @@
                             <img src="/skins/icons/settings.png" title="{% trans 'Advanced Search' %}"/>
                         </a>
                         <button type="submit" class="btn btn-inverse">{% trans 'boutton::rechercher' %}</button>
-                        <div class="control-group" style="margin:5px 0;">
+                        <div class="control-group" style="margin:5px;">
                             <div class="controls">
                                 {% if GV_multiAndReport %}
                                     <label for="mode_type_doc" class="radio inline">
@@ -1099,7 +1099,6 @@
     <script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/minify/f=include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
     <script type="text/javascript">
         $(document).ready(function(){
-            _V_.options.flash.swf = "/include/jslibs/video-js/video-js.swf"
             p4.reg_delete="{% if user.getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}";
         });
 
diff --git a/www/prod/docfunction.php b/www/prod/docfunction.php
index 266b040713..c5f82f3248 100644
--- a/www/prod/docfunction.php
+++ b/www/prod/docfunction.php
@@ -320,14 +320,14 @@ $user = $Core->getAuthenticatedUser();
     ?>
     <body class="bodyprofile" onload="loaded();">
         <div class="boxCloser" onclick="parent.hideDwnl();"><?php echo _('boutton::fermer') ?></div>
-        <div id="tabs">
+        <div id="tabs" style="height:384px;">
 
             <ul>
                 <li><a href="#statut"><?php echo _('prod::proprietes:: status') ?></a></li>
                 <li><a href="#type"><?php echo _('prod::proprietes:: type') ?></a></li>
             </ul>
 
-            <div id="statut" class="tabBox">
+            <div id="statut" class="tabBox" style="height: 333px;">
                 <form name="formstatus" id="formstatus" action="chgstatus.php" method="post">
 <?php
 //nbre total de doc modifiables
@@ -459,13 +459,13 @@ if ($sbasSet !== null) {
                     <input type="hidden" name="chg_status_son" value="">
                     <input type="hidden" name="act" value="WORK" />
                     <input type="hidden" name="lst" value="<?php echo $parm["lst"] ?>" />
-                    <div style="margin-top:10px; text-align:center;">
+                    <div style="margin-top:10px; margin-bottom:10px; text-align:center;">
                         <input type="button" class="edit-btn" value="<?php echo _('boutton::valider') ?>" onclick="doChgStat(true);" />
                         <input type="button" class="edit-btn" value="<?php echo _('boutton::annuler') ?>" onclick="parent.hideDwnl();" />
                     </div>
                 </form>
             </div>
-            <div id="type" class="tabBox">
+            <div id="type" class="tabBox" style="height: 333px;">
                 <form name="formtypedoc" action="chgtype.php" method="post">
                     <div style="width:100%;">
 <?php
@@ -528,7 +528,7 @@ foreach ($types as $sbas_id => $typeBR) {
 ?>
                         <input type="hidden" name="ACT" value="SEND" />
                         <input type="hidden" name="typelst" id="typelst" value="" />
-                        <div class="editPropBox" style="margin-top: 5px; text-align: center;">
+                        <div class="editPropBox" style="margin-top:5px; margin-bottom:10px; text-align:center;">
                             <input type="button" class="edit-btn" value="<?php echo _('boutton::valider') ?>" onclick="validChgType();" />
                             <input type="button" class="edit-btn" value="<?php echo _('boutton::annuler') ?>" onclick="parent.hideDwnl();" />
                         </div>
diff --git a/www/prod/jquery.Feedback.js b/www/prod/jquery.Feedback.js
index c91f2627d9..201715ced4 100644
--- a/www/prod/jquery.Feedback.js
+++ b/www/prod/jquery.Feedback.js
@@ -1,5 +1,4 @@
 
-
 ;
 (function(window){
 
@@ -155,7 +154,7 @@
 
       return false;
     });
-    
+
     $('.FeedbackSend', this.container).bind('click', function(){
       if($('.badges .badge', $container).length === 0)
       {
@@ -186,7 +185,7 @@
       };
 
       var $dialog = p4.Dialog.Create(options, 2);
-      
+
       $dialog.getDomElement().bind("keypress", function(event){
         if(event.which){
           if(event.which==13){
@@ -194,7 +193,7 @@
           }
         }
       });
-      
+
       var $FeedBackForm = $('form[name="FeedBackForm"]', $container);
 
       var callback = function(rendered){
@@ -204,13 +203,13 @@
         $('input[name="name"]', $dialog.getDomElement()).val($('input[name="name"]', $FeedBackForm).val());
         $('textarea[name="message"]', $dialog.getDomElement()).val($('textarea[name="message"]', $FeedBackForm).val());
         $('.' + $this.Context, $dialog.getDomElement()).show();
-            
+
       };
 
       p4.Mustache.Render('Feedback-SendForm', {
         language:language
       }, callback);
-    }).button();
+    });
 
     $('.user_content .badges', this.container).disableSelection();
 
@@ -274,7 +273,7 @@
       return false;
     });
 
-    $('.options button', this.container).button();
+    $('.options button', this.container);
 
     $('form.list_saver', this.container).bind('submit', function(){
       var $form = $(this);
@@ -378,7 +377,7 @@
     },
     loadUser : function(usr_id, callback) {
       var $this = this;
-      
+
       $.ajax({
         type: 'GET',
         url: '/prod/push/user/' + usr_id + '/',
@@ -396,7 +395,7 @@
     },
     loadList : function(url, callback) {
       var $this = this;
-      
+
       $.ajax({
         type: 'GET',
         url: url,
@@ -415,7 +414,7 @@
     addUser : function($form, callback){
 
       var $this = this;
-      
+
       $.ajax({
         type: 'POST',
         url: '/prod/push/add-user/',
@@ -456,7 +455,7 @@
       $('#PushBox').show();
       $('#ListManager').hide();
       return false;
-    }).button();
+    });
 
     $('a.list_sharer', this.container).die('click').live('click', function(){
 
@@ -477,7 +476,7 @@
     $('a.user_adder', this.container).bind('click', function(){
 
       var $this = $(this);
-      
+
       $.ajax({
         type: "GET",
         url: $this.attr('href'),
@@ -624,8 +623,6 @@
         $(this).closest('form').trigger('submit');
       });
 
-      $('button', $container).button();
-
       $('.EditToggle', $container).bind('click', function(){
         $('.content.readonly, .content.readwrite', $('#ListManager')).toggle();
         return false;
@@ -637,7 +634,7 @@
 
       $('form[name="SaveName"]', $container).bind('submit', function(){
         var $this = $(this);
-        
+
         $.ajax({
           type: $this.attr('method'),
           url: $this.attr('action'),
@@ -705,7 +702,7 @@
         return false;
       });
     };
-         
+
     initLeft();
 
     $('.badges a.deleter', this.container).live('click', function(){
diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index 4ac11eb7ef..75514701ec 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -23,6 +23,14 @@ input::-moz-selection, textarea::-moz-selection {
     color:white;
 }
 
+label {
+    color: #FFFFFF;
+}
+
+legend {
+    color: #FFFFFF;
+}
+
 .clickable {
     cursor:pointer;
 }
@@ -757,6 +765,7 @@ div.diapo {
 
 
 
+
 #idFrameC .tools {
     text-align:center;
 }
@@ -1025,6 +1034,27 @@ form.phrasea_query input.query {
     height: 22px;
 }
 
+
+#basket-rename-box .btn, #reorder_box .btn {
+    font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-size: 12px;
+    font-weight: bold;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+#basket-rename-box .btn-inverse, #reorder_box .btn-inverse {
+    /*border: 1px solid #515151;*/
+    color: #AAAAAA;
+}
+
+#basket-rename-box .btn-inverse:hover, #reorder_box .btn-inverse:hover {
+    color: #FFFFFF;
+}
+
+
+
 /* QRY */
 
 
@@ -1867,9 +1897,8 @@ H4 {
     border-radius: 6px;
 }
 
-#printBox h4,
-#download h4,
-#sendmail h4 {
+#printBox h4, #download h4,
+#sendmail h4, #ftp h4 {
     margin-bottom: 10px;
     font-weight: bold;
     font-size: 14px;
@@ -1878,22 +1907,24 @@ H4 {
     text-decoration: none;
 }
 
-#printBox label,
-#download label,
-#sendmail label {
+#printBox label, #download label,
+#sendmail label, #ftp label {
     line-height: 18px;
     color: #FFFFFF;
 }
 
-#sendmail p,
+#sendmail p, #ftp p,
 .buttons_line p {
     margin: 20px 0 10px 0;
     font-weight: bold;
 }
 
-#printBox .btn,
-#download .btn,
-#sendmail .btn {
+#ftp .form-horizontal .control-group {
+    margin-bottom: 10px;
+}
+
+#printBox .btn, #download .btn,
+#sendmail .btn, #ftp .btn {
     font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
     font-size: 12px;
     font-weight: bold;
@@ -1902,9 +1933,8 @@ H4 {
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 
-#printBox .btn-inverse,
-#download .btn-inverse,
-#sendmail .btn-inverse {
+#printBox .btn-inverse, #download .btn-inverse,
+#sendmail .btn-inverse, #ftp .btn-inverse {
     *background-color: #393939;
     background-image: -ms-linear-gradient(top, #444444, #393939);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#393939));
@@ -1916,9 +1946,8 @@ H4 {
     color: #AAAAAA;
 }
 
-#printBox .btn-inverse:hover,
-#download .btn-inverse:hover,
-#sendmail .btn-inverse:hover {
+#printBox .btn-inverse:hover, #download .btn-inverse:hover,
+#sendmail .btn-inverse:hover, #ftp .btn-inverse:hover {
     background-color: #393939;
     *background-color: #393939;
     color: #FFFFFF;
@@ -2649,22 +2678,6 @@ DIV.thesaurus U.w {
     color: #FFFFFF;
 }
 
-/*
-#EDIT_TOP .diapo {
-    BORDER:  #404040 1px solid;
-    BACKGROUND-COLOR: transparent;
-    OVERFLOW: hidden;
-    MARGIN:1px;
-    position: relative;
-    top: 0px;
-    left: 0px;
-    float: left;
-    text-align: center;
-}
-#EDIT_TOP .diapo.selected,#EDIT_TOP .diapo.ui-selected {
-    BORDER:  #666666 1px solid;
-    BACKGROUND-COLOR: #666666;
-}*/
 
 #ZTextMultiValued_values {
     background-color:#444444;
@@ -3146,8 +3159,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
 
 
 
-
-
 #dialog_dwnl h1 {
     text-align:center;
 }
@@ -3181,8 +3192,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
 
 
 
-
-
 #order_manager tr.order_row {
     height:28px;
 }
@@ -3220,6 +3229,60 @@ dans l'onglet thesaurus : arbres, menus contextuels
     margin:2px 0;
 }
 
+
+
+/** PUSH (CSS theme-dependant) */
+
+.PushBox .grey-bg .btn {
+    font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-size: 12px;
+    font-weight: bold;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    padding: 4px 10px;
+}
+
+.PushBox .grey-bg .btn-inverse {
+    background-color: #444444;
+    *background-color: #393939;
+    background-image: -ms-linear-gradient(top, #444444, #393939);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#393939));
+    background-image: -webkit-linear-gradient(top, #444444, #393939);
+    background-image: -o-linear-gradient(top, #444444, #393939);
+    background-image: -moz-linear-gradient(top, #444444, #393939);
+    background-image: linear-gradient(top, #444444, #393939);
+    /*border: 1px solid #515151;*/
+    color: #aaaaaa;
+}
+
+.PushBox .grey-bg .btn-inverse:hover {
+    background-color: #393939;
+    *background-color: #393939;
+    color: #ffffff;
+}
+
+.PushBox .theme-bg .btn,
+#modal_feed form .btn {
+    font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-size: 12px;
+    font-weight: bold;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.PushBox .theme-bg .btn-inverse,
+#modal_feed form .btn-inverse {
+    /*border: 1px solid #515151;*/
+    color: #AAAAAA;
+}
+
+.PushBox .theme-bg .btn-inverse:hover,
+#modal_feed form .btn-inverse:hover {
+    color: #FFFFFF;
+}
+
 #modal_feed form .fields {
     overflow:auto;
 }
@@ -3233,44 +3296,44 @@ dans l'onglet thesaurus : arbres, menus contextuels
 }
 
 #modal_feed form .feeds .feed {
-    width:95%;
-    height:18px;
-    padding:5px 0;
-    font-size:13px;
-    border:1px solid #414141;
-    cursor:pointer;
+    width: 95%;
+    height: 18px;
+    padding: 5px 0;
+    border: 1px solid #414141;
+    color: #FFFFFF;
+    font-size: 13px;
+    cursor: pointer;
 }
 
 #modal_feed form .feeds .feed.odd {
-    background-color:#414141;
+    background-color: #414141;
+    color: #FFFFFF;
 }
 
 #modal_feed form .feeds .feed.hover {
-    background-color:#606060;
-    border:1px solid #606060;
+    background-color: #606060;
+    font-weight: bold;
 }
 
 #modal_feed form .feeds .feed.selected {
-    background-color:#959595;
-    color:black;
-    border:1px solid #d00;
+    background-color: #959595;
     font-weight: bold;
 }
 
 #modal_feed form .feeds .feed span {
-    margin:0 10px;
+    margin: 0 10px;
 }
 
 #modal_feed form input.error,
 #modal_feed form textarea.error {
-    border:1px solid red;
+    border: 1px solid red;
 }
 
 #modal_feed form input,
 #modal_feed form textarea {
-    width:90%;
-    height:20px;
-    margin:3px 0 10px 0;
+    width: 90%;
+    height: 20px;
+    margin: 3px 0 10px 0;
 }
 
 #modal_feed form textarea {
@@ -3278,6 +3341,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
     resize:none;
 }
 
+/** **/
+
 #answers .feed .headblock h1 img {
     margin-right:15px;
 }
@@ -4033,8 +4098,9 @@ dans l'onglet thesaurus : arbres, menus contextuels
     height: 10px;
 }
 
-#lazaretBox .loading{
+#lazaretBox .loading {
     background-image: url('../../icons/loader404040.gif');
     background-position: center center;
     background-repeat: no-repeat;
 }
+
diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css
index b6f14dbc23..559197a02f 100644
--- a/www/skins/prod/959595/prodcolor.css
+++ b/www/skins/prod/959595/prodcolor.css
@@ -23,6 +23,14 @@ input::-moz-selection, textarea::-moz-selection {
     color: white;
 }
 
+label {
+    color: #333333;
+}
+
+legend {
+    #333333;
+}
+
 .clickable {
     cursor: pointer;
 }
@@ -1045,6 +1053,43 @@ form.phrasea_query input.query {
     height: 22px;
 }
 
+
+#basket-rename-box .btn, #reorder_box .btn {
+    font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-size: 12px;
+    font-weight: bold;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+#basket-rename-box .btn-inverse, #reorder_box .btn-inverse {
+    background-color: #D6D6D6;
+    *background-color: #D6D6D6;
+    background-image: -ms-linear-gradient(top, #FFFFFF, #D6D6D6);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#FFFFFF), to(#D6D6D6));
+    background-image: -webkit-linear-gradient(top, #FFFFFF, #D6D6D6);
+    background-image: -o-linear-gradient(top, #FFFFFF, #D6D6D6);
+    background-image: linear-gradient(top, #FFFFFF, #D6D6D6);
+    background-image: -moz-linear-gradient(top, #FFFFFF, #D6D6D6);
+    border-color: #D6D6D6 #D6D6D6 #bfbfbf;
+    border-bottom-color: #b3b3b3;
+    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#D6D6D6', GradientType=0);
+    filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+    /*border: 1px solid #666666;*/
+    text-shadow: none;
+    color: #777777;
+}
+
+#basket-rename-box .btn-inverse:hover, #reorder_box .btn-inverse:hover {
+    background-color: #D6D6D6;
+    *background-color: #D6D6D6;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    color: #FFFFFF;
+}
+
+
+
 /* QRY */
 
 
@@ -1906,9 +1951,8 @@ H4
     border-radius: 6px;
 }
 
-#printBox h4,
-#download h4,
-#sendmail h4 {
+#printBox h4, #download h4,
+#sendmail h4, #ftp h4 {
     margin-bottom: 10px;
     font-weight: bold;
     font-size: 14px;
@@ -1917,22 +1961,24 @@ H4
     text-decoration: none;
 }
 
-#printBox label,
-#download label,
-#sendmail label {
+#printBox label, #download label,
+#sendmail label, #ftp label {
     line-height: 18px;
     color: #FFFFFF;
 }
 
-#sendmail p,
+#sendmail p, #ftp p,
 .buttons_line p {
     margin: 20px 0 10px 0;
     font-weight: bold;
 }
 
-#printBox .btn,
-#download .btn,
-#sendmail .btn {
+#ftp .form-horizontal .control-group {
+    margin-bottom: 10px;
+}
+
+#printBox .btn, #download .btn,
+#sendmail .btn, #ftp .btn {
     font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
     font-size: 12px;
     font-weight: bold;
@@ -1941,9 +1987,8 @@ H4
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 
-#printBox .btn-inverse,
-#download .btn-inverse,
-#sendmail .btn-inverse {
+#printBox .btn-inverse, #download .btn-inverse,
+#sendmail .btn-inverse, #ftp .btn-inverse {
     background-color: #B1B1B1;
     *background-color: #B1B1B1;
     background-image: -ms-linear-gradient(top, #B9B9B9, #A4A4A4);
@@ -1958,9 +2003,8 @@ H4
     color: #EAEAEA;
 }
 
-#printBox .btn-inverse:hover,
-#download .btn-inverse:hover,
-#sendmail .btn-inverse:hover {
+#printBox .btn-inverse:hover, #download .btn-inverse:hover,
+#sendmail .btn-inverse:hover, #ftp .btn-inverse:hover {
     background-color: #A4A4A4;
     *background-color: #A4A4A4;
     text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -3277,56 +3321,132 @@ dans l'onglet thesaurus : arbres, menus contextuels
     margin:5px;
 }
 
-#order_manager table p{
+#order_manager table p {
     margin:2px 0;
 }
 
-#modal_feed form .fields{
+
+
+/** PUSH (CSS theme-dependant) */
+
+.PushBox .grey-bg .btn {
+    font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-size: 12px;
+    font-weight: bold;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    padding: 4px 10px;
+}
+
+.PushBox .grey-bg .btn-inverse {
+    background-color: #444444;
+    *background-color: #393939;
+    background-image: -ms-linear-gradient(top, #444444, #393939);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#393939));
+    background-image: -webkit-linear-gradient(top, #444444, #393939);
+    background-image: -o-linear-gradient(top, #444444, #393939);
+    background-image: -moz-linear-gradient(top, #444444, #393939);
+    background-image: linear-gradient(top, #444444, #393939);
+    /*border: 1px solid #515151;*/
+    color: #aaaaaa;
+}
+
+.PushBox .grey-bg .btn-inverse:hover {
+    background-color: #393939;
+    *background-color: #393939;
+    color: #ffffff;
+}
+
+.PushBox .theme-bg .btn,
+#modal_feed form .btn {
+    font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-size: 12px;
+    font-weight: bold;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.PushBox .theme-bg .btn-inverse,
+#modal_feed form .btn-inverse {
+    background-color: #D6D6D6;
+    *background-color: #D6D6D6;
+    background-image: -ms-linear-gradient(top, #FFFFFF, #D6D6D6);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#FFFFFF), to(#D6D6D6));
+    background-image: -webkit-linear-gradient(top, #FFFFFF, #D6D6D6);
+    background-image: -o-linear-gradient(top, #FFFFFF, #D6D6D6);
+    background-image: linear-gradient(top, #FFFFFF, #D6D6D6);
+    background-image: -moz-linear-gradient(top, #FFFFFF, #D6D6D6);
+    border-color: #D6D6D6 #D6D6D6 #bfbfbf;
+    border-bottom-color: #b3b3b3;
+    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#D6D6D6', GradientType=0);
+    filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+    /*border: 1px solid #666666;*/
+    text-shadow: none;
+    color: #777777;
+}
+
+.PushBox .theme-bg .btn-inverse:hover,
+#modal_feed form .btn-inverse:hover {
+    background-color: #D6D6D6;
+    *background-color: #D6D6D6;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    color: #FFFFFF;
+}
+
+#modal_feed form .fields {
     overflow:auto;
 }
 
-#modal_feed form .feeds{
+#modal_feed form .feeds {
+    color: #333333;
     overflow:auto;
 }
-#modal_feed form .feeds .list{
-    margin:10px 0;
+
+#modal_feed form .feeds .list {
+    margin: 10px 0;
 }
 
-#modal_feed form .feeds .feed{
-    width:95%;
-    height:18px;
-    padding:5px 0;
-    font-size:13px;
-    border:1px solid #414141;
-    cursor:pointer;
+#modal_feed form .feeds .feed {
+    width: 95%;
+    height: 18px;
+    padding: 5px 0;
+    border: 1px solid #414141;
+    color: #333333;
+    font-size: 13px;
+    cursor: pointer;
 }
-#modal_feed form .feeds .feed.odd{
-    background-color:#414141;
+
+#modal_feed form .feeds .feed.odd {
+    background-color: #414141;
+    color: #FFFFFF;
 }
+
 #modal_feed form .feeds .feed.hover{
-    background-color:#606060;
-    border:1px solid #606060;
+    background-color: #606060;
+    font-weight: bold;
 }
+
 #modal_feed form .feeds .feed.selected{
-    background-color:#959595;
-    color:black;
-    border:1px solid #d00;
+    background-color: #959595;
     font-weight: bold;
 }
 
 #modal_feed form .feeds .feed span{
-    margin:0 10px;
+    margin: 0 10px;
 }
+
 #modal_feed form input.error,
 #modal_feed form textarea.error{
-    border:1px solid red;
+    border: 1px solid red;
 }
 
 #modal_feed form input,
 #modal_feed form textarea{
-    width:90%;
-    height:20px;
-    margin:3px 0 10px 0;
+    width: 90%;
+    height: 20px;
+    margin: 3px 0 10px 0;
 }
 
 #modal_feed form textarea{
@@ -3334,6 +3454,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
     resize:none;
 }
 
+/** **/
+
 #answers .feed .headblock h1 img{
     margin-right:15px;
 }
@@ -4096,8 +4218,9 @@ dans l'onglet thesaurus : arbres, menus contextuels
     height: 10px;
 }
 
-#lazaretBox .loading{
+#lazaretBox .loading {
     background-image: url('../../icons/loaderB1B1B1.gif');
     background-position: center center;
     background-repeat: no-repeat;
-}
\ No newline at end of file
+}
+
diff --git a/www/skins/prod/Push.css b/www/skins/prod/Push.css
index 6672257f1b..a2938ab220 100644
--- a/www/skins/prod/Push.css
+++ b/www/skins/prod/Push.css
@@ -1,229 +1,265 @@
-.PushBox .content{
-  background-color: #404040;
+/** PUSH BOX */
+
+.PushBox .content {
+    background-color: #404040;
+}
+
+#PushBox .btn {
+    font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-size: 12px;
+    font-weight: bold;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    padding: 4px 10px;
+}
+
+#PushBox .btn-inverse {
+    background-color: #444444;
+    *background-color: #393939;
+    background-image: -ms-linear-gradient(top, #444444, #393939);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#393939));
+    background-image: -webkit-linear-gradient(top, #444444, #393939);
+    background-image: -o-linear-gradient(top, #444444, #393939);
+    background-image: -moz-linear-gradient(top, #444444, #393939);
+    background-image: linear-gradient(top, #444444, #393939);
+    /*border: 1px solid #515151;*/
+    color: #aaaaaa;
+}
+
+#PushBox .btn-inverse:hover {
+    background-color: #393939;
+    *background-color: #393939;
+    color: #ffffff;
 }
 
 .PushBox a.link {
-  color:#1983cb;
+    margin: 0 5px;
+    color: #1983cb;
 }
 
-.PushBox .LeftColumn h1{
-  width:100%;
-  text-align: center;
-  margin:5px 0;
-  font-weight:bold;
-  font-size:16px;
+.PushBox a.link:hover {
+    color: #5AA2D4;
 }
 
-.PushBox .LeftColumn ul{
-  margin:10px 0;
+.PushBox .LeftColumn h1 {
+    width: 100%;
+    text-align: center;
+    margin: 5px 0;
+    font-weight: bold;
+    font-size: 16px;
 }
 
-.PushBox .LeftColumn ul li img{
-  margin-right:5px;
-  vertical-align: middle;
+.PushBox .LeftColumn ul {
+    margin:10px 0;
 }
 
-.PushBox button{
-  margin:0;padding:0;
-  background-color:transparent;
-  border:none;
-  vertical-align:middle;
-  cursor:pointer;
-}
-.PushBox table{
-  width:100%;
-  border:none;
-  overflow: hidden;
-  table-layout: fixed;
+.PushBox .LeftColumn ul li img {
+    margin-right:5px;
+    vertical-align: middle;
 }
 
-.PushBox .user_content .header{
-  height:35px;
-  bottom:auto;
-  right:50px;
+.PushBox table {
+    width: 100%;
+    border: none;
+    overflow: hidden;
+    table-layout: fixed;
 }
 
-.PushBox .user_content .footer{
-  height:35px;
-  top:auto;
-  text-align:right;
-  left:10px;
-  right:50px;
-  bottom:10px;
+.PushBox .user_content .header {
+    height: 35px;
+    right: 20px;
+    bottom: auto;
 }
 
-.PushBox .user_content .badges{
-  top:50px;
-  overflow:auto;
-  height:auto;
-  bottom:50px;
-  left:20px;
-  right:20px;
+.PushBox .user_content .footer {
+    height: 35px;
+    top: auto;
+    right: 20px;
+    bottom: 10px;
+    left: 10px;
+    text-align: right;
 }
 
-.PushBox .user_content .badges .badge .deleter{
-  float:right;
+.PushBox .user_content .badges {
+    top:50px;
+    overflow:auto;
+    height:auto;
+    bottom:50px;
+    left:20px;
+    right:20px;
+}
+
+.PushBox .user_content .badges .badge .deleter {
+    float:right;
 
 }
 
-.PushBox .user_content .badges .badge{
-  width:230px;
-  height:80px;
-  margin:10px;
-  display:inline-block;
-  background-color: #515150;
-  border:3px solid #515150;
-  padding:3px;
-}
-.PushBox .user_content .badges .badge.selected{
-  border:3px solid #EFEFEF;
+.PushBox .user_content .badges .badge {
+    width:230px;
+    height:80px;
+    margin:10px;
+    display:inline-block;
+    background-color: #515150;
+    border:3px solid #515150;
+    padding:3px;
 }
 
-.PushBox .user_content .badges .badge .toggles .status_on .toggle_off{
-  display:none;
+.PushBox .user_content .badges .badge.selected {
+    border:3px solid #EFEFEF;
 }
-.PushBox .user_content .badges .badge .toggles .status_off .toggle_on{
-  display:none;
+
+.PushBox .user_content .badges .badge .toggles .status_on .toggle_off {
+    display:none;
+}
+
+.PushBox .user_content .badges .badge .toggles .status_off .toggle_on {
+    display:none;
 }
 
 .PushBox .user_content .badges .badge td{
-  vertical-align: top;
+    vertical-align: top;
 }
 
 .PushBox .user_content .badges .badge td.toggle{
-  vertical-align: bottom;
+    vertical-align: bottom;
 }
 
 .PushBox .user_content .badges .badge .icon{
-  width:80px;
-  background-color:#404040;
+    width:80px;
+    background-color:#404040;
 }
 
-.PushBox .user_content .badges .badge .infos{
-  padding-top:3px;
-  padding-left:5px;
+.PushBox .user_content .badges .badge .infos {
+    padding-top:3px;
+    padding-left:5px;
 }
 
-.PushBox .user_content .badges .badge table{
-  width:95%;
+.PushBox .user_content .badges .badge table {
+    width:95%;
 }
 
-.PushBox .user_content .badges .badge .infos table{
-  height:75px;
+.PushBox .user_content .badges .badge .infos table {
+    height:75px;
 }
 
-.PushBox .user_content .badges .badge .infos tr{
-  height:20px;
+.PushBox .user_content .badges .badge .infos tr {
+    height:20px;
 }
 
-.PushBox .user_content .badges .badge .infos tr.toggles{
-  height:25px;
-  text-align:center;
+.PushBox .user_content .badges .badge .infos tr.toggles {
+    height:25px;
+    text-align:center;
 }
 
-.PushBox .user_content .badges .badge .icon img{
-  margin:7px;
+.PushBox .user_content .badges .badge .icon img {
+    margin:7px;
 }
 
-.PushBox .user_content .badges .badge .name{
-  font-weight:bold;
-  white-space:pre-line;
-  display:block;
-  font-size:12px;
+.PushBox .user_content .badges .badge .name {
+    font-weight:bold;
+    white-space:pre-line;
+    display:block;
+    font-size:12px;
 }
 
-.PushBox .user_content .badges .badge .subtite{
-  display:block;
-  font-size:10px;
+.PushBox .user_content .badges .badge .subtite {
+    display:block;
+    font-size:10px;
 }
 
-.PushBox .user_content .header .options{
-  text-align: right;
+.PushBox .user_content .header .options {
+    text-align: right;
 }
 
-
-.PushBox .all-lists .lists{
-  overflow:auto;
+.PushBox .all-lists .lists {
+    overflow:auto;
 }
 
-
-.PushBox .LeftColumn .content ul.list li:nth-child(odd){
-  background-color: none;
-}
-.PushBox .LeftColumn .content ul.list li:nth-child(even){
-  background-color: #515150;
+.PushBox .LeftColumn .content ul.list li:nth-child(odd) {
+    background-color: none;
 }
 
-.PushBox .lists ul li:nth-child(odd){
-  background-color: none;
+.PushBox .LeftColumn .content ul.list li:nth-child(even) {
+    background-color: #515150;
 }
 
-.PushBox .lists ul li:nth-child(even){
-  background-color: #515150;
+.PushBox .lists ul li:nth-child(odd) {
+    background-color: none;
 }
 
-.PushBox .LeftColumn .content ul.list li.selected{
-  background-color: #AAA;
+.PushBox .lists ul li:nth-child(even) {
+    background-color: #515150;
 }
 
-.PushBox .lists .list.selected{
-  background-color: #AAA;
+.PushBox .LeftColumn .content ul.list li.selected {
+    background-color: #AAA;
 }
 
-.PushBox .lists .list{
-  padding:3px 0;
+.PushBox .lists .list.selected {
+    background-color: #AAA;
 }
 
-.PushBox .welcome{
-  text-align: center;
-  font-size: 16px;
-  line-height: 18px;
-  margin : 20px 0;
-}
-.PushBox .welcome h1{
-  font-weight: bold;
-  margin:40px 0;
+.PushBox .lists .list {
+    padding:3px 0;
 }
 
-#list-editor-search-results{
+.PushBox .welcome {
+    text-align: center;
+    font-size: 16px;
+    line-height: 18px;
+    margin : 20px 0;
+}
+
+.PushBox .welcome h1 {
+    font-weight: bold;
+    margin:40px 0;
+}
+
+#list-editor-search-results {
 
 }
 
-#list-editor-search-results table td{
-  padding:1px 0;
-  overflow:hidden;
+#list-editor-search-results table td {
+    padding:1px 0;
+    overflow:hidden;
 }
-#list-editor-search-results table tr{
-  line-height: 24px;
-  vertical-align: middle;
-  cursor:pointer;
+
+#list-editor-search-results table tr {
+    line-height: 24px;
+    vertical-align: middle;
+    cursor:pointer;
 }
-#list-editor-search-results table tr.odd{
-  background-color: #515151;
+
+#list-editor-search-results table tr.odd {
+    background-color: #515151;
 }
-#list-editor-search-results table tr.selected{
-  background-color:#D18827;
+
+#list-editor-search-results table tr.selected {
+    background-color:#D18827;
 }
 
 
-#list-editor-search-results table th.sortable span{
-  margin:0 5px;
+#list-editor-search-results table th.sortable span {
+    margin:0 5px;
 }
-#list-editor-search-results table th.sortable{
-  cursor:pointer;
+
+#list-editor-search-results table th.sortable {
+    cursor:pointer;
 }
+
 #list-editor-search-results table th.sortable.hover,
-#list-editor-search-results table th.sortable.sorted{
-  background-color:#F0AD30;
-}
-#list-editor-search-results table th.sortable span.ord_notifier{
-  display:none;
-}
-#list-editor-search-results table th.sortable.sorted span.ord_notifier{
-  display:inline;
+#list-editor-search-results table th.sortable.sorted {
+    background-color:#F0AD30;
 }
 
+#list-editor-search-results table th.sortable span.ord_notifier {
+    display:none;
+}
 
+#list-editor-search-results table th.sortable.sorted span.ord_notifier {
+    display:inline;
+}
 
 .ui-autocomplete.ui-state-hover,
 .ui-autocomplete.ui-widget-content .ui-state-hover,
@@ -231,153 +267,151 @@
 .ui-autocomplete.ui-state-focus,
 .ui-autocomplete.ui-widget-content .ui-state-focus,
 .ui-autocomplete.ui-widget-header .ui-state-focus {
-  background-image:none;
-  background-color:#515151;
-  border:none;
-  margin:0;
-  border-radius: 0;
+    background-image:none;
+    background-color:#515151;
+    border:none;
+    margin:0;
+    border-radius: 0;
 }
 
 .ui-autocomplete.ui-menu .ui-menu-item a.ui-state-hover,
 .ui-autocomplete.ui-menu .ui-menu-item a.ui-state-active {
-  margin:0;
+    margin:0;
 }
 
-.ui-autocomplete li.list-item{
-  width:280px;
-  height:45px;
-  display:block;
+.ui-autocomplete li.list-item {
+    width:280px;
+    height:45px;
+    display:block;
 }
-.ui-autocomplete li.list-item .icon{
-  width:42px;
+
+.ui-autocomplete li.list-item .icon {
+    width:42px;
 }
-.ui-autocomplete li.list-item .icon img{
-  max-width:32px;
-  max-height:32px;
-  text-align: center;
-  vertical-align: middle;
-  margin:5px;
+
+.ui-autocomplete li.list-item .icon img {
+    max-width:32px;
+    max-height:32px;
+    text-align: center;
+    vertical-align: middle;
+    margin:5px;
 }
+
 .ui-autocomplete {
-		min-height: 42px;
-		max-height: 200px;
-		overflow-y: auto;
-		overflow-x: hidden;
+    min-height: 42px;
+    max-height: 200px;
+    overflow-y: auto;
+    overflow-x: hidden;
     padding:1px 0;
     border-top-left-radius: 0;
     border-top-right-radius: 0;
-		padding-right: 20px;
+    padding-right: 20px;
 }
 
-
-#ListShare table{
-  width:100%;
-  margin:5px;
-  background-color:#505050;
+#ListShare table {
+    width:100%;
+    margin:5px;
+    background-color:#505050;
 }
 
-#ListManager .content.readonly .badge{
-  width:250px;
-  display:inline-block;
-  margin:5px;
-  background-color: #515150;
-  padding:5px;
+#ListManager .content.readonly .badge {
+    width:250px;
+    display:inline-block;
+    margin:5px;
+    background-color: #515150;
+    padding:5px;
 }
 
-#ListManager .content.readonly .badge .deleter{
-  float:right;
+#ListManager .content.readonly .badge .deleter {
+    float:right;
 }
 
 
 #ListManager .content.readonly .badge table{
-  width:auto;
-  table-layout: fixed;
+    width:auto;
+    table-layout: fixed;
 }
 
 #ListManager .content.readonly .badge .infos{
-  padding:2px;
+    padding:2px;
 }
 
 #ListManager h1 span.title{
-  font-size:24px;
-  line-height:24px;
-  font-weight:bold;
-  vertical-align:middle;
+    font-size:24px;
+    line-height:24px;
+    font-weight:bold;
+    vertical-align:middle;
 }
 
 #PushBox .general_togglers li {
-  margin-top:5px;
+    margin-top:5px;
 }
 
-#PushBox .general_togglers button{
-  width:100%;
+#PushBox .general_togglers button {
+    margin: 0;
+    padding: 4px 5px;
+    width: 100%;
 }
 
 
-#PushBox .general_togglers button .ui-button-text{
-  font-weight: lighter;
+#PushBox .general_togglers button .ui-button-text {
+    font-weight: lighter;
 }
 
 
-#PushBox .content .list_saver{
-  padding-top:20px;
-  padding-bottom:20px;
-  display:block;
+#PushBox .content .list_saver {
+    padding-top: 20px;
+    padding-bottom: 20px;
+    display: block;
 }
 
-#PushBox .content .list_saver table{
-  width:100%;
-  table-layout: auto;
+#PushBox .content .list_saver input {
+    margin: 0;
+    padding: 4px 2px;
+    width: 115px;
 }
 
-#PushBox .content .list_saver table tr{
-  border:1px solid #ccc;
+#PushBox .content .list_saver .btn {
+    margin: 0;
+    padding: 0;
+    height: 23px;
 }
 
-#PushBox .content .list_saver input{
-  padding:3px;
-  width:115px;
-  margin:0;
+#find-user {
+    line-height: 15px;
 }
 
-#PushBox .content .list_saver button{
+#ListManager .content .lists span.action {
+    display:block;
+    text-align:center;
+    font-weight: bold;
+    width:100%;
 }
 
-#find-user{
-  line-height: 15px;
+#recommanded-users {
+    margin-top:25px;
+    line-height:15px;
 }
 
-#ListManager .content .lists span.action{
-  display:block;
-  text-align:center;
-  font-weight: bold;
-  width:100%;
+#recommanded-users a:last-child {
+    color: #1983CB;
+    text-decoration: none;
 }
 
-#recommanded-users{
-  margin-top:25px;
-  line-height:15px;
+#QuickAddUser table {
+    width:100%;
+    table-layout:auto;
 }
 
-#recommanded-users a:last-child{
-  color: #1983CB;
-  text-decoration: none;
+#QuickAddUser table tr td {
+    padding: 5px;
 }
 
-#QuickAddUser table{
-  width:100%;
-  table-layout:auto;
+#QuickAddUser table td:last-child {
+    text-align: left;
 }
 
-#QuickAddUser table tr td{
-  padding: 5px;
-}
-
-#QuickAddUser table td:last-child{
-  text-align: left;
-}
-
-#QuickAddUser input{
+#QuickAddUser input {
     border: 1px solid #CCCCCC;
     border-radius: 4px 4px 4px 4px;
     box-shadow: 0 1px 1px #EEEEEE;