diff --git a/templates/2k11/admin/index.tpl b/templates/2k11/admin/index.tpl
index 09594778..4293b607 100644
--- a/templates/2k11/admin/index.tpl
+++ b/templates/2k11/admin/index.tpl
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="{$head_link_stylesheet}">
     <script src="{serendipity_getFile file='admin/js/modernizr-2.6.2.min.js'}"></script>
 {if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if}
-<script src="{$head_link_script}"></script>
+    <script src="{$head_link_script}"></script>
 </head>
 <body id="serendipity_admin_page">
 {if NOT $admin_vars.no_banner}
diff --git a/templates/2k11/admin/media_choose.tpl b/templates/2k11/admin/media_choose.tpl
index 0dbfa626..f2a413d0 100644
--- a/templates/2k11/admin/media_choose.tpl
+++ b/templates/2k11/admin/media_choose.tpl
@@ -53,7 +53,6 @@
     <script src="{serendipity_getFile file='YahooUI/treeview/YAHOO.js'}"></script>
     <script src="{serendipity_getFile file='YahooUI/treeview/treeview.js'}"></script>
 {serendipity_hookPlugin hook="backend_header" hookAll="true"}
-    <script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
 <script>
 var media_token_url = '{$media.token_url}';
 var media_rename = '{$CONST.ENTER_NEW_NAME}';
@@ -281,8 +280,11 @@ if (parent.frames && parent.frames['tree']) {
             <a id="managedirlink" class="button_link block_level" target="media" href="{$serendipityHTTPPath}serendipity_admin_image_selector.php?serendipity[step]=default&amp;serendipity[adminModule]=images&amp;serendipity[adminAction]=directorySelect">{$CONST.MANAGE_DIRECTORIES}</a>
         </div>
     </div>
-
-    <script>
+{/if}{* if $media.case switch end *}
+</div> <!-- //.serendipityAdminContent end -->
+<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
+{if $media.case == 'tree'}
+<script>
     var tree;
     var nodes = new Array();
     var nodeIndex;
@@ -319,9 +321,8 @@ if (parent.frames && parent.frames['tree']) {
     } 
 
     addLoadEvent(treeInit);
-    </script>
-{/if}{* if $media.case switch end *}
-</div> <!-- //.serendipityAdminContent end -->
+</script>
+{/if}
 </body>
 </html>
 {/if}{* $media.frameset else end *}
diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index eab51f30..211d0534 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -1,6 +1,7 @@
 {foreach from=$media.files item="file" name="mediafiles" key="mediakey"}
     {if NOT $media.manage}
-        <div class="media_file_preview">
+        <article class="media_wrap_thumb {cycle values="odd,even"}">
+            <div class="media_file_thumb equal_heights">
             {if $file.is_image AND $file.full_thumb}
                 {if $file.url}
                 <a href="{$file.url}&amp;serendipity[image]={$file.id}">
@@ -27,10 +28,11 @@
                 </a>
                 {/if}
             {/if}
-        {if $file.orderkey != ''}
-            <span>{$file.orderkey|@escape}</span>
-        {/if}
-        </div>
+            {if $file.orderkey != ''}
+                <span>{$file.orderkey|@escape}</span>
+            {/if}
+            </div>
+        </article>
     {else}
         <article id="media_{$file.id}" class="media_file {cycle values="odd,even"}">
             <header class="clearfix">
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index d5cb8b26..97f17bb5 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1368,15 +1368,25 @@ form > .button_link:first-of-type {
 
 #template_select article,
 .media_file,
+.media_wrap_thumb,
 .plugins_installable > li {
     background: #eee;
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box;
     margin: 0 0 1em;
+}
+
+#template_select article,
+.media_file,
+.plugins_installable > li {
     padding: 0 .5em 1em;
 }
 
+.media_wrap_thumb {
+    padding: .5em;
+}
+
 #serendipity_iframe {
     -webkit-box-shadow: 0 0 4px rgba(0,0,0,.5);
     -moz-box-shadow: 0 0 4px rgba(0,0,0,.5);
@@ -1387,10 +1397,17 @@ form > .button_link:first-of-type {
 #template_select article,
 #serendipityScaleImg img,
 .media_file,
+.media_wrap_thumb,
 .plugins_installable > li {
     border: 1px solid #aaa;
 }
 
+.media_wrap_thumb {
+    float: left;
+    margin: 0 2% 1em 0;
+    width: 48%;
+}
+
 #serendipityScaleImg img {
     height: auto;
     max-width: 99%;
