diff --git a/admin/template/yoga/admin/history.tpl b/admin/template/yoga/admin/history.tpl
index aeb99ea56..f3c3575b6 100644
--- a/admin/template/yoga/admin/history.tpl
+++ b/admin/template/yoga/admin/history.tpl
@@ -61,20 +61,16 @@
     {'File name'|@translate}
     <input name="filename" value="{$FILENAME}" type="text">
   </label>
+
+  <label>
+    {'Thumbnails'|@translate}
+    <select name="display_thumbnail">
+      {html_options values=$display_thumbnail_values output=$display_thumbnail_values|translate selected=$display_thumbnail_selected}
+    </select>
+  </label>
 
   <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" />
 </fieldset>
-<fieldset>
-  <legend>{'Display'|@translate}</legend>
-  <ul>
-    <li>
-      {'Thumbnails'|@translate}
-      <select name="display_thumbnail">
-        {html_options values=$display_thumbnail_values output=$display_thumbnail_values|translate selected=$display_thumbnail_selected}
-      </select>
-    </li>
-  </ul>
-</fieldset>
 </form>
 
 {if isset($search_summary)}
diff --git a/upload.php b/upload.php
index 83131c80d..bcb82bee9 100644
--- a/upload.php
+++ b/upload.php
@@ -222,7 +222,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
   // creation of the "infos" field :
   // <infos author="Pierrick LE GALL" comment="my comment"
   //        date_creation="2004-08-14" name="" />
-  $xml_infos = '<infos';
+  $xml_infos = '<infos ';
   $xml_infos.= encodeAttribute('author', $_POST['author']);
   $xml_infos.= encodeAttribute('comment', $_POST['comment']);
   $xml_infos.= encodeAttribute('date_creation', $date_creation);