diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index cd5a0e55..ad432c67 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -65,7 +65,7 @@
         <article class="media_file media_enclose_no">
             <header>
                 <h3>{$file.realname}</h3>
-                <span>{$file.mime}{if $file.realname != $file.diskname}, {$file.diskname}{/if}</span>
+                <span class="block_level">{$file.mime}{if $file.realname != $file.diskname}, {$file.diskname}{/if}</span>
             </header>
 
             <footer>
@@ -110,7 +110,7 @@
                 </div>
             {/if}
             {if $file.is_image}
-                <a class="block_level opens_window" onclick="ic=window.open(this.href, 'ImageCrop', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1'); ic.focus(); return false;" href="serendipity_admin_image_selector.php?serendipity[adminModule]=images&amp;serendipity[adminAction]=imgedit&amp;serendipity[fid]={$file.id}">{$CONST.EDIT}</a>
+                <a class="button_link icon_link opens_window" onclick="ic=window.open(this.href, 'ImageCrop', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1'); ic.focus(); return false;" href="serendipity_admin_image_selector.php?serendipity[adminModule]=images&amp;serendipity[adminAction]=imgedit&amp;serendipity[fid]={$file.id}">{$CONST.EDIT}</a>
             {/if}
             </section>
 
diff --git a/templates/2k11/admin/media_properties.tpl b/templates/2k11/admin/media_properties.tpl
index d7e91db7..0c759b5a 100644
--- a/templates/2k11/admin/media_properties.tpl
+++ b/templates/2k11/admin/media_properties.tpl
@@ -15,7 +15,9 @@
 {$MEDIA_ITEMS}
 
 {if $media.is_edit}
-    <input name="submit" type="submit" value="{$CONST.GO}">
+    <div class="form_buttons">
+        <input name="submit" type="submit" value="{$CONST.GO}">
+    </div>
 </div>
 </form>
 {/if}
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 4f7b5672..e7dc32a4 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -456,7 +456,8 @@ form > a,
 .media_file h3,
 #media_pane_filter label,
 #media_pane_sort label,
-#image_directory_create_form label {
+#image_directory_create_form label,
+#mediaPropertyForm .media_file_props label {
     display: inline-block;
     *display: inline;
     *zoom: 1;
@@ -892,6 +893,13 @@ summary { cursor: pointer; }
     margin: 0 1em 0 0;
 }
 
+#mediaPropertyForm .media_file_preview {
+    float: none;
+    margin: 1.5em 0;
+}
+
+#mediaPropertyForm textarea { max-width: 40em; }
+
 .media_file .actions { margin-bottom: 0; }
 
 #template_select .preview_image {
@@ -954,7 +962,8 @@ fieldset p,
 #serendipity_category label,
 #media_pane_filter label,
 #media_pane_sort label,
-#image_directory_create_form label { width: 20%; }
+#image_directory_create_form label,
+#mediaPropertyForm .media_file_props label { width: 20%; }
 
 #serendipity_category .form_multiselect label {
     display: block;
@@ -966,7 +975,9 @@ fieldset p,
 #filter_entries .form_field input { width: 79%; }
 
 #image_directory_create_form .form_field input,
-#image_directory_create_form .form_select select { min-width: 12em; }
+#image_directory_create_form .form_select select,
+#mediaPropertyForm .form_field input,
+#mediaPropertyForm .form_select select { min-width: 12em; }
 
 #edit_entry_title input,
 #edit_entry_metadata input,
@@ -1115,6 +1126,12 @@ fieldset p,
         width: 48%;
     }
 
+    #mediaPropertyForm .media_file {
+        float: none;
+        margin: 1.5em 0;
+        width: auto;
+    }
+
     #serendipityScaleImg {
         overflow: hidden;
         margin-top: 2.25em;