diff --git a/include/admin/tpl/show_plugins.fnc.tpl b/include/admin/tpl/show_plugins.fnc.tpl
index f3a8469b..6155e021 100644
--- a/include/admin/tpl/show_plugins.fnc.tpl
+++ b/include/admin/tpl/show_plugins.fnc.tpl
@@ -40,18 +40,12 @@
 
                 <ol id="{$plugin_placement['pid']}_col" class="pluginmanager_container plainList">
                 {foreach $plugin_placement['plugin_data'] as $plugin_data}
-                    <li id="{$plugin_data['css_key']}" class="pluginmanager_item_{cycle values="odd,even"}">
-                        <div id="g{$plugin_data['css_key']}" class="pluginmanager_grablet">
-                            <a id="grab{$plugin_data['css_key']}" class="icon_link" href="#" title="Move"><span class="icon-move"></span><span class="visuallyhidden"> Move</span></a>{* i18n *}
-                        </div>
+                    <li id="{$plugin_data['css_key']}" class="pluginmanager_plugin pluginmanager_item_{cycle values="odd,even"}">
                     {if $plugin_data['is_plugin_editable']}
                         <div class="form_check">
                             <input id="remove_{$plugin_data['name']}" name="serendipity[plugin_to_remove][]" type="checkbox" value="{$plugin_data['name']}">
                             <label for="remove_{$plugin_data['name']}" class="visuallyhidden">Remove this plugin</label>{* i18n *}
                         </div>
-                    {/if}
-                    {if $plugin_data['can_configure']}
-                        <a class="pluginmanager_configure icon_link" href="?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]={$plugin_data['key']}" title="{$CONST.CONFIGURATION}"><span class="icon-cog-alt"></span><span class="visuallyhidden"> {$CONST.CONFIGURATION}</span></a>
                     {/if}
                         <h5>
                         {if $plugin_data['can_configure']}
@@ -61,6 +55,14 @@
                         {/if}
                         </h5>
 
+                        <div id="g{$plugin_data['css_key']}" class="pluginmanager_grablet">
+                            <a id="grab{$plugin_data['css_key']}" class="icon_link" href="#" title="Move"><span class="icon-move"></span><span class="visuallyhidden"> Move</span></a>{* i18n *}
+                        </div>
+
+                    {if $plugin_data['can_configure']}
+                        <a class="pluginmanager_configure icon_link" href="?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]={$plugin_data['key']}" title="{$CONST.CONFIGURATION}"><span class="icon-cog-alt"></span><span class="visuallyhidden"> {$CONST.CONFIGURATION}</span></a>
+                    {/if}
+
                         <ul class="pluginmanager_plugininfo plainList">
                             <li class="pluginmanager_description">{$plugin_data['desc']}</li>
                             <li class="pluginmanager_ownership">{$plugin_data['ownership']}</li>
diff --git a/templates/2k11/admin/pluginmanager.css b/templates/2k11/admin/pluginmanager.css
index 20e2e683..4593b5eb 100644
--- a/templates/2k11/admin/pluginmanager.css
+++ b/templates/2k11/admin/pluginmanager.css
@@ -12,14 +12,14 @@
     padding: 5px;
 }
 
-.pluginmanager_container li {
+.pluginmanager_plugin {
     margin: 0 0 5px;
-    padding: 5px;
+    padding: 2em 5px 5px;
     position: relative;
 }
 
-.pluginmanager_item_even,
-.pluginmanager_item_uneven {
+.pluginmanager_item_odd,
+.pluginmanager_item_even {
     background: #eee;
     border: 1px solid #ddd;
 }
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 0bf84e24..ca321ef7 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -902,6 +902,8 @@ summary { cursor: pointer; }
 #filter_comments label {
     display: inline-block;
     width: 15%;
+    *display: inline;
+    *zoom: 1;
 }
 
 #sort_entries .form_select label,
@@ -910,6 +912,8 @@ summary { cursor: pointer; }
 #serendipity_category label {
     display: inline-block;
     width: 20%;
+    *display: inline;
+    *zoom: 1;
 }
 
 #serendipity_category .form_multiselect label {
@@ -973,6 +977,23 @@ summary { cursor: pointer; }
     margin: 0 0 1.5em;
 }
 
+.pluginmanager_grablet,
+.pluginmanager_configure {
+    position: absolute;
+    top: 5px;
+}
+
+.pluginmanager_grablet { left: 5px; }
+.pluginmanager_configure { right: 5px; }
+
+.pluginmanager_plugin .form_check,
+.pluginmanager_plugin h5 {
+    display: inline-block;
+    margin: 0 0 1em;
+    *display: inline;
+    *zoom: 1;
+}
+
 /* Media db – might go into imgedit.css in the end */
 #fs_crop { min-height: 200px; }