diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index b8ae405b..3ff8ed1a 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -372,6 +372,12 @@ function toggle_extended(setCookie) {
     }
 }
 
+// Variables for showConfig*
+var const_view = '{$CONST.VIEW_FULL}';
+var const_hide = '{$CONST.HIDE}';
+var img_plus   = '{serendipity_getFile file="img/plus.png"}';
+var img_minus  = '{serendipity_getFile file="img/minus.png"}';
+
 // Collapse/expand one config group
 function showConfig(id) {
     if (document.getElementById) {
@@ -533,7 +539,6 @@ function chkAll(frm, arr, mark) {
 }
 
 // Inverts a selection of checkboxes
-// NOTE: also used by serendipity_event_dashboard
 function invertSelection() {
     var $chkboxes = $('#formMultiDelete .multidelete');
     $chkboxes.prop('checked', !$chkboxes.attr('checked'))
diff --git a/templates/2k11/admin/serendipity_plugin_config.fnc.tpl b/templates/2k11/admin/serendipity_plugin_config.fnc.tpl
index 08a987bc..ca6573f1 100644
--- a/templates/2k11/admin/serendipity_plugin_config.fnc.tpl
+++ b/templates/2k11/admin/serendipity_plugin_config.fnc.tpl
@@ -1,10 +1,4 @@
 {* serendipity_plugins_admin.inc.php::serendipity_plugin_config() *}
-    <script>
-        var const_view = '{$CONST.VIEW_FULL}';
-        var const_hide = '{$CONST.HIDE}';
-        var img_plus   = '{serendipity_getFile file="img/plus.png"}';
-        var img_minus  = '{serendipity_getFile file="img/minus.png"}';
-    </script>
 {if $showSubmit_head}
     <div class="save_conf form_buttons">
         {if $postKey == "template"}
@@ -19,7 +13,7 @@
 {if is_array($config_groups)}
         <a id="optionall" class="button_link icon_link standalone" href="#" onClick="showConfigAll({sizeof($config_groups)}); return false" title="{$CONST.TOGGLE_ALL}">{$CONST.TOGGLE_ALL}</a>
     {foreach $config_groups AS $config_header => $config_groupkeys}
-        <h2><a id="optionel{$config_groupkeys@iteration}" href="#" onClick="showConfig('el{$config_groupkeys@iteration}'); return false" title="{$CONST.TOGGLE_OPTION}">{$config_header}</a></h2>
+        <h3><a id="optionel{$config_groupkeys@iteration}" href="#el{$config_groupkeys@iteration}" onClick="showConfig('el{$config_groupkeys@iteration}'); return false" title="{$CONST.TOGGLE_OPTION}">{$config_header}</a></h3>
         
         <fieldset id="el{$config_groupkeys@iteration}" class="plugin_optiongroup{if $config_groupkeys@last} plugin_optiongroup_last{/if}">
         {foreach $config_groupkeys AS $config_groupkey}
diff --git a/templates/2k11/admin/users.inc.tpl b/templates/2k11/admin/users.inc.tpl
index b542b46b..bf2f451a 100644
--- a/templates/2k11/admin/users.inc.tpl
+++ b/templates/2k11/admin/users.inc.tpl
@@ -66,7 +66,7 @@
     <form{if $adminAction == 'edit'} id="editform"{/if} action="?serendipity[adminModule]=users#editform" method="post">
         {$formToken}
         {if $adminAction == 'edit'}{if $create_permission}<input name="serendipity[user]" type="hidden" value="{$from.authorid}">{/if}{/if}
-        <h3>{if $adminAction == 'edit'}{if $no_create_permission}{$CONST.CREATE_NOT_AUTHORIZED}: {$CONST.EDIT}{else}{if $create_permission}{$CONST.EDIT}{else}{$CONST.CREATE_NOT_AUTHORIZED}: {$CONST.EDIT}{/if}{/if}{else}{$CONST.CREATE}{/if}</h3>
+        <h2>{if $adminAction == 'edit'}{if $no_create_permission}{$CONST.CREATE_NOT_AUTHORIZED}: {$CONST.EDIT}{else}{if $create_permission}{$CONST.EDIT}{else}{$CONST.CREATE_NOT_AUTHORIZED}: {$CONST.EDIT}{/if}{/if}{else}{$CONST.CREATE}{/if}</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_multilist"':'class="form_multiselect"'|replace:'class="form_int"':'class="form_field"'|replace:'class="form_textarea"':'class="form_area"'}
         <div class="form_buttons">
         {if $adminAction == 'edit'}