Index: trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.css
===================================================================
--- trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.css (revision 22)
+++ trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.css (revision 38)
@@ -359,4 +359,12 @@
   margin: 1em 0;
 }
+#adminGroupFormTable td,
+#adminGroupFormTable th {
+  vertical-align: top;
+}
+#adminGroupFormTable td.fieldName {
+  color: black;
+  background-color: #eee;
+}
 p.note {
   margin: 0;
Index: trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl (revision 37)
+++ trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl (revision 38)
@@ -2099,4 +2099,5 @@
       </tr>
       <xsl:for-each select="/bedeworkadmin/groups/group">
+        <xsl:sort select="name" order="ascending" case-order="upper-first"/>
         <xsl:variable name="groupName" select="name"/>
         <tr>
@@ -2111,5 +2112,5 @@
           <xsl:if test="/bedeworkadmin/groups/showMembers='true'">
             <td>
-              <xsl:for-each select="members/member">
+              <xsl:for-each select="members/member/account">
                   <xsl:value-of select="."/>&#160;
               </xsl:for-each>
@@ -2136,4 +2137,5 @@
 
       <xsl:for-each select="group">
+        <xsl:sort select="name" order="ascending" case-order="upper-first"/>
         <tr>
           <td>
@@ -2228,6 +2230,16 @@
   <xsl:template name="modAdminGroupMembers">
     <h2>Update Group Membership</h2>
-    <p>Enter a userid and click "add" or "remove" to change group membership.</p>
+    <p>Enter a userid (for user or group) and click "add" to update group membership.
+    Click the trash icon to remove a user from the group.</p>
+
     <form name="adminGroupMembersForm" method="post" action="{$admingroup-updateMembers}">
+      <p>Add member:
+        <input type="text" name="updGroupMember" size="15"/>
+        <input type="radio" value="user" name="kind" checked="checked"/>user
+        <input type="radio" value="group" name="kind"/>group
+        <input type="submit" name="addGroupMember" value="Add"/>
+      </p>
+    </form>
+
       <table id="adminGroupFormTable">
         <tr>
@@ -2244,22 +2256,37 @@
           </td>
           <td>
-            <xsl:for-each select="/bedeworkadmin/adminGroup/members/member">
-              <xsl:value-of select="."/>&#160;
-            </xsl:for-each>
-          </td>
-        </tr>
-        <tr>
-          <td class="fieldName">
-            Add/remove member:
-          </td>
-          <td>
-            <input type="text" name="updGroupMember" size="15"/>
-            <input type="submit" name="addGroupMember" value="Add"/>
-            <input type="submit" name="removeGroupMember" value="Remove"/>
+            <table id="memberAccountList">
+              <xsl:for-each select="/bedeworkadmin/adminGroup/members/member">
+                <xsl:sort select="account" order="ascending" case-order="upper-first"/>
+                <tr>
+                  <td>
+                    <xsl:choose>
+                      <xsl:when test="kind='0'"><img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/></xsl:when>
+                      <xsl:when test="kind='1'"><img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/></xsl:when>
+                      <xsl:when test="kind='3'"></xsl:when>
+                      <xsl:otherwise></xsl:otherwise>
+                    </xsl:choose>
+                  </td>
+                  <td>
+                    <xsl:value-of select="account"/>
+                  </td>
+                  <td>
+                    <xsl:variable name="acct" select="account"/>
+                    <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}" title="remove">
+                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>
+                    </a>
+                  </td>
+                </tr>
+              </xsl:for-each>
+            </table>
           </td>
         </tr>
       </table>
+      <p>
+        <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> user,
+        <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> group
+      </p>
       <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initUpdate}')" value="Return to Admin Group listing"/></p>
-    </form>
+
   </xsl:template>
 
Index: trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp (revision 37)
+++ trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp (revision 38)
@@ -19,5 +19,8 @@
             <logic:iterate name="adminGroup" property="groupMembers"
                            id="member" >
-              <member><bean:write name="member" property="account" /></member>
+              <member>
+                <account><bean:write name="member" property="account" /></account>
+                <kind><bean:write name="member" property="kind" /></kind>
+              </member>
             </logic:iterate>
           </logic:present>
Index: trunk/calendar3/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp (revision 37)
+++ trunk/calendar3/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp (revision 38)
@@ -11,5 +11,8 @@
       <logic:iterate name="peForm" property="updAdminGroup.groupMembers"
                      id="member" >
-        <member><bean:write name="member" property="account" /></member>
+        <member>
+          <account><bean:write name="member" property="account" /></account>
+          <kind><bean:write name="member" property="kind" /></kind>
+        </member>
       </logic:iterate>
     </logic:present>
Index: trunk/calendar3/webadmin/war/docs/admingroup/modAdminGroupMembers.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/modAdminGroupMembers.jsp (revision 2)
+++ trunk/calendar3/webadmin/war/docs/admingroup/modAdminGroupMembers.jsp (revision 38)
@@ -15,5 +15,8 @@
       <logic:iterate name="peForm" property="updAdminGroup.groupMembers"
                      id="member" >
-        <member><bean:write name="member" property="account" /></member>
+        <member>
+          <account><bean:write name="member" property="account" /></account>
+          <kind><bean:write name="member" property="kind" /></kind>
+        </member>
       </logic:iterate>
     </logic:present>