diff --git a/jm2l/templates/Logistique/Dialog_Covoit.mako b/jm2l/templates/Logistique/Dialog_Covoit.mako
index 7e2bf9b..e953afb 100644
--- a/jm2l/templates/Logistique/Dialog_Covoit.mako
+++ b/jm2l/templates/Logistique/Dialog_Covoit.mako
@@ -29,10 +29,10 @@
                   </tr>
                 </tbody>
             </table>
-            <center>
+            <div class="center">
             Pour un co-voiturage le <u>${Exch.start_time.strftime("%a %d %b").decode('utf-8')}</u>
             vers <strong>${Exch.start_time.strftime("%H:%M")}</strong>
-            </center>            
+            </div>            
             Temps de voyage estimé à <span id="summary"></span>
         </div>            
         <div class="tab-pane fade in" id="Place_Info">
diff --git a/jm2l/templates/Profil/Sejour.mako b/jm2l/templates/Profil/Sejour.mako
index 91eaaf7..5c784a9 100644
--- a/jm2l/templates/Profil/Sejour.mako
+++ b/jm2l/templates/Profil/Sejour.mako
@@ -155,7 +155,7 @@ fieldset:disabled {
         </div>
         </p>     
     </fieldset>
-    <center>
+    <div class="center">
     % if 1:
         <button type="submit" class="btn btn-large btn-primary" />
             <i class="icon-ok icon-white"></i> Je viens aux JM2L 2015
@@ -165,7 +165,7 @@ fieldset:disabled {
             <i class="icon-ok icon-white"></i> Enregistrer les modifications
         </button>
     % endif
-    </center>
+    </div>
 </form>
 
 </%def>
diff --git a/jm2l/templates/Salles/salle.mako b/jm2l/templates/Salles/salle.mako
index d033aec..73e8ac8 100644
--- a/jm2l/templates/Salles/salle.mako
+++ b/jm2l/templates/Salles/salle.mako
@@ -46,11 +46,11 @@ DicForm = {
     ${helpers.DisplayForm(form, DicForm)}
 
 <br>
-<center>
+<div class="center">
     <button type="submit" class="btn btn-large btn-primary" />
         <i class="icon-ok icon-white"></i> Enregistrer
     </button>
-</center>
+</div>
 
 </form>
 
diff --git a/jm2l/templates/Salles/salle_phy.mako b/jm2l/templates/Salles/salle_phy.mako
index a7c1f47..8f522d7 100644
--- a/jm2l/templates/Salles/salle_phy.mako
+++ b/jm2l/templates/Salles/salle_phy.mako
@@ -44,17 +44,17 @@ DicForm = {
     ${helpers.DisplayForm(form, DicForm)}
 
 <br>
-<center>
+<div class="center">
     <button type="submit" class="btn btn-large btn-primary" />
         <i class="icon-ok icon-white"></i> Enregistrer
     </button>
-</center>
+</div>
 
 </form>
 % if 'uid' in form._fields.keys():
-<center>
+<div class="center">
     ${helpers.uploader("salle", form.uid.data, u"Attachement" )}
-</center>
+</div>
 %endif
 
   </div>
diff --git a/jm2l/templates/Staff/EditIndex.mako b/jm2l/templates/Staff/EditIndex.mako
index c062be8..d540b4a 100644
--- a/jm2l/templates/Staff/EditIndex.mako
+++ b/jm2l/templates/Staff/EditIndex.mako
@@ -19,11 +19,11 @@ DicForm = {
 <form action="" method="POST">
     ${helpers.DisplayForm(form, DicForm)}
 <br>
-  <center>
+  <div class="center">
     <button type="submit" class="btn btn-large btn-primary" />
         <i class="icon-ok icon-white"></i> Enregistrer
     </button>
-  </center>
+  </div>
 
 </form>
 </div>
diff --git a/jm2l/templates/Staff/EditPresse.mako b/jm2l/templates/Staff/EditPresse.mako
index 2af70de..5db4a9c 100644
--- a/jm2l/templates/Staff/EditPresse.mako
+++ b/jm2l/templates/Staff/EditPresse.mako
@@ -23,14 +23,14 @@ DicForm = {
 <form action="" method="POST">
     ${helpers.DisplayForm(form, DicForm)}
 <br>
-  <center>
+  <div class="center">
     <button type="submit" class="btn btn-large btn-primary" />
         <i class="icon-ok icon-white"></i> Enregistrer
     </button>
-  </center>
+  </div>
 
 </form>
 </div>
-  <center>
+  <div class="center">
     ${helpers.uploader("presse", form.year_uid.data, u"Fichier" )}
-  </center>
+  </div>
diff --git a/jm2l/templates/Staff/pole.mako b/jm2l/templates/Staff/pole.mako
index 2eecc61..9a00cde 100644
--- a/jm2l/templates/Staff/pole.mako
+++ b/jm2l/templates/Staff/pole.mako
@@ -46,17 +46,17 @@ DicForm = {
     ${helpers.DisplayForm(form, DicForm)}
 
 <br>
-<center>
+<div class="center">
     <button type="submit" class="btn btn-large btn-primary" />
         <i class="icon-ok icon-white"></i> Enregistrer
     </button>
-</center>
+</div>
 
 </form>
 % if 'uid' in form._fields.keys():
-<center>
+<div class="center">
     ${helpers.uploader("poles", form.uid.data, u"Attachement" )}
-</center>
+</div>
 %endif
 
   </div>
diff --git a/jm2l/templates/Staff/tasks.mako b/jm2l/templates/Staff/tasks.mako
index b49f9f7..ccf6c94 100644
--- a/jm2l/templates/Staff/tasks.mako
+++ b/jm2l/templates/Staff/tasks.mako
@@ -64,17 +64,17 @@ DicForm = {
     ${helpers.DisplayForm(form, DicForm)}
 
 <br>
-<center>
+<div class="center">
     <button type="submit" class="btn btn-large btn-primary" />
         <i class="icon-ok icon-white"></i> Enregistrer
     </button>
-</center>
+</div>
 
 </form>
 % if 'uid' in form._fields.keys():
-<center>
+<div class="center">
     ${helpers.uploader("tasks", form.uid.data, u"une pièce jointe" )}
-</center>
+</div>
 %endif
 
   </div>
diff --git a/jm2l/templates/login.mako b/jm2l/templates/login.mako
index df91eb6..c989092 100644
--- a/jm2l/templates/login.mako
+++ b/jm2l/templates/login.mako
@@ -49,7 +49,9 @@
         <hr>
         <input name="username" type="text" class="input-block-level" placeholder="Nom">
         <input name="password" type="password" class="input-block-level" placeholder="Mot de passe">
-        <center><button class="btn btn-large btn-primary btn-block" type="submit">S'identifier</button></center>
+        <div class="center">
+            <button class="btn btn-large btn-primary btn-block" type="submit">S'identifier</button>
+        </div>
         <br>
         <a href="/sign/forgot">Je ne me souviens plus de mon mot de passe</a>
       </form>
diff --git a/jm2l/templates/view_event.mako b/jm2l/templates/view_event.mako
index 32776b8..bee6f6b 100644
--- a/jm2l/templates/view_event.mako
+++ b/jm2l/templates/view_event.mako
@@ -46,9 +46,9 @@ ${event.start_time.strftime('%H:%M')} à ${event.end_time.strftime('%H:%M')}
         <div align="right">
             <a class="media" href="${media.get_path}">Présentation</a>
         </div>
-        <center>
+        <div class="center">
             <a href="${media.get_path}"> Télécharger la présentation (${media.mime_type})</a>
-        </center>
+        </div>
     % endfor
       </div>
       <div id="video" class="span6">
@@ -59,9 +59,9 @@ ${event.start_time.strftime('%H:%M')} à ${event.end_time.strftime('%H:%M')}
                     src="${media.get_path}" />
             </video> <br />
         </div>
-        <center>
+        <div class="center">
             <a href="${media.get_path}"> Télécharger la vidéo (${media.mime_type})</a>
-        </center>
+        </div>
     % endfor
       </div>
     </div>
diff --git a/jm2l/upload.py b/jm2l/upload.py
index 9bf9144..9c4c7e9 100644
--- a/jm2l/upload.py
+++ b/jm2l/upload.py
@@ -57,7 +57,7 @@ class MediaPath():
                 continue
             if f:
                 filename, ext = os.path.splitext( f )
-                tmpurl = '/image/%s/%d/%s' % (media_table, linked_id, f)
+                tmpurl = '/image/%s/%d/%s' % (media_table, linked_id, f.replace(" ","%20"))
                 if MediaType is None:
                     filelist.append(tmpurl)
                 elif MediaType=='Image' and ext.lower() in ['.gif','.jpg','.png','.svg','.jpeg']:
@@ -79,7 +79,7 @@ class MediaPath():
             if f.endswith('.type'):
                 continue
             if f:
-                tmpurl = '/image/%s/%d/thumbnails/%s' % (media_table, linked_id, f)
+                tmpurl = '/image/%s/%d/thumbnails/%s' % (media_table, linked_id, f.replace(" ","%20"))
                 if MediaType is None:
                     filelist.append(tmpurl)
                 elif MediaType=='Image' and len( os.path.splitext(filename)[1] )==0: