diff --git a/lam/config/confmain.php b/lam/config/confmain.php
index ab2ddff1..e6449d19 100644
--- a/lam/config/confmain.php
+++ b/lam/config/confmain.php
@@ -101,7 +101,7 @@ echo ("<p>&nbsp</p>\n");
 echo ("<p>&nbsp</p>\n");
 echo ("<table align=\"left\" border=\"0\">");
 echo ("<tr><td align=\"left\"><pre><input type=\"submit\" name=\"submitconf\" value=\"" . _("Submit") . "\">     <input type=\"reset\" name=\"resetconf\" value=\"" . _("Reset") . "\">");
-echo ("<input type=\"button\" name=\"back\" value=\"Abort\" onClick=\"self.location.href='../templates/login.php'\"></pre></td></tr>\n");
+echo ("<input type=\"button\" name=\"back\" value=\"" . _("Abort") . "\" onClick=\"self.location.href='../templates/login.php'\"></pre></td></tr>\n");
 echo ("</table>\n");
 echo ("<input type=\"hidden\" name=\"passwd\" value=\"" . $passwd . "\"><br>\n");
 echo ("</form>\n");
diff --git a/lam/lib/listgroups.php b/lam/lib/listgroups.php
index cb82add6..7a7c1639 100644
--- a/lam/lib/listgroups.php
+++ b/lam/lib/listgroups.php
@@ -45,15 +45,16 @@ else echo ("<br><br><font color=\"red\"><b>" . _("No Groups found!") . "</b></fo
 
 // print host table header
 echo "<table width=\"100%\">\n";
-echo "<tr>";
+echo "<tr><th class=\"userlist\" width=12></th>";
 echo "<th class=\"userlist\">" . _("Grup Name") . "</th>";
 echo "<th class=\"userlist\">" . _("GID Number") . "</th>";
 echo "<th class=\"userlist\">" . _("Group Members") . "</th>";
 echo "<th class=\"userlist\">" . _("Description") . "</th>";
-echo "</tr>";
-// print host list
+echo "</tr>\n";
+echo ("<form action=\"../templates/account.php?type=group\" method=\"post\">\n");
+// print group list
 for ($i = 0; $i < sizeof($info)-1; $i++) { // ignore last entry in array which is "count"
-	echo("<tr>");
+	echo("<tr><td class=\"userlist\"><input type=\"radio\" name=\"DN\" value=\"" . $info[$i]["dn"] . "\"></td>");
 	echo ("<td class=\"userlist\">" . $info[$i]["cn"][0] . "</td>");
 	echo ("<td class=\"userlist\">" . $info[$i]["gidnumber"][0] . "</td>");
 	// create list of group members
@@ -64,7 +65,15 @@ for ($i = 0; $i < sizeof($info)-1; $i++) { // ignore last entry in array which i
 	else $grouplist = "";
 	echo ("<td class=\"userlist\">" . $grouplist . "</td>");
 	echo ("<td class=\"userlist\">" . $info[$i]["description"][0] . "</td>");
-	echo("</tr>");
+	echo("</tr>\n");
 }
 echo ("</table>");
+echo ("<p>&nbsp</p>\n");
+echo ("<p>&nbsp</p>\n");
+echo ("<table align=\"left\" border=\"0\">");
+echo ("<tr><td align=\"left\"><input type=\"submit\" name=\"editgroup\" value=\"" . _("Edit Group") . "\">");
+echo ("&nbsp<input type=\"button\" name=\"newgroup\" value=\"" . _("New Group") . "\" onClick=\"self.location.href='../templates/account.php?type=group'\">");
+echo ("&nbsp<input type=\"button\" name=\"delgroup\" value=\"" . _("Delete Group") . "\" onClick=\"self.location.href='../templates/account.php?type=delete'\"></td></tr>\n");
+echo ("</table>\n");
+echo ("</form>\n");
 ?>
diff --git a/lam/lib/listhosts.php b/lam/lib/listhosts.php
index 863d168d..13105e6b 100644
--- a/lam/lib/listhosts.php
+++ b/lam/lib/listhosts.php
@@ -43,18 +43,27 @@ if ($sr) {
 }
 else echo ("<br><br><font color=\"red\"><b>" . _("No Samba Hosts found!") . "</b></font><br><br>");
 
+echo ("<form action=\"../templates/account.php?type=host\" method=\"post\">\n");
 // print host table
 echo "<table width=\"100%\">\n";
-echo "<tr>";
+echo "<tr><th class=\"userlist\" width=12></th>";
 echo "<th class=\"userlist\">" . _("Host Name") . "</th>";
 echo "<th class=\"userlist\">RID</th>";
-echo "</tr>";
+echo "</tr>\n";
 // print host list
 for ($i = 0; $i < sizeof($info)-1; $i++) { // ignore last entry in array which is "count"
-	echo("<tr>");
+	echo("<tr><td class=\"userlist\"><input type=\"radio\" name=\"DN\" value=\"" . $info[$i]["dn"] . "\"></td>");
 	echo ("<td class=\"userlist\">" . $info[$i]["cn"][0] . "</td>");
 	echo ("<td class=\"userlist\">" . $info[$i]["rid"][0] . "</td>");
-	echo("</tr>");
+	echo("</tr>\n");
 }
 echo ("</table>");
+echo ("<p>&nbsp</p>\n");
+echo ("<p>&nbsp</p>\n");
+echo ("<table align=\"left\" border=\"0\">");
+echo ("<tr><td align=\"left\"><input type=\"submit\" name=\"edithost\" value=\"" . _("Edit Host") . "\">");
+echo ("&nbsp<input type=\"button\" name=\"newhost\" value=\"" . _("New Host") . "\" onClick=\"self.location.href='../templates/account.php?type=host'\">");
+echo ("&nbsp<input type=\"button\" name=\"delhost\" value=\"" . _("Delete Host") . "\" onClick=\"self.location.href='../templates/account.php?type=delete'\"></td></tr>\n");
+echo ("</table>\n");
+echo ("</form>\n");
 ?>