diff --git a/templates/2k11/admin/config_template.tpl b/templates/2k11/admin/config_template.tpl
index d563dc2f..ec3b9f7a 100644
--- a/templates/2k11/admin/config_template.tpl
+++ b/templates/2k11/admin/config_template.tpl
@@ -18,14 +18,14 @@
         {foreach $category.items as $item}
             {if $item.guessedInput}
                 {if $item.type == 'bool'}
-                <fieldset>
+                <fieldset class="clearfix">
                     <legend><span>{$item.title} <span>{$item.description}</span></span></legend>
                     <div class="clearfix">
                     {$item.guessedInput}
                     </div>
                 </fieldset>
                 {else}
-                <div class="form_{if $item.type == 'list'}select{elseif $item.type == 'multilist'}multiselect{elseif $item.type == 'textarea'}area{else}field{/if}">
+                <div class="clearfix form_{if $item.type == 'list'}select{elseif $item.type == 'multilist'}multiselect{elseif $item.type == 'textarea'}area{else}field{/if}">
                     <label for="{$item.var}">{$item.title}<span>{$item.description}</span></label>
                     {$item.guessedInput}
                 </div>
diff --git a/templates/2k11/admin/groups.inc.tpl b/templates/2k11/admin/groups.inc.tpl
index 7cd6f45e..73e61b2a 100644
--- a/templates/2k11/admin/groups.inc.tpl
+++ b/templates/2k11/admin/groups.inc.tpl
@@ -41,13 +41,13 @@
     {else}
         <h3>{$CONST.CREATE}</h3>
     {/if}
-        <div class="form_field">
+        <div class="clearfix form_field">
             <label for="group_name">{$CONST.NAME}</label>
             {* BUG: Doesn't pull the group name; this doesn't work in 1.7, either. *}
             <input id="group_name" name="serendipity[name]" type="text" value="{$from.name|escape:"html"}">
         </div>
 
-        <div class="form_select">
+        <div class="clearfix form_select">
             <label for="group_members">{$CONST.USERCONF_GROUPS}</label>
             <select id="group_members" name="serendipity[members][]" multiple size="5">
                 {foreach $allusers as $user}
@@ -95,7 +95,7 @@
         </li></ul>
 
         {if $enablePluginACL}
-            <div class="form_select">
+            <div class="clearfix form_select">
                 <label for="forbidden_plugins">{$CONST.PERMISSION_FORBIDDEN_PLUGINS}</label>
                 <select id="forbidden_plugins" name="serendipity[forbidden_plugins][]" multiple size="5">
                 {foreach $allplugins as $plugin}
@@ -104,7 +104,7 @@
                 </select>
             </div>
 
-            <div class="form_select">
+            <div class="clearfix form_select">
                 <label for="forbidden_hooks">{$CONST.PERMISSION_FORBIDDEN_HOOKS}</label>
                 <select name="serendipity[forbidden_hooks][]" multiple size="5">
                 {foreach $allhooks as $hook}
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 3afdc09d..e08ef820 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1876,13 +1876,7 @@ input[name="serendipity[filter][fileCategory]"] {
         clear: left;
     }
 
-    .configuration_group .form_select,
-    .configuration_group .form_multiselect,
-    .configuration_group .form_field,
-    .configuration_group .form_area,
-    .configuration_group fieldset > fieldset,
-    #serendipityScaleImg,
-    .media_file header {
+    #serendipityScaleImg {
         overflow: hidden;
     }