diff --git a/container/contents.pt b/container/contents.pt
index 6756aa6..5746ef2 100644
--- a/container/contents.pt
+++ b/container/contents.pt
@@ -12,30 +12,27 @@
 
   <div metal:define-macro="contents"
        id="body.contents">
-
     <tal:checkmove define="dummy view/checkMoveAction">
-    <form name="containerContentsForm" method="post" action="."
+
+    <form name="contents" method="post" action="."
           tal:attributes="action request/URL"
           tal:define="container_contents view/listContentInfo">
-
       <metal:keep-batch define-macro="keep_batch_params">
         <tal:param repeat="param python:('b_page', 'b_size', 'b_overlap', 'b_orphan')">
-            <input type="hidden"
-                tal:define="value request/?param|nothing"
-                tal:condition="value"
-                tal:attributes="name param;
-                                value value" />
+          <input type="hidden"
+                 tal:define="value request/?param|nothing"
+                 tal:condition="value"
+                 tal:attributes="name param;
+                                 value value" />
         </tal:param>
       </metal:keep-batch>
 
       <input type="hidden" name="type_name" value=""
              tal:attributes="value request/type_name"
-             tal:condition="request/type_name|nothing"
-             />
+             tal:condition="request/type_name|nothing" />
       <input type="hidden" name="retitle_id" value=""
              tal:attributes="value request/retitle_id"
-             tal:condition="request/retitle_id|nothing"
-             />
+             tal:condition="request/retitle_id|nothing" />
 
       <div class="page_error"
            tal:condition="view/error"
@@ -52,7 +49,7 @@
             <th style="margin:0; padding:0">
               <input type="checkbox" class="noborder" title="Select all items"
                      i18n:attributes="title"
-                     onclick="f = document.forms[0]['ids:list'];
+                     onclick="f = document.forms.contents['ids:list'];
                               for (i in f) f[i].checked=this.checked;" /></th>
             <th i18n:translate="">Name</th>
             <th i18n:translate="">Title</th>
@@ -69,9 +66,7 @@
             tal:condition="python:names_required and request.has_key('type_name')">
           <td></td>
           <td><input name="new_value" id="focusid" value="" /></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td></td><td></td><td></td>
         </tr>
         </metal:block>
 
@@ -165,29 +160,22 @@
       </table>
 
       <div tal:condition="view/normalButtons">
-
         <input type="submit" name="container_rename_button" value="Rename"
                i18n:attributes="value container-rename-button"
-               tal:condition="view/supportsRename"
-               />
+               tal:condition="view/supportsRename" />
         <input type="submit" name="container_cut_button" value="Cut"
                i18n:attributes="value container-cut-button"
-               tal:condition="view/supportsCut"
-               />
+               tal:condition="view/supportsCut" />
         <input type="submit" name="container_copy_button" value="Copy"
                i18n:attributes="value container-copy-button"
-               tal:condition="view/supportsCopy"
-               />
+               tal:condition="view/supportsCopy" />
         <input type="submit" name="container_paste_button" value="Paste"
                tal:condition="view/hasClipboardContents"
-               i18n:attributes="value container-paste-button"
-               />
+               i18n:attributes="value container-paste-button" />
         <input type="submit" name="container_delete_button" value="Delete"
                i18n:attributes="value container-delete-button"
                tal:condition="view/supportsDelete"
-               i18n:domain="zope"
-               />
-
+               i18n:domain="zope" />
         <div tal:condition="view/hasAdding" tal:omit-tag="">
         <div tal:omit-tag=""
              tal:define="adding nocall:context/@@+;
@@ -197,19 +185,14 @@
              tal:condition="adding/isSingleMenuItem">
           <input type="submit" name="container_add_button" value="Add"
                  i18n:attributes="value add-button"
-                 i18n:domain="zope"
-               />
+                 i18n:domain="zope" />
           <input type="text" name="single_new_value" id="focusid"
                  tal:condition="python:names_required and not has_custom_add_view"
-                 i18n:domain="zope"
-               />
+                 i18n:domain="zope" />
           <input type="hidden" name="single_type_name"
-               value=""
-               tal:attributes="value python:addingInfo[0]['action']"
-               />
+               tal:attributes="value python:addingInfo[0]['action']" />
         </div>
         </div>
-
         <div tal:condition="view/orderable">
           <input type="submit" name="move_top" value="Top"
                  i18n:attributes="value container-movetop-button"
@@ -225,25 +208,21 @@
                  i18n:attributes="value container-movebottom-button"
                  i18n:domain="zope" />
         </div>
-
       </div>
 
       <div tal:condition="view/specialButtons">
         <input type="submit" value="Apply"
-               i18n:attributes="value container-apply-button"
-               />
+               i18n:attributes="value container-apply-button" />
         <input type="submit" name="container_cancel_button" value="Cancel"
-               i18n:attributes="value container-cancel-button"
-               />
+               i18n:attributes="value container-cancel-button" />
       </div>
 
     </form>
     </tal:checkmove>
 
-
     <script type="text/javascript"><!--
-        if (document.containerContentsForm.new_value)
-            document.containerContentsForm.new_value.focus();
+        if (document.forms.contents.new_value)
+            document.forms.contents.new_value.focus();
         //-->
     </script>