diff --git a/lam/lib/functions.js b/lam/lib/functions.js
index 4ed32c5b..66b57907 100644
--- a/lam/lib/functions.js
+++ b/lam/lib/functions.js
@@ -52,7 +52,7 @@ function user_click(list, box) {
 // mouseOver function
 function group_over(list, box) {
 	cbox = document.getElementsByName(box)[0];
-	if (cbox.checked == false) list.setAttribute('class','grouplist_over', 0);
+	if (cbox.checked == false) list.setAttribute('class','grouplist-over', 0);
 }
 
 // mouseOut function
@@ -66,11 +66,11 @@ function group_click(list, box) {
 	cbox = document.getElementsByName(box)[0];
 	if (cbox.checked == true) {
 		cbox.checked = false;
-		list.setAttribute('class','grouplist_over', 0);
+		list.setAttribute('class','grouplist-over', 0);
 	}
 	else {
 		cbox.checked = true;
-		list.setAttribute('class','grouplist_checked', 0);
+		list.setAttribute('class','grouplist-checked', 0);
 	}
 }
 
@@ -78,7 +78,7 @@ function group_click(list, box) {
 // mouseOver function
 function host_over(list, box) {
 	cbox = document.getElementsByName(box)[0];
-	if (cbox.checked == false) list.setAttribute('class','hostlist_over', 0);
+	if (cbox.checked == false) list.setAttribute('class','hostlist-over', 0);
 }
 
 // mouseOut function
@@ -92,10 +92,10 @@ function host_click(list, box) {
 	cbox = document.getElementsByName(box)[0];
 	if (cbox.checked == true) {
 		cbox.checked = false;
-		list.setAttribute('class','hostlist_over', 0);
+		list.setAttribute('class','hostlist-over', 0);
 	}
 	else {
 		cbox.checked = true;
-		list.setAttribute('class','hostlist_checked', 0);
+		list.setAttribute('class','hostlist-checked', 0);
 	}
 }
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 060fe2db..84da28d5 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -140,14 +140,14 @@ table.groupnav {
 }
 
 /* text in navigation bar */
-td.groupnav_text {
+td.groupnav-text {
   color:green;
   font-family:Verdana;
   font-size:10px;
 }
 
 /* color for active page digit */
-td.groupnav_activepage {
+td.groupnav-activepage {
  color:red;
 }
 
@@ -164,22 +164,22 @@ tr.grouplist {
 }
 
 /* color of head row */
-tr.grouplist_head {
+tr.grouplist-head {
   background-color:#a8c3ff;
 }
 
 /* color of sorted column in head row */
-th.grouplist_sort {
+th.grouplist-sort {
   background-color:#d6e3ff;
 }
 
 /* color of rows on mouseOver */
-tr.grouplist_over {
+tr.grouplist-over {
   background-color:#C7E7C7;
 }
 
 /* color of checked rows */
-tr.grouplist_checked {
+tr.grouplist-checked {
   background-color:#f27c71;
 }
 
@@ -197,14 +197,14 @@ table.hostnav {
 }
 
 /* text in navigation bar */
-td.hostnav_text {
+td.hostnav-text {
   color:green;
   font-family:Verdana;
   font-size:10px;
 }
 
 /* color for active page digit */
-td.hostnav_activepage {
+td.hostnav-activepage {
  color:red;
 }
 
@@ -221,22 +221,22 @@ tr.hostlist {
 }
 
 /* color of head row */
-tr.hostlist_head {
+tr.hostlist-head {
   background-color:#ffc4ba;
 }
 
 /* color of sorted column in head row */
-th.hostlist_sort {
+th.hostlist-sort {
   background-color:#ffe2dd;
 }
 
 /* color of rows on mouseOver */
-tr.hostlist_over {
+tr.hostlist-over {
   background-color:#ffe265;
 }
 
 /* color of checked rows */
-tr.hostlist_checked {
+tr.hostlist-checked {
   background-color:#f27c71;
 }
 
diff --git a/lam/templates/lists/listgroups.php b/lam/templates/lists/listgroups.php
index bf036629..9700449d 100644
--- a/lam/templates/lists/listgroups.php
+++ b/lam/templates/lists/listgroups.php
@@ -50,7 +50,7 @@ if ($_POST['new_group'] || $_POST['del_group']){
 		// search for checkboxes
 		$groups = array_keys($_POST, "on");
 		$groupstr = implode(";", $groups);
-		echo("<meta http-equiv=\"refresh\" content=\"0; URL=../delete.php?type=group&DN='$groupstr'\">");
+		echo("<meta http-equiv=\"refresh\" content=\"0; URL=../delete.php?type=group&amp;DN='$groupstr'\">");
 		}
 		exit;
 }
@@ -135,11 +135,11 @@ echo ("<br>");
 
 // print group table header
 echo "<table rules=\"all\" class=\"grouplist\" width=\"100%\">\n";
-echo "<tr class=\"grouplist_head\"><th width=22 height=34></th><th></th>";
+echo "<tr class=\"grouplist-head\"><th width=22 height=34></th><th></th>";
 // table header
 for ($k = 0; $k < sizeof($desc_array); $k++) {
 	if (strtolower($attr_array[$k]) == $sort) {
-		echo "<th class=\"grouplist_sort\"><a href=\"listgroups.php?".
+		echo "<th class=\"grouplist-sort\"><a href=\"listgroups.php?".
 			"sort=" . strtolower($attr_array[$k]) . $searchfilter . "\">" . $desc_array[$k] . "</a></th>";
 	}
 	else echo "<th><a href=\"listgroups.php?".
@@ -170,9 +170,9 @@ for ($i = $table_begin; $i < $table_end; $i++) {
 	echo("<tr class=\"grouplist\" onMouseOver=\"group_over(this, '" . $info[$i]["dn"] . "')\"" .
 								" onMouseOut=\"group_out(this, '" . $info[$i]["dn"] . "')\"" .
 								" onClick=\"group_click(this, '" . $info[$i]["dn"] . "')\"" .
-								" onDblClick=parent.frames[1].location.href=\"../account.php?type=group&DN='" . $info[$i]["dn"] . "'\">" .
+								" onDblClick=parent.frames[1].location.href=\"../account.php?type=group&amp;DN='" . $info[$i]["dn"] . "'\">" .
 								" <td height=22><input onClick=\"group_click(this, '" . $info[$i]["dn"] . "')\" type=\"checkbox\" name=\"" . $info[$i]["dn"] . "\"></td>" .
-								" <td align='center'><a href=\"../account.php?type=group&DN='" . $info[$i]["dn"] . "'\">" . _("Edit") . "</a></td>");
+								" <td align='center'><a href=\"../account.php?type=group&amp;DN='" . $info[$i]["dn"] . "'\">" . _("Edit") . "</a></td>");
 	for ($k = 0; $k < sizeof($attr_array); $k++) {
 		echo ("<td>");
 		// print all attribute entries seperated by "; "
@@ -187,7 +187,7 @@ for ($i = $table_begin; $i < $table_end; $i++) {
 					$dn = $_SESSION["ldap"]->search_username($user); // DN entry
 					// if user was found in LDAP make link, otherwise just print name
 					if ($dn) {
-						$linklist[$d] = "<a href=../account.php?type=user&DN='" . $dn . "' >" .
+						$linklist[$d] = "<a href=../account.php?type=user&amp;DN='" . $dn . "' >" .
 										$info[$i][strtolower($attr_array[$k])][$d] . "</a>";
 					}
 					else $linklist[$d] = $user;
@@ -232,27 +232,27 @@ function draw_navigation_bar ($count) {
   echo ("<tr>\n");
   echo ("<td><input type=\"submit\" name=\"refresh\" value=\"" . _("Refresh") . "\">&nbsp;&nbsp;");
   if ($page != 1)
-    echo ("<a href=\"listgroups.php?page=" . ($page - 1) . "&sort=" . $sort . $searchfilter . "\">&lt;=</a>\n");
+    echo ("<a href=\"listgroups.php?page=" . ($page - 1) . "&amp;sort=" . $sort . $searchfilter . "\">&lt;=</a>\n");
   else
     echo ("&lt;=");
   echo ("&nbsp;");
 
   if ($page < ($count / $max_pageentrys))
-    echo ("<a href=\"listgroups.php?page=" . ($page + 1) . "&sort=" . $sort . $searchfilter . "\">=&gt;</a>\n");
+    echo ("<a href=\"listgroups.php?page=" . ($page + 1) . "&amp;sort=" . $sort . $searchfilter . "\">=&gt;</a>\n");
   else
     echo ("=&gt;</td>");
 
-  echo ("<td class=\"groupnav_text\">");
+  echo ("<td class=\"groupnav-text\">");
   echo "&nbsp;" . $count . " " .  _("Group(s) found");
   echo ("</td>");
 
-  echo ("<td class=\"groupnav_activepage\" align=\"right\">");
+  echo ("<td class=\"groupnav-activepage\" align=\"right\">");
   for ($i = 0; $i < ($count / $max_pageentrys); $i++) {
     if ($i == $page - 1)
       echo ("&nbsp;" . ($i + 1));
     else
       echo ("&nbsp;<a href=\"listgroups.php?page=" . ($i + 1) .
-	    "&sort=" . $sort . "\">" . ($i + 1) . "</a>\n");
+	    "&amp;sort=" . $sort . "\">" . ($i + 1) . "</a>\n");
   }
   echo ("</td></tr></table>\n");
 }
diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php
index 9f96cbe0..65ee84cc 100644
--- a/lam/templates/lists/listhosts.php
+++ b/lam/templates/lists/listhosts.php
@@ -50,7 +50,7 @@ if ($_POST['new_host'] || $_POST['del_host']){
 		// search for checkboxes
 		$hosts = array_keys($_POST, "on");
 		$hoststr = implode(";", $hosts);
-		echo("<meta http-equiv=\"refresh\" content=\"0; URL=../delete.php?type=host&DN='$hoststr'\">");
+		echo("<meta http-equiv=\"refresh\" content=\"0; URL=../delete.php?type=host&amp;DN='$hoststr'\">");
 		}
 		exit;
 }
@@ -135,11 +135,11 @@ echo ("<br>");
 
 // print host table header
 echo "<table rules=\"all\" class=\"hostlist\" width=\"100%\">\n";
-echo "<tr class=\"hostlist_head\"><th width=22 height=34></th><th></th>";
+echo "<tr class=\"hostlist-head\"><th width=22 height=34></th><th></th>";
 // table header
 for ($k = 0; $k < sizeof($desc_array); $k++) {
 	if (strtolower($attr_array[$k]) == $sort) {
-		echo "<th class=\"hostlist_sort\"><a href=\"listhosts.php?".
+		echo "<th class=\"hostlist-sort\"><a href=\"listhosts.php?".
 			"sort=" . strtolower($attr_array[$k]) . $searchfilter . "\">" . $desc_array[$k] . "</a></th>";
 	}
 	else echo "<th><a href=\"listhosts.php?".
@@ -170,9 +170,9 @@ for ($i = $table_begin; $i < $table_end; $i++) {
 	echo("<tr class=\"hostlist\" onMouseOver=\"host_over(this, '" . $info[$i]["dn"] . "')\"" .
 								" onMouseOut=\"host_out(this, '" . $info[$i]["dn"] . "')\"" .
 								" onClick=\"host_click(this, '" . $info[$i]["dn"] . "')\"" .
-								" onDblClick=parent.frames[1].location.href=\"../account.php?type=host&DN='" . $info[$i]["dn"] . "'\">" .
+								" onDblClick=parent.frames[1].location.href=\"../account.php?type=host&amp;DN='" . $info[$i]["dn"] . "'\">" .
 								" <td height=22><input onClick=\"host_click(this, '" . $info[$i]["dn"] . "')\" type=\"checkbox\" name=\"" . $info[$i]["dn"] . "\"></td>" .
-								" <td align='center'><a href=\"../account.php?type=host&DN='" . $info[$i]["dn"] . "'\">" . _("Edit") . "</a></td>");
+								" <td align='center'><a href=\"../account.php?type=host&amp;DN='" . $info[$i]["dn"] . "'\">" . _("Edit") . "</a></td>");
 	for ($k = 0; $k < sizeof($attr_array); $k++) {
 		echo ("<td>");
 		// print all attribute entries seperated by "; "
@@ -215,17 +215,17 @@ function draw_navigation_bar ($count) {
   echo ("<tr>\n");
   echo ("<td><input type=\"submit\" name=\"refresh\" value=\"" . _("Refresh") . "\">&nbsp;&nbsp;");
   if ($page != 1)
-    echo ("<a href=\"listhosts.php?page=" . ($page - 1) . "&sort=" . $sort . $searchfilter . "\">&lt;=</a>\n");
+    echo ("<a href=\"listhosts.php?page=" . ($page - 1) . "&amp;sort=" . $sort . $searchfilter . "\">&lt;=</a>\n");
   else
     echo ("&lt;=");
   echo ("&nbsp;");
 
   if ($page < ($count / $max_pageentrys))
-    echo ("<a href=\"listhosts.php?page=" . ($page + 1) . "&sort=" . $sort . $searchfilter . "\">=&gt;</a>\n");
+    echo ("<a href=\"listhosts.php?page=" . ($page + 1) . "&amp;sort=" . $sort . $searchfilter . "\">=&gt;</a>\n");
   else
     echo ("=&gt;</td>");
 
-  echo ("<td class=\"hostnav_text\">");
+  echo ("<td class=\"hostnav-text\">");
   echo "&nbsp;" . $count . " " .  _("Samba Host(s) found");
   echo ("</td>");
 
@@ -235,7 +235,7 @@ function draw_navigation_bar ($count) {
       echo ("&nbsp;" . ($i + 1));
     else
       echo ("&nbsp;<a href=\"listhosts.php?page=" . ($i + 1) .
-	    "&sort=" . $sort . "\">" . ($i + 1) . "</a>\n");
+	    "&amp;sort=" . $sort . "\">" . ($i + 1) . "</a>\n");
   }
   echo ("</td></tr></table>\n");
 }