diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 8b585a36..1519ccc1 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -1,74 +1,74 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="gBlock">
   <h2>
-  	<?= t("User Admin") ?>
-		<a class="gButtonLink" href="#" title="<?= t("Create a new user") ?>">+ <?= t("Add user") ?></a>
-	</h2>
-	
+    <?= t("User Admin") ?>
+    <a class="gButtonLink" href="#" title="<?= t("Create a new user") ?>">+ <?= t("Add user") ?></a>
+  </h2>
+
   <div class="gBlockContent">
     <ul class="gUserAdminList">
-    	<li class="gFirstRow">
-    		<strong>Username</strong> (Full name)
-				<span class="understate">last login</span>
-    	</li>
-			
+      <li class="gFirstRow">
+    	<strong><?= t("Username") ?></strong> <?= t("(Full name)") ?>
+	<span class="understate"><?= t("last login") ?></span>
+      </li>
+
       <? foreach ($users as $i => $user): ?>
-      <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
+      <li class="<?= text::alternate("gOddRow", "gEvenRow") ?>">
         <img src="<?= $theme->url("images/avatar.jpg") ?>"
-          title="<?= t("Drag user onto group below to add as a new member") ?>"
-          width="20" height="20" />
+             title="<?= t("Drag user onto group below to add as a new member") ?>"
+             width="20" height="20" />
         <strong><?= $user->name ?></strong>
         (<?= $user->full_name ?>)
         <span class="understate">
-          <?= ($user->last_login == 0) ? "" : date("M j, Y", $user->last_login) ?>
+          <?= ($user->last_login == 0) ? "" : date("m j, y", $user->last_login) ?>
         </span>
-        <span class="gActions">
+        <span class="gactions">
           <a href="users/edit_form/<?= $user->id ?>" class="gPanelLink"><?= t("edit") ?></a>
-          <? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?>
-            <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"><?= t("delete") ?></a>
+          <? if (user::active()->id != $user->id && !$user->guest): ?>
+          <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"><?= t("delete") ?></a>
           <? else: ?>
-            <span class="inactive" title="<?= t("This user can't be deleted") ?>">
-              <?= t("delete") ?>
-            </span>
-          <? endif ?>
-        </span>
+          <span class="inactive" title="<?= t("This user can't be deleted") ?>">
+            <?= t("delete") ?>
+          </span>
+        <? endif ?>
       </li>
       <? endforeach ?>
     </ul>
-		<br />
-		<a href="users/add_form" class="gDialogLink gButtonLink" title="<?= t("Create a new user") ?>">
-  		+ <?= t("Add a new user") ?>
-		</a>
+    <br />
+    <a href="users/add_form" class="gDialogLink gButtonLink" title="<?= t("Create a new user") ?>">
+      + <?= t("Add a new user") ?>
+    </a>
   </div>
 </div>
 
 <div class="gBlock">
   <h2>
-  	<?= t("Group Admin") ?>
-		<a class="gButtonLink" href="#" title="<?= t("Create a new group") ?>">+ <?= t("Add group") ?></a>
-	</h2>
-	
+    <?= t("Group Admin") ?>
+    <a class="gButtonLink" href="<?= url::site("groups/add_form") ?>"
+       title="<?= t("Create a new group") ?>">+ <?= t("Add group") ?></a>
+  </h2>
+
   <div id="gGroupAdmin" class="gBlockContent">
-  	<ul>
-  		<? foreach ($groups as $i => $group): ?>
-			<li class="gGroup">
-				<strong><?= $group->name?></strong><br />
-				<ul>
-					<? foreach ($group->users as $i => $user): ?>
-					<li class="gUser">
-						<?= $user->name ?>
-						<a href="groups/remove_users/<?= $user->id ?>">X</a>
-					</li>
-					<? endforeach ?>
-				</ul>
-			</li>
-			<? endforeach ?>
-			
-			<li class="gGroup">
-				<a href="groups/add_form" title="<?= t("Create a new group") ?>">
-  				+ <?= t("Add a new group") ?>
-				</a>
-			</li>
-		</ul>
+    <ul>
+      <? foreach ($groups as $i => $group): ?>
+      <li class="gGroup">
+	<strong><?= $group->name?></strong><br />
+	<ul>
+	  <? foreach ($group->users as $i => $user): ?>
+	  <li class="gUser">
+	    <?= $user->name ?>
+	    <a href="groups/remove_users/<?= $user->id ?>">X</a>
+	  </li>
+	  <? endforeach ?>
+	</ul>
+      </li>
+      <? endforeach ?>
+
+      <li class="gGroup">
+	<a href="groups/add_form" title="<?= t("Create a new group") ?>">
+  	  + <?= t("Add a new group") ?>
+	</a>
+      </li>
+    </ul>
   </div>
 </div>