diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 1e73df09d..ddb4388bb 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -59,10 +59,25 @@ jQuery(document).ready(function(){
 
 <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Album list management'|@translate}</h2>
 
+
+<form id="CreateAlbum" action="{$F_ACTION}" method="post">
+  <fieldset id="createAlbum" style="display:none;">
+    <p class="showCreateAlbum">
+      <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">
+      </p>
+      <p class="actionButtons">
+        <input class="submit" type="submit" value="{'Create'|@translate}" name="submitAdd">
+        <a href="#" id="addAlbumClose">{'Cancel'|@translate}</a>
+      </p>
+    </p>
+  </fieldset>
+</form>
 <form id="categoryOrdering" action="{$F_ACTION}" method="post">
 <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-
-<p class="showCreateAlbum">
+<p>
   <span id="notManualOrder">
     <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a>
     | <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a>
@@ -72,39 +87,25 @@ jQuery(document).ready(function(){
     {'... or '|@translate} <a href="#" id="cancelManualOrder">{'cancel manual order'|@translate}</a>
   </span>
 </p>
-
-<fieldset id="createAlbum" style="display:none;">
-  <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">
-  </p>
-  <p class="actionButtons">
-    <input class="submit" type="submit" value="{'Create'|@translate}" name="submitAdd">
-    <a href="#" id="addAlbumClose">{'Cancel'|@translate}</a>
-  </p>
-</fieldset>
-
 {if count($categories) }
 
-<fieldset id="autoOrder" style="display:none;">
-  <legend>{'Automatic sort order'|@translate}</legend>
-  <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>
-  </p>
-
-  <p>
-    <label><input type="checkbox" name="recursive"> <strong>{'Apply to sub-albums'|@translate}</strong></label>
-  </p>
-
-  <p class="actionButtons">
-    <input class="submit" name="submitAutoOrder" type="submit" value="{'Save order'|@translate}">
-    <a href="#" id="autoOrderClose">{'Cancel'|@translate}</a>
-  </p>
-</fieldset>
-
+  <span id="autoOrder" style="display:none;">
+    <legend>{'Automatic sort order'|@translate}</legend>
+    <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>
+    </p>
+  
+    <p>
+      <label><input type="checkbox" name="recursive"> <strong>{'Apply to sub-albums'|@translate}</strong></label>
+    </p>
+  
+    <p class="actionButtons">
+      <input class="submit" name="submitAutoOrder" type="submit" value="{'Save order'|@translate}">
+      <a href="#" id="autoOrderClose">{'Cancel'|@translate}</a>
+    </p>
+  </span>
+  
   <ul class="categoryUl">
 
     {foreach from=$categories item=category}
@@ -122,23 +123,23 @@ jQuery(document).ready(function(){
         </label>
       </p>
 
-<p class="albumActions">
-        <a href="{$category.U_EDIT}">{'Edit'|@translate}</a>
-        {if isset($category.U_MANAGE_ELEMENTS) }
-        | <a href="{$category.U_MANAGE_ELEMENTS}">{'manage album photos'|@translate}</a>
-        {/if}
-        | <a href="{$category.U_CHILDREN}">{'manage sub-albums'|@translate}</a>
-        {if isset($category.U_SYNC) }
-        | <a href="{$category.U_SYNC}">{'Synchronize'|@translate}</a>
-        {/if}
-        {if isset($category.U_DELETE) }
-        | <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>
-{/if}
-</p>
+      <p class="albumActions">
+              <a href="{$category.U_EDIT}">{'Edit'|@translate}</a>
+              {if isset($category.U_MANAGE_ELEMENTS) }
+              | <a href="{$category.U_MANAGE_ELEMENTS}">{'manage album photos'|@translate}</a>
+              {/if}
+              | <a href="{$category.U_CHILDREN}">{'manage sub-albums'|@translate}</a>
+              {if isset($category.U_SYNC) }
+              | <a href="{$category.U_SYNC}">{'Synchronize'|@translate}</a>
+              {/if}
+              {if isset($category.U_DELETE) }
+              | <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>
+      {/if}
+      </p>
 
     </li>
     {/foreach}