diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl
index 4be7af17..d09354a1 100644
--- a/templates/2k11/admin/media_pane.tpl
+++ b/templates/2k11/admin/media_pane.tpl
@@ -13,19 +13,21 @@
                     <select id="serendipity_only_path" name="serendipity[only_path]">
                         <option value="">{if NOT $media.limit_path}{$CONST.ALL_DIRECTORIES}{else}{$media.blimit_path}{/if}</option>
                     {foreach from=$media.paths item="folder"}
+
                         <option{if ($media.only_path == $media.limit_path|cat:$folder.relpath)} selected{/if} value="{$folder.relpath}">{'&nbsp;'|str_repeat:($folder.depth*2)}{$folder.name}</option>
                     {/foreach}
+
                     </select>
                     <input name="go" type="submit" value="{$CONST.GO}">
                 </div>
             </li>
             <li id="media_selector_bar">
                 <fieldset>
-                    <input type="radio" id="serendipity[filter][fileCategory][All]" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == ""}checked{/if} value="">
+                    <input type="radio" id="serendipity[filter][fileCategory][All]" name="serendipity[filter][fileCategory]"{if $media.filter.fileCategory == ""} checked{/if} value="">
                     <label for="serendipity[filter][fileCategory][All]" class="media_selector button_link">{$CONST.COMMENTS_FILTER_ALL}</label>
-                    <input id="serendipity[filter][fileCategory][Image]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "image"}checked{/if} value="image">
+                    <input id="serendipity[filter][fileCategory][Image]" type="radio" name="serendipity[filter][fileCategory]"{if $media.filter.fileCategory == "image"} checked{/if} value="image">
                     <label for="serendipity[filter][fileCategory][Image]" class="media_selector button_link">{$CONST.IMAGE}</label>
-                    <input id="serendipity[filter][fileCategory][Video]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "video"}checked{/if} value="video">
+                    <input id="serendipity[filter][fileCategory][Video]" type="radio" name="serendipity[filter][fileCategory]"{if $media.filter.fileCategory == "video"} checked{/if} value="video">
                     <label for="serendipity[filter][fileCategory][Video]" class="media_selector button_link">{$CONST.VIDEO}</label>
                 </fieldset>
             </li>
@@ -36,16 +38,20 @@
 
             <div id="media_filter" class="clearfix">
                 {foreach from=$media.sort_order item="so_val" key="so_key"}
+
                     <div class="{cycle values="left,center,right"}">
                     {if $so_val.type == 'date' || $so_val.type == 'intrange'}
+
                         <fieldset>
                             <span class="wrap_legend"><legend>{$CONST.SORT_BY} ({$so_key})</legend></span>
                     {else}
+
                         <div class="form_{if $so_val.type == 'authors'}select{else}field{/if}">
                             <label for="serendipity_filter_{$so_key}">{$so_val.desc}</label>
                     {/if}
                     {if $so_val.type == 'date'}
                         {if $media.filter[$so_key].from != '' OR $media.filter[$so_key].to != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
+
                             <div class="form_field">
                                 <label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">{$CONST.RANGE_FROM}</label>
                                 <input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="date" value="{$media.filter[$so_key].from|escape}">
@@ -55,6 +61,7 @@
                             </div>
                     {elseif $so_val.type == 'intrange'}
                         {if $media.filter[$so_key].from != '' OR $media.filter[$so_key].to != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
+
                             <div class="form_field">
                                 <label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">{$CONST.RANGE_FROM}</label>
                                 <input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="text" value="{$media.filter[$so_key].from|escape}">
@@ -64,11 +71,14 @@
                             </div>
                     {elseif $so_val.type == 'authors'}
                         {if $media.filter[$so_key] != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
+
                             <select id="serendipity_filter_{$so_key}" name="serendipity[filter][{$so_key}]">
                                 <option value="">{$CONST.ALL_AUTHORS}</option>
                             {foreach from=$media.authors item="media_author"}
+
                                 <option value="{$media_author.authorid}"{if $media.filter[$so_key] == $media_author.authorid} selected{/if}>{$media_author.realname|escape}</option>
                             {/foreach}
+
                             </select>
                     {else}
                         {if $media.filter[$so_key] != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
@@ -76,10 +86,13 @@
                             <input id="serendipity_filter_{$so_key}" name="serendipity[filter][{$so_key}]" type="text" value="{$media.filter[$so_key]|escape}">
                     {/if}
                     {if $so_val.type == 'date' || $so_val.type == 'intrange'}
+
                         </fieldset>
                     {else}
+
                         </div>
                     {/if}
+
                     </div>
                 {/foreach}
 
@@ -95,8 +108,10 @@
 
                 <div id="keyword_list" class="clearfix right">
                 {foreach from=$media.keywords item="keyword"}
+
                     <a class="add_keyword" href="#keyword-input" data-keyword="{$keyword|escape}" title="{$keyword|escape}">{$keyword|escape|truncate:20:"&hellip;"}</a>
                 {/foreach}
+
                 </div>
             </div>
         </fieldset>
@@ -109,14 +124,16 @@
 
                     <select id="serendipity_sortorder_order" name="serendipity[sortorder][order]">
                     {foreach from=$media.sort_order item="so_val" key="so_key"}
+
                         <option value="{$so_key}"{if $media.sortorder.order == $so_key} selected{/if}>{$so_val.desc}</option>
                     {/foreach}
+
                     </select>
                 </div>
 
                 <div class="form_select">
                     <label for="serendipity_sortorder_ordermode">{$CONST.SORT_ORDER}</label>
-                    
+
                     <select id="serendipity_sortorder_ordermode" name="serendipity[sortorder][ordermode]">
                         <option value="DESC"{if $media.sortorder.ordermode == 'DESC'} selected{/if}>{$CONST.SORT_ORDER_DESC}</option>
                         <option value="ASC"{if $media.sortorder.ordermode == 'ASC'} selected{/if}>{$CONST.SORT_ORDER_ASC}</option>
@@ -128,8 +145,10 @@
 
                     <select id="serendipity_sortorder_perpage" name="serendipity[sortorder][perpage]">
                     {foreach from=$media.sort_row_interval item="so_val"}
+
                         <option value="{$so_val}"{if $media.perPage == $so_val} selected{/if}>{$so_val}</option>
                     {/foreach}
+
                     </select>
                 </div>
             </div>
@@ -141,35 +160,41 @@
         <script>
             $(document).ready(function() {
             {foreach $media.sortParams AS $sortParam}
-                serendipity.SetCookie("sortorder_{$sortParam}","{$get_sortorder_{$sortParam}}" )
+
+                serendipity.SetCookie("sortorder_{$sortParam}","{$get_sortorder_{$sortParam}}");
+            {/foreach}
+            {foreach $media.filterParams AS $filterParam}
+
+                serendipity.SetCookie("{$filterParam}", "{$get_{$filterParam}}");
             {/foreach}
 
-            {foreach $media.filterParams AS $filterParam}
-                serendipity.SetCookie("{$filterParam}", "{$get_{$filterParam}}" )
-            {/foreach}
             });
         </script>
     </form>
 </div>
 
 {if $smarty.get.serendipity.showUpload}
+
     <a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a>
 {/if}
 
 {if $media.nr_files < 1}
+
     <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.NO_IMAGES_FOUND}</span>
 {else}
     {if $media.manage}
+
         <form id="formMultiDelete" name="formMultiDelete" action="?" method="post">
             {$media.token}
             <input name="serendipity[action]" type="hidden" value="admin">
             <input name="serendipity[adminModule]" type="hidden" value="media">
             <input name="serendipity[adminAction]" type="hidden" value="multidelete">
     {/if}
-    
+
     <div class="clearfix media_pane" data-thumbmaxwidth="{$media.thumbSize}">
         {$MEDIA_ITEMS}
         {if ($media.page != 1 && $media.page <= $media.pages)||$media.page != $media.pages}
+
         <nav class="pagination">
             <h3>{$CONST.PAGE_BROWSE_ENTRIES|sprintf:$media.page:$media.pages:$media.totalImages}</h3>
 
@@ -179,8 +204,10 @@
             </ul>
         </nav>
         {/if}
+
     </div>
     {if $media.manage}
+
         <div class="form_buttons">
             <input class="invert_selection" name="toggle" type="button" value="{$CONST.INVERT_SELECTIONS}">
             <input class="state_cancel" name="toggle" type="submit" value="{$CONST.DELETE}">
@@ -190,8 +217,10 @@
                 <select id="newDir" name="serendipity[newDir]">
                     <option value=""></option>
                 {foreach from=$media.paths item="folder"}
+
                     <option{if ($media.only_path == $media.limit_path|cat:$folder.relpath)} selected{/if} value="{$folder.relpath}">{'&nbsp;'|str_repeat:($folder.depth*2)}{$folder.name}</option>
                 {/foreach}
+
                 </select>
                 <input class="state_submit" name="toggle" type="submit" value="{$CONST.MOVE}">
             </div>