diff --git a/lam/lib/html.inc b/lam/lib/html.inc
index 42b97d37..54da9c12 100644
--- a/lam/lib/html.inc
+++ b/lam/lib/html.inc
@@ -2557,10 +2557,13 @@ class htmlFieldset extends htmlElement {
 	 * @return array List of input field names and their type (name => type)
 	 */
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
-		$class = 'ui-corner-all';
+		$classes = $this->cssClasses;
+		$classes[] = 'ui-corner-all';
 		if ($scope != null) {
-			$class .= ' ' . $scope . '-border ' . $scope . '-bright';
+			$classes[] = $scope . '-border';
+			$classes[] = $scope . '-bright';
 		}
+		$class = implode(' ', $classes);
 		echo "<fieldset class=\"$class\">\n";
 		// generate legend
 		if (($this->label != null) || ($this->labelImage != null)) {
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 25dd1fe3..1e4b5183 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -85,8 +85,7 @@ a.classicBold {
 }
 
 fieldset {
-  background-color:#fff3c8;
-  border:1px solid #af8800;
+  border:1px solid black;
   padding:10px;
 }
 
@@ -519,12 +518,6 @@ div.confModList {
 	overflow-y: auto;
 }
 
-div.licenseInfo {
-	display: inline-block;
-	padding: 20px;
-	min-width: 200px;
-}
-
 /* schema browser */
 
 table.schema_oclasses {
diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php
index 6121e52d..0b0ad772 100644
--- a/lam/templates/config/conflogin.php
+++ b/lam/templates/config/conflogin.php
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2015  Roland Gruber
+  Copyright (C) 2003 - 2016  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -114,9 +114,6 @@ echo $_SESSION['header'];
 				<td align="left" height="30">
 					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
 				</td>
-			<td align="right" height=20>
-				<a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login") ?></a>
-			</td>
 			</tr>
 		</table>
 		<br><br>
@@ -199,7 +196,7 @@ echo $_SESSION['header'];
 		</table>
 		</td></tr>
 		<tr><td>
-		<br><a href="../login.php"> <?php echo _("Back to login"); ?> </a>
+		<br><a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login"); ?> </a>
 		</td></tr>
 		</table>
 		</form>
diff --git a/lam/templates/config/index.php b/lam/templates/config/index.php
index 7d142555..c9c842a2 100644
--- a/lam/templates/config/index.php
+++ b/lam/templates/config/index.php
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2013  Roland Gruber
+  Copyright (C) 2003 - 2016  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ echo $_SESSION['header'];
 				echo _("Configuration overview");
 			?>
 		</title>
-	<?php 
+	<?php
 		// include all CSS files
 		$cssDirName = dirname(__FILE__) . '/../../style';
 		$cssDir = dir($cssDirName);
@@ -75,18 +75,18 @@ echo $_SESSION['header'];
 				<td align="left" height="30">
 					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
 				</td>
-				<td align="right" height=20>
-					<a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login") ?></a>
-				</td>
 			</tr>
 		</table>
 		<br><br>
-		<fieldset class="ui-corner-all">
-			<legend><b> <?php echo _("LAM configuration"); ?> </b></legend>
+		<fieldset class="ui-corner-all roundedShadowBox fullwidth">
 		<TABLE border="0">
 		<?php
-			if (is_dir("../selfService")) echo "<tr><td rowspan=4 width=20>&nbsp;</td><td></td><td></td></tr>\n";
-			else echo "<tr><td rowspan=3 width=20>&nbsp;</td><td></td><td></td></tr>\n";
+			if (isLAMProVersion()) {
+				echo "<tr><td rowspan=4 width=20>&nbsp;</td><td></td><td></td></tr>\n";
+			}
+			else {
+				echo "<tr><td rowspan=3 width=20>&nbsp;</td><td></td><td></td></tr>\n";
+			}
 		?>
 		<TR>
 			<TD width="60" height="70">
@@ -113,7 +113,7 @@ echo $_SESSION['header'];
 			</TD>
 		</TR>
 		<?php
-		if (is_dir("../selfService")) {
+		if (isLAMProVersion()) {
 			echo "<TR>\n";
 				echo "<TD height=\"70\">\n";
 				echo "<a href=\"../selfService/adminLogin.php\" target=\"_self\">\n";
@@ -130,7 +130,18 @@ echo $_SESSION['header'];
 		?>
 		</TABLE>
 		</fieldset>
-		<p>&nbsp;<a href="../login.php"><?php echo _("Back to login") ?></a></p>
+		<p><br></p>
+
+		<?php
+		if (isLAMProVersion()) {
+			include_once("../../lib/env.inc");
+			$printer = new \LAM\ENV\LAMLicenseInfoPrinter();
+			$printer->printLicenseInfo();
+			echo "<br><br>";
+		}
+		?>
+
+		<p>&nbsp;<a href="../login.php"><IMG alt="back" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login") ?></a></p>
 		<p><br><br></p>
 
 	</body>
diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php
index 434d74a9..196b96d5 100644
--- a/lam/templates/config/mainlogin.php
+++ b/lam/templates/config/mainlogin.php
@@ -123,9 +123,6 @@ echo $_SESSION['header'];
 				<td align="left" height="30">
 					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
 				</td>
-				<td align="right" height=20>
-					<a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login") ?></a>
-				</td>
 			</tr>
 		</table>
 		<br>
@@ -181,18 +178,11 @@ echo $_SESSION['header'];
 		</table>
 		</td></tr>
 		<tr><td align="left">
-		<br><a href="../login.php"> <?php echo _("Back to login"); ?> </a>
+		<br><a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login"); ?> </a>
 		</td></tr>
 		</table>
 		</form>
 
-		<?php
-			if (isLAMProVersion()) {
-				$printer = new \LAM\ENV\LAMLicenseInfoPrinter();
-				$printer->printLicenseInfo();
-			}
-		?>
-
 		<p><br><br></p>
 
 	</body>
diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index 62d3c581..17456d9d 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -177,9 +177,6 @@ echo $_SESSION['header'];
 				<td align="left" height="30">
 					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
 				</td>
-				<td align="right" height=20>
-					<a href="conflogin.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to profile login") ?></a>
-				</td>
 			</tr>
 		</table>
 		<br>
@@ -327,12 +324,12 @@ $dialogDiv->setCSSClasses(array('hidden'));
 $container->addElement($dialogDiv, true);
 
 $mainDiv = new htmlDiv('mainDiv', $container);
-$mainDiv->setCSSClasses(array('filled', 'ui-corner-all'));
+$mainDiv->setCSSClasses(array('roundedShadowBox', 'fullwidth', 'ui-corner-all'));
 
 $mainContainer = new htmlGroup();
 $mainContainer->addElement($mainDiv);
-$mainContainer->addElement(new htmlOutputText('<br>', false));
-$mainContainer->addElement(new htmlLink(_("Back to profile login"), 'conflogin.php'));
+$mainContainer->addElement(new htmlOutputText('<p><br></p>', false));
+$mainContainer->addElement(new htmlLink(_("Back to profile login"), 'conflogin.php', '../../graphics/undo.png'));
 
 parseHtml('', $mainContainer, array(), false, $tabindex, 'user');