diff --git a/webui/group-main.php b/webui/group-main.php
index fb802bed85bdbfc676d8e334330a8d1b04544986..9295f152a13198461430fe24a8ed56566d7e31c5 100644
--- a/webui/group-main.php
+++ b/webui/group-main.php
@@ -62,8 +62,8 @@ printHeader(array(
 				<option value="add">Add Group</option>
 				<option value="delete">Delete Group</option>
 				<option disabled="disabled"> - - - - - - - - - - - </option>
-				<option value="members">List Users</option>
-				<option value="members">List Attributes</option>
+				<option value="members">Users</option>
+				<option value="members">Attributes</option>
 			</select> 
 		</div>
 
diff --git a/webui/includes/header.php b/webui/includes/header.php
index 2f65025b91a9c35a5db344f7b003174928a1a8ef..6842cc74474b8ec7c1a433c8860daff644df5c7a 100644
--- a/webui/includes/header.php
+++ b/webui/includes/header.php
@@ -79,8 +79,8 @@ function printHeader($params = NULL)
 							<ul>
 								<li><a href="wisp-user-list.php">User List</a></li>
 								<li><a href="wisp-user-add.php">Add User</a></li>
-								<li><a href="wisp-locations-manage.php">Manage Locations</a></li>
 								<li><a href="wisp-multiuser-add.php">Add Many Users</a></li>
+								<li><a href="wisp-locations-manage.php">Manage Locations</a></li>
 							</ul>
 								
 
diff --git a/webui/user-groups.php b/webui/user-groups.php
index df9b06c383e4186da286f10d34231a2bc017f77b..3f3dd46c4538c59046e8a5dc80eb4ab44c0a2592 100644
--- a/webui/user-groups.php
+++ b/webui/user-groups.php
@@ -55,7 +55,7 @@ printHeader(array(
 			<option selected="selected">select action</option>
 			<option disabled="disabled"> - - - - - - - - - - - </option>
 			<option value="add">Assign Group</option>
-			<option value="delete">Remove Group Assignment</option>
+			<option value="delete">Remove Group</option>
 		</select> 
 	</div>
 
@@ -108,7 +108,7 @@ printHeader(array(
 			if ($res->rowCount() == 0) {
 ?>
 				<tr>
-					<td>User does not belong to any groups</td>
+					<td colspan="5">User does not belong to any groups</td>
 				</tr>
 <?php
 			}
@@ -118,7 +118,7 @@ printHeader(array(
 		} else {
 ?>
 			<tr>
-				<td>Invocation error, no user ID selected</td>
+				<td colspan="5">Invocation error, no user ID selected</td>
 			</tr>
 <?php
 		}
diff --git a/webui/wisp-locations-manage.php b/webui/wisp-locations-manage.php
index 82e2002ef47e4d149e91300609334ce91c20d24d..2c51129b3971e80d4d9a9f888027e1419a6da1ae 100644
--- a/webui/wisp-locations-manage.php
+++ b/webui/wisp-locations-manage.php
@@ -54,7 +54,7 @@ if (!isset($_POST['frmaction'])) {
 				<option value="add">Add Location</option>
 				<option value="delete">Delete Location</option>
 				<option disabled="disabled"> - - - - - - - - - - - </option>
-				<option value="useratts">List Location Members</option>
+				<option value="useratts">Members</option>
 			</select> 
 		</div>
 
diff --git a/webui/wisp-user-list.php b/webui/wisp-user-list.php
index 9ca75b88fff55c214e876f4e29c9e3134a125444..1b1af47549a52d1535862000970fdd98c07df643 100644
--- a/webui/wisp-user-list.php
+++ b/webui/wisp-user-list.php
@@ -29,7 +29,7 @@ printHeader(array(
 # If we have nothing to do - display search
 if (!isset($_POST['frmaction'])) {
 ?>
-	<p class="pageheader">User List</p>
+	<p class="pageheader">WiSP User List</p>
 
 	<form id="main_form" action="wisp-user-list.php" method="post">
 		<input type="hidden" name="frmaction" value="dofilter" />
@@ -71,6 +71,8 @@ if (!isset($_POST['frmaction'])) {
 
 } elseif (isset($_POST['frmaction']) && $_POST['frmaction'] == "dofilter") {
 ?>
+	<p class="pageheader">WiSP User List</p>
+
 	<form id="main_form" action="wisp-user-list.php" method="post">
 
 		<div class="textcenter">