diff --git a/include/admin/tpl/configuration.inc.tpl b/include/admin/tpl/configuration.inc.tpl
index 18f13fa1..716831b2 100644
--- a/include/admin/tpl/configuration.inc.tpl
+++ b/include/admin/tpl/configuration.inc.tpl
@@ -21,5 +21,7 @@
         <span class="msg_success"><span class="icon-ok-circle"></span> {$CONST.WRITTEN_N_SAVED}</span>
     {/if}
 {else}
+    <h2>{$CONST.CONFIGURATION}</h2>
+
     {$config|replace:'class="form_string"':'class="form_field"'|replace:'class="form_fullprotected"':'class="form_field"'|replace:'class="form_list"':'class="form_select"'|replace:'class="form_int"':'class="form_field"'}
 {/if}
diff --git a/include/admin/tpl/entries.inc.tpl b/include/admin/tpl/entries.inc.tpl
index 6d7bf1fb..b53885b3 100644
--- a/include/admin/tpl/entries.inc.tpl
+++ b/include/admin/tpl/entries.inc.tpl
@@ -1,7 +1,6 @@
 {* HTML5: Yes *}
 {* jQuery: No *}
 
-    <h2>{$CONST.EDIT_ENTRIES}</h2>
 {if $drawList}
     <form action="?" method="get">
         <input name="serendipity[action]" type="hidden" value="admin">
diff --git a/include/admin/tpl/personal.inc.tpl b/include/admin/tpl/personal.inc.tpl
index 55a42ef6..68eecc46 100644
--- a/include/admin/tpl/personal.inc.tpl
+++ b/include/admin/tpl/personal.inc.tpl
@@ -1,6 +1,7 @@
 {* HTML5: Yes *}
 {* jQuery: NN *}
 
+<h2>{$CONST.PERSONAL_SETTINGS}</h2>
 {if $adminAction == 'save'}
     {if $not_authorized}
     <span class="msg_error"><span class="icon-attention"></span> {$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</span>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 22f55fbe..0bb00a73 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1150,7 +1150,8 @@ fieldset p,
 .editor_toolbar input { margin: 0 .25em .75em 0; }
 
 .comment_data,
-.configuration_group h3 { margin-top: 0; }
+.configuration_group h3,
+form > .button_link:first-of-type { margin-top: 0; }
 
 .configuration_group > fieldset { margin-bottom: 1.5em; }