diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index edadaedf..d531f8f0 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -238,7 +238,7 @@ tr.account {
 /* --- end of workaround for vertical tabs --- */
 
 .tabs-hover {
-	background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
+	background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x !important;
 }
 
 /* title bar */
diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index 2f1bfc50..33b79c5e 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -171,16 +171,6 @@ if (sizeof($errorsToDisplay) > 0) {
 // display formular
 echo ("<form action=\"confmain.php\" method=\"post\">\n");
 
-$buttonContainer = new htmlTable();
-$saveButton = new htmlButton('saveSettings', _('Save'));
-$saveButton->setIconClass('saveButton');
-$buttonContainer->addElement($saveButton);
-$cancelButton = new htmlButton('cancelSettings', _('Cancel'));
-$cancelButton->setIconClass('cancelButton');
-$buttonContainer->addElement($cancelButton, true);
-$buttonContainer->addElement(new htmlSpacer(null, '10px'));
-parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
-
 // hidden submit buttons which are clicked by tabs
 echo "<div style=\"display: none;\">\n";
 	echo "<input name=\"generalSettingsButton\" type=\"submit\" value=\" \">";
@@ -197,15 +187,15 @@ echo '<li id="generalSettingsButton" class="ui-state-default ui-corner-top">';
 	echo '<a href="#" onclick="document.getElementsByName(\'generalSettingsButton\')[0].click();"><img src="../../graphics/tools.png" alt=""> ';
 	echo _('General settings') . '</a>';
 echo '</li>';
-echo '<li id="edittypes" class="ui-state-default ui-corner-top">';
+echo '<li id="edittypes" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'edittypes\')[0].click();"><img src="../../graphics/gear.png" alt=""> ';
 	echo _('Account types') . '</a>';
 echo '</li>';
-echo '<li id="editmodules" class="ui-state-default ui-corner-top">';
+echo '<li id="editmodules" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'editmodules\')[0].click();"><img src="../../graphics/modules.png" alt=""> ';
 	echo _('Modules') . '</a>';
 echo '</li>';
-echo '<li id="moduleSettings" class="ui-state-default ui-corner-top">';
+echo '<li id="moduleSettings" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'moduleSettings\')[0].click();"><img src="../../graphics/modules.png" alt=""> ';
 	echo _('Module settings') . '</a>';
 echo '</li>';
@@ -375,9 +365,22 @@ $container->addElement(new htmlOutputText('*=' . _("required")), true);
 
 parseHtml(null, $container, array(), false, $tabindex, 'user');
 
-echo ("</div></div></form>\n");
-echo ("</body>\n");
-echo ("</html>\n");
+echo "</div></div>";
+
+$buttonContainer = new htmlTable();
+$buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
+$saveButton = new htmlButton('saveSettings', _('Save'));
+$saveButton->setIconClass('saveButton');
+$buttonContainer->addElement($saveButton);
+$cancelButton = new htmlButton('cancelSettings', _('Cancel'));
+$cancelButton->setIconClass('cancelButton');
+$buttonContainer->addElement($cancelButton, true);
+$buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
+parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
+
+echo "</form>\n";
+echo "</body>\n";
+echo "</html>\n";
 
 
 /**
diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php
index 647f2796..f8c195b5 100644
--- a/lam/templates/config/confmodules.php
+++ b/lam/templates/config/confmodules.php
@@ -138,16 +138,6 @@ for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMe
 
 echo ("<form action=\"confmodules.php\" method=\"post\">\n");
 
-$buttonContainer = new htmlTable();
-$saveButton = new htmlButton('saveSettings', _('Save'));
-$saveButton->setIconClass('saveButton');
-$buttonContainer->addElement($saveButton);
-$cancelButton = new htmlButton('cancelSettings', _('Cancel'));
-$cancelButton->setIconClass('cancelButton');
-$buttonContainer->addElement($cancelButton, true);
-$buttonContainer->addElement(new htmlSpacer(null, '10px'));
-parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
-
 // hidden submit buttons which are clicked by tabs
 echo "<div style=\"display: none;\">\n";
 	echo "<input name=\"generalSettingsButton\" type=\"submit\" value=\" \">";
@@ -160,11 +150,11 @@ echo "</div>\n";
 echo '<div class="ui-tabs ui-widget ui-widget-content ui-corner-all">';
 
 echo '<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">';
-echo '<li id="generalSettingsButton" class="ui-state-default ui-corner-top">';
+echo '<li id="generalSettingsButton" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'generalSettingsButton\')[0].click();"><img src="../../graphics/tools.png" alt=""> ';
 	echo _('General settings') . '</a>';
 echo '</li>';
-echo '<li id="edittypes" class="ui-state-default ui-corner-top">';
+echo '<li id="edittypes" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'edittypes\')[0].click();"><img src="../../graphics/gear.png" alt=""> ';
 	echo _('Account types') . '</a>';
 echo '</li>';
@@ -172,7 +162,7 @@ echo '<li id="editmodules" class="ui-state-default ui-corner-top">';
 	echo '<a href="#" onclick="document.getElementsByName(\'editmodules\')[0].click();"><img src="../../graphics/modules.png" alt=""> ';
 	echo _('Modules') . '</a>';
 echo '</li>';
-echo '<li id="moduleSettings" class="ui-state-default ui-corner-top">';
+echo '<li id="moduleSettings" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'moduleSettings\')[0].click();"><img src="../../graphics/modules.png" alt=""> ';
 	echo _('Module settings') . '</a>';
 echo '</li>';
@@ -210,7 +200,6 @@ for ($i = 0; $i < sizeof($account_list); $i++) {
 }
 
 $legendContainer = new htmlTable();
-$legendContainer->addElement(new htmlSpacer(null, '10px'), true);
 $legendContainer->addElement(new htmlOutputText("(*) " . _("Base module")));
 $legendContainer->addElement(new htmlHelpLink('237'));
 $container->addElement($legendContainer);
@@ -219,7 +208,20 @@ $container->addElement(new htmlHiddenInput('postAvailable', 'yes'));
 $tabindex = 1;
 parseHtml(null, $container, array(), false, $tabindex, 'user');
 
-echo ("</div></div></form>\n");
+echo "</div></div>";
+
+$buttonContainer = new htmlTable();
+$buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
+$saveButton = new htmlButton('saveSettings', _('Save'));
+$saveButton->setIconClass('saveButton');
+$buttonContainer->addElement($saveButton);
+$cancelButton = new htmlButton('cancelSettings', _('Cancel'));
+$cancelButton->setIconClass('cancelButton');
+$buttonContainer->addElement($cancelButton, true);
+$buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
+parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
+
+echo "</form>\n";
 echo "</body>\n";
 echo "</html>\n";
 
diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php
index 03a8a204..a2f6ba21 100644
--- a/lam/templates/config/conftypes.php
+++ b/lam/templates/config/conftypes.php
@@ -156,16 +156,6 @@ for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMe
 
 echo ("<form action=\"conftypes.php\" method=\"post\">\n");
 
-$buttonContainer = new htmlTable();
-$saveButton = new htmlButton('saveSettings', _('Save'));
-$saveButton->setIconClass('saveButton');
-$buttonContainer->addElement($saveButton);
-$cancelButton = new htmlButton('cancelSettings', _('Cancel'));
-$cancelButton->setIconClass('cancelButton');
-$buttonContainer->addElement($cancelButton, true);
-$buttonContainer->addElement(new htmlSpacer(null, '10px'));
-parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
-
 // hidden submit buttons which are clicked by tabs
 echo "<div style=\"display: none;\">\n";
 	echo "<input name=\"generalSettingsButton\" type=\"submit\" value=\" \">";
@@ -178,7 +168,7 @@ echo "</div>\n";
 echo '<div class="ui-tabs ui-widget ui-widget-content ui-corner-all">';
 
 echo '<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">';
-echo '<li id="generalSettingsButton" class="ui-state-default ui-corner-top">';
+echo '<li id="generalSettingsButton" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'generalSettingsButton\')[0].click();"><img src="../../graphics/tools.png" alt=""> ';
 	echo _('General settings') . '</a>';
 echo '</li>';
@@ -186,11 +176,11 @@ echo '<li id="edittypes" class="ui-state-default ui-corner-top">';
 	echo '<a href="#" onclick="document.getElementsByName(\'edittypes\')[0].click();"><img src="../../graphics/gear.png" alt=""> ';
 	echo _('Account types') . '</a>';
 echo '</li>';
-echo '<li id="editmodules" class="ui-state-default ui-corner-top">';
+echo '<li id="editmodules" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'editmodules\')[0].click();"><img src="../../graphics/modules.png" alt=""> ';
 	echo _('Modules') . '</a>';
 echo '</li>';
-echo '<li id="moduleSettings" class="ui-state-default ui-corner-top">';
+echo '<li id="moduleSettings" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'moduleSettings\')[0].click();"><img src="../../graphics/modules.png" alt=""> ';
 	echo _('Module settings') . '</a>';
 echo '</li>';
@@ -280,7 +270,20 @@ parseHtml(null, $container, array(), false, $tabindex, 'user');
 
 echo "<input type=\"hidden\" name=\"postAvailable\" value=\"yes\">\n";
 
-echo ("</div></div></form>\n");
+echo "</div></div>";
+
+$buttonContainer = new htmlTable();
+$buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
+$saveButton = new htmlButton('saveSettings', _('Save'));
+$saveButton->setIconClass('saveButton');
+$buttonContainer->addElement($saveButton);
+$cancelButton = new htmlButton('cancelSettings', _('Cancel'));
+$cancelButton->setIconClass('cancelButton');
+$buttonContainer->addElement($cancelButton, true);
+$buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
+parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
+
+echo "</form>\n";
 echo "</body>\n";
 echo "</html>\n";
 
diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php
index d956d56e..2abf977a 100644
--- a/lam/templates/config/moduleSettings.php
+++ b/lam/templates/config/moduleSettings.php
@@ -137,16 +137,6 @@ for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMe
 
 echo ("<form action=\"moduleSettings.php\" method=\"post\">\n");
 
-$buttonContainer = new htmlTable();
-$saveButton = new htmlButton('saveSettings', _('Save'));
-$saveButton->setIconClass('saveButton');
-$buttonContainer->addElement($saveButton);
-$cancelButton = new htmlButton('cancelSettings', _('Cancel'));
-$cancelButton->setIconClass('cancelButton');
-$buttonContainer->addElement($cancelButton, true);
-$buttonContainer->addElement(new htmlSpacer(null, '10px'));
-parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
-
 // hidden submit buttons which are clicked by tabs
 echo "<div style=\"display: none;\">\n";
 	echo "<input name=\"generalSettingsButton\" type=\"submit\" value=\" \">";
@@ -159,15 +149,15 @@ echo "</div>\n";
 echo '<div class="ui-tabs ui-widget ui-widget-content ui-corner-all">';
 
 echo '<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">';
-echo '<li id="generalSettingsButton" class="ui-state-default ui-corner-top">';
+echo '<li id="generalSettingsButton" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'generalSettingsButton\')[0].click();"><img src="../../graphics/tools.png" alt=""> ';
 	echo _('General settings') . '</a>';
 echo '</li>';
-echo '<li id="edittypes" class="ui-state-default ui-corner-top">';
+echo '<li id="edittypes" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'edittypes\')[0].click();"><img src="../../graphics/gear.png" alt=""> ';
 	echo _('Account types') . '</a>';
 echo '</li>';
-echo '<li id="editmodules" class="ui-state-default ui-corner-top">';
+echo '<li id="editmodules" class="ui-state-default ui-corner-top" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">';
 	echo '<a href="#" onclick="document.getElementsByName(\'editmodules\')[0].click();"><img src="../../graphics/modules.png" alt=""> ';
 	echo _('Modules') . '</a>';
 echo '</li>';
@@ -220,7 +210,7 @@ for ($i = 0; $i < sizeof($modules); $i++) {
 	if ($iconImage != null) {
 		$icon = '<img align="middle" src="../../graphics/' . $iconImage . '" alt="' . $iconImage . '"> ';
 	}
-	echo "<legend>$icon<b>" . getModuleAlias($modules[$i], "none") . "</b></legend><br>\n";
+	echo "<legend>$icon<b>" . getModuleAlias($modules[$i], "none") . "</b></legend>\n";
 	$configTypes = parseHtml($modules[$i], $options[$modules[$i]], $old_options, true, $tabindex, 'user');
 	$_SESSION['conf_types'] = array_merge($configTypes, $_SESSION['conf_types']);
 	echo "</fieldset>\n";
@@ -229,7 +219,20 @@ for ($i = 0; $i < sizeof($modules); $i++) {
 
 echo "<input type=\"hidden\" name=\"postAvailable\" value=\"yes\">\n";
 
-echo ("</div></div></form>\n");
+echo "</div></div>";
+
+$buttonContainer = new htmlTable();
+$buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
+$saveButton = new htmlButton('saveSettings', _('Save'));
+$saveButton->setIconClass('saveButton');
+$buttonContainer->addElement($saveButton);
+$cancelButton = new htmlButton('cancelSettings', _('Cancel'));
+$cancelButton->setIconClass('cancelButton');
+$buttonContainer->addElement($cancelButton, true);
+$buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
+parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
+
+echo "</form>\n";
 echo "</body>\n";
 echo "</html>\n";