diff --git a/template/default/default.css b/template/default/default.css
index 9e043a061..0d39b2052 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -105,12 +105,13 @@ div.information {  font-size:14px; font-weight:bold;}
   float:left;
   width:30%;
   text-align:left;
+  white-space:nowrap;
 }
 
 #centre
 {
   float:left;
-  width:40%;
+  width:39%;
   text-align:center;
 }
 
diff --git a/template/default/picture.tpl b/template/default/picture.tpl
index 4bd65d6d6..91db1219b 100644
--- a/template/default/picture.tpl
+++ b/template/default/picture.tpl
@@ -63,6 +63,7 @@
 </div>
 <!-- END stop_slideshow -->
 <div style="clear:both;"></div>
+<div style="white-space:nowrap;">
 <div id="gauche">
 &nbsp;
   <!-- BEGIN previous -->
@@ -91,6 +92,7 @@
   <!-- END next -->
   &nbsp;
 </div>
+</div>
 <div style="clear:both;"></div>
          <!-- BEGIN metadata -->
           <table class="tablecompact">
@@ -160,7 +162,8 @@
                     <!-- END author_known -->
                     {L_COMMENT}</td>
 					<td style="width:100%;">
-					<input name="content" type="text" maxlength="200" style="width:100%;" value="" /></td><td>
+					<textarea name="content" rows="2" style="width:100%;"></textarea>
+					</td><td>
 					<input type="submit" value="{L_SUBMIT}" class="bouton" />
 			  </td>
 			 </tr>