diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index 2bd7821a..885ba170 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -162,7 +162,7 @@ class lamList {
 		}
 		// show form
 		echo ("<form action=\"list.php?type=" . $this->type . "&amp;norefresh=true\" method=\"post\">\n");
-		echo "<div class=\"ui-tabs-nav\">";
+		echo "<div class=\"ui-tabs-panel ui-widget-content ui-corner-bottom\">";
 		// draw account list if accounts were found
 		if (sizeof($this->entries) > 0) {
 			// buttons
@@ -175,13 +175,6 @@ class lamList {
 			$this->listPrintTableHeader();
 			// account table body
 			$this->listPrintTableBody($this->entries);
-			echo ("<br>\n");
-			// navigation bar
-			$this->listDrawNavigationBar(sizeof($this->entries));
-			echo ("<br>\n");
-			// buttons
-			$this->listPrintButtons(false);
-			echo ("<br>\n");
 		}
 		else {
 			// buttons
@@ -709,7 +702,7 @@ class lamList {
 	 * Prints the HTML footer.
 	 */
 	protected function listPrintFooter() {	
-		echo ("</div></form>\n");
+		echo ("</div></form></div>\n");
 		echo "</body></html>\n";		
 	}
 
diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php
index c7573ece..bfaf8cdb 100644
--- a/lam/templates/main_header.php
+++ b/lam/templates/main_header.php
@@ -74,8 +74,8 @@ while ($jsEntry = $jsDir->read()) {
 </table>
 
 <br>
-<div id="headerTabs" class="ui-tabs">
-<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix">
+<div id="headerTabs" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
+<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
 	<?php
 		$linkList = array();
 		if ($_SESSION['config']->get_Suffix('tree') != "") {
@@ -94,5 +94,4 @@ while ($jsEntry = $jsDir->read()) {
 		}
 	?>
 </ul>
-</div>
 
diff --git a/lam/templates/tree/treeViewContainer.php b/lam/templates/tree/treeViewContainer.php
index 2d5f7d4d..c1022fe0 100644
--- a/lam/templates/tree/treeViewContainer.php
+++ b/lam/templates/tree/treeViewContainer.php
@@ -42,13 +42,13 @@ setlanguage();
 include '../main_header.php';
 
 ?>
-
+<div id="tabcontent" class="ui-tabs-panel ui-widget-content ui-corner-bottom">
 <iframe id="treeframe" style="width: 100%; height: 800px;" src="tree_view.php" frameborder="0"></iframe>
 <script type="text/javascript">
 function resizeIframe() {
     var height = document.documentElement.clientHeight;
     height -= document.getElementById('treeframe').offsetTop;
-    height -= 30;
+    height -= 90
     document.getElementById('treeframe').style.height = height +"px";
 };
 document.getElementById('treeframe').onload = resizeIframe;
@@ -58,9 +58,6 @@ jQuery('#tab_tree').addClass('ui-tabs-selected');
 jQuery('#tab_tree').addClass('ui-state-active');
 </script>
 
-
-<?php
-echo "</body>\n";
-echo "</html>\n";
-
-?>
+</div></div>
+</body>
+</html>
diff --git a/lam/templates/tree/tree_view.php b/lam/templates/tree/tree_view.php
index aa263217..cf78dc5a 100644
--- a/lam/templates/tree/tree_view.php
+++ b/lam/templates/tree/tree_view.php
@@ -72,7 +72,7 @@ echo "<meta http-equiv=\"pragma\" content=\"no-cache\">";
 echo "<meta http-equiv=\"cache-control\" content=\"no-cache\">";
 echo "<title>LDAP Account Manager</title>";
 echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/layout.css\"></head>";
-echo "<frameset cols=\"320,*\">";
+echo "<frameset cols=\"320,*\" style=\"border-width: 0;\">";
 echo "<frame src=\"./tree.php\" name=\"left_frame\" frameborder=\"0\" scrolling=\"yes\" noresize>";
 echo "<frame src=\"./edit.php?dn=$dn\" name=\"right_frame\" frameborder=\"0\" scrolling=\"yes\">";
 echo "<noframes>";