diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index b1c46bb13..859034a77 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -2,6 +2,7 @@
 jQuery(document).ready(function(){
   jQuery(".catPos").hide();
   jQuery(".drag_button").show();
+  jQuery("#manualOrder").hide();
   jQuery(".categoryLi").css("cursor","move");
   jQuery(".categoryUl").sortable({
     axis: "y",
@@ -9,8 +10,8 @@ jQuery(document).ready(function(){
     update : function() {
       jQuery("#manualOrder").show();
       jQuery("#notManualOrder").hide();
-      jQuery("#autoOrder").hide();
-      jQuery("#createAlbum").hide();
+      jQuery("#formAutoOrder").hide();
+      jQuery("#formCreateAlbum").hide();
     },
   });
 
@@ -30,23 +31,23 @@ jQuery(document).ready(function(){
   });
 
   jQuery("#addAlbumOpen").click(function(){
-    jQuery("#createAlbum").toggle();
+    jQuery("#formCreateAlbum").toggle();
     jQuery("input[name=virtual_name]").focus();
-    jQuery("#autoOrder").hide();
+    jQuery("#formAutoOrder").hide();
   });
 
   jQuery("#addAlbumClose").click(function(){
-    jQuery("#createAlbum").hide();
+    jQuery("#formCreateAlbum").hide();
   });
 
 
   jQuery("#autoOrderOpen").click(function(){
-    jQuery("#autoOrder").toggle();
-    jQuery("#createAlbum").hide();
+    jQuery("#formAutoOrder").toggle();
+    jQuery("#formCreateAlbum").hide();
   });
 
   jQuery("#autoOrderClose").click(function(){
-    jQuery("#autoOrder").hide();
+    jQuery("#formAutoOrder").hide();
   });
 
   jQuery("#cancelManualOrder").click(function(){
@@ -58,32 +59,32 @@ jQuery(document).ready(function(){
 {/literal}{/footer_script}
 
 <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Album list management'|@translate}</h2>
-<p class="showCreateAlbum">
-  <span id="notManualOrder">
-    <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a>
-    {if count($categories) }| <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a>{/if}
-  </span>
+<p class="showCreateAlbum" id="notManualOrder">
+  <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a>
+  {if count($categories)}| <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a>{/if}
 </p>
-<form id="formCreateAlbum" action="{$F_ACTION}" method="post">
-  <p>
-  <fieldset id="createAlbum" style="display:none;">
+<form id="formCreateAlbum" action="{$F_ACTION}" method="post" style="display:none;">
+  <fieldset>
       <legend>{'create a new album'|@translate}</legend>
       <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-      <p><strong>{'Album name'|@translate}</strong>
-        <br><input type="text" name="virtual_name" maxlength="255">
+      
+      <p>
+        <strong>{'Album name'|@translate}</strong><br>
+        <input type="text" name="virtual_name" maxlength="255">
       </p>
-      <span class="actionButtons">
-        <input class="submit" type="submit" value="{'Create'|@translate}" name="submitAdd">
+      
+      <p class="actionButtons">
+        <input class="submit" name="submitAdd" type="submit" value="{'Create'|@translate}">
         <a href="#" id="addAlbumClose">{'Cancel'|@translate}</a>
-      </span>
+      </p>
   </fieldset>
-  </p>
 </form>
-<form id="categoryOrdering" action="{$F_ACTION}" method="post">
-<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-{if count($categories) }
-  <fieldset id="autoOrder" style="display:none;">
+{if count($categories)}
+<form id="formAutoOrder" action="{$F_ACTION}" method="post" style="display:none;">
+  <fieldset>
     <legend>{'Automatic sort order'|@translate}</legend>
+    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
+    
     <p><strong>{'Sort order'|@translate}</strong>
       <br><label><input type="radio" value="asc" name="ascdesc" checked="checked">{'ascending'|@translate}</label>
       <br><label><input type="radio" value="desc" name="ascdesc">{'descending'|@translate}</label>
@@ -98,23 +99,24 @@ jQuery(document).ready(function(){
       <a href="#" id="autoOrderClose">{'Cancel'|@translate}</a>
     </p>
   </fieldset>
+</form>
 {/if}
-<p>
-  <span id="manualOrder" style="display:none;">
+
+<form id="categoryOrdering" action="{$F_ACTION}" method="post">
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
+  <p id="manualOrder">
     <input class="submit" name="submitManualOrder" type="submit" value="{'Save manual order'|@translate}">
     {'... or '|@translate} <a href="#" id="cancelManualOrder">{'cancel manual order'|@translate}</a>
-  </span>
-</p>
-{if count($categories) }
+  </p>
   
+{if count($categories)}
   <ul class="categoryUl">
-
     {foreach from=$categories item=category}
     <li class="categoryLi{if $category.IS_VIRTUAL} virtual_cat{/if}" id="cat_{$category.ID}">
       <!-- category {$category.ID} -->
       <p class="albumTitle">
-<img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" alt="{'Drag to re-order'|@translate}" title="{'Drag to re-order'|@translate}">
-      <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}">{$category.NAME}</a></strong>
+        <img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" alt="{'Drag to re-order'|@translate}" title="{'Drag to re-order'|@translate}">
+        <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}">{$category.NAME}</a></strong>
       </p>
 
       <p class="catPos">
@@ -137,8 +139,7 @@ jQuery(document).ready(function(){
         | <a href="{$category.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'delete album'|@translate}</a>
       {/if}
       {if cat_admin_access($category.ID)}
-      | 
-      <a href="{$category.U_JUMPTO}">{'jump to album'|@translate} →</a>
+        | <a href="{$category.U_JUMPTO}">{'jump to album'|@translate} →</a>
       {/if}
       </p>