Index: trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl (revision 24)
+++ trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl (revision 28)
@@ -1057,5 +1057,5 @@
               <td>
                 <input type="submit" name="addSponsor" value="Add Contact" class="padRight"/>
-                <input type="submit" name="forwardto" value="Cancel"/>
+                <input type="submit" name="cancelled" value="Cancel"/>
                 <input type="reset" value="Clear"/>
               </td>
@@ -1064,5 +1064,5 @@
               <td>
                 <input type="submit" name="updateSponsor" value="Update Contact" class="padRight"/>
-                <input type="submit" name="forwardto" value="Cancel" class="padRight"/>
+                <input type="submit" name="cancelled" value="Cancel" class="padRight"/>
                 <input type="reset" value="Reset" class="padRight"/>
               </td>
@@ -1175,5 +1175,5 @@
               <td>
                 <input type="submit" name="addLocation" value="Add Location" class="padRight"/>
-                <input type="submit" name="forwardto" value="Cancel"/>
+                <input type="submit" name="cancelled" value="Cancel"/>
                 <input type="reset" value="Clear"/>
               </td>
@@ -1182,5 +1182,5 @@
               <td>
                 <input type="submit" name="updateLocation" value="Update Location" class="padRight"/>
-                <input type="submit" name="forwardto" value="Cancel" class="padRight"/>
+                <input type="submit" name="cancelled" value="Cancel" class="padRight"/>
                 <input type="reset" value="Reset" class="padRight"/>
               </td>
@@ -2078,5 +2078,5 @@
       </tr>
       <xsl:for-each select="/bedeworkadmin/groups/group">
-        <xsl:variable name="groupName"><xsl:value-of select="name"/></xsl:variable>
+        <xsl:variable name="groupName" select="name"/>
         <tr>
           <td>
@@ -2116,5 +2116,8 @@
         <tr>
           <td>
-            <xsl:copy-of select="name"/>
+            <xsl:variable name="admGroupName" select="name"/>
+            <a href="{$setup}&amp;adminGroupName={$admGroupName}">
+              <xsl:copy-of select="name"/>
+            </a>
           </td>
           <td>
Index: trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp (revision 2)
+++ trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp (revision 28)
@@ -15,14 +15,6 @@
   <logic:iterate id="adminGroup" name="peForm" property="adminGroups" >
     <group>
-      <bean:define id="account" name="adminGroup" property="account"/>
-      <% rpitemp="/admingroup/fetchForUpdate.do?adminGroupName=" + account;  %>
-      <name>
-        <genurl:link page="<%=rpitemp%>">
-           <bean:write name="adminGroup" property="account" />
-        </genurl:link>
-      </name>
-      <desc>
-        <bean:write name="adminGroup" property="description" />
-      </desc>
+      <name><bean:write name="adminGroup" property="account" /></name>
+      <desc><bean:write name="adminGroup" property="description" /></desc>
       <members>
         <logic:equal name="peForm" property="showAgMembers" value="true">
@@ -35,24 +27,7 @@
         </logic:equal>
       </members>
-      <% rpitemp="/admingroup/fetchForUpdateMembers.do?adminGroupName=" + account;  %>
-      <updateMembersUrl>
-        <genurl:link page="<%=rpitemp%>"></genurl:link>
-      </updateMembersUrl>
     </group>
   </logic:iterate>
 </groups>
 
-<formElements>
-  <genurl:form action="admingroup/initUpdate.do">
-    <hideMembers>
-      <html:radio name="peForm" property="showAgMembers" value="false"
-                      onclick="document.peForm.submit();" />
-    </hideMembers>
-    <showMembers>
-      <html:radio name="peForm" property="showAgMembers" value="true"
-                      onclick="document.peForm.submit();" />
-    </showMembers>
-  </genurl:form>
-</formElements>
-
 <%@include file="/docs/footer.jsp"%>
Index: trunk/calendar3/webadmin/war/docs/admingroup/chooseAdminGroup.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/chooseAdminGroup.jsp (revision 2)
+++ trunk/calendar3/webadmin/war/docs/admingroup/chooseAdminGroup.jsp (revision 28)
@@ -14,17 +14,8 @@
 
 <groups>
-  <logic:iterate id="adminGroup" name="peForm"
-                 property="userAdminGroups" >
-    <bean:define id="account" name="adminGroup" property="account"/>
-    <% rpitemp="/setup.do?adminGroupName=" + account;  %>
+  <logic:iterate id="adminGroup" name="peForm" property="userAdminGroups" >
     <group>
-      <name>
-        <genurl:link page="<%=rpitemp%>">
-          <bean:write name="adminGroup" property="account" />
-        </genurl:link>
-      </name>
-      <desc>
-        <bean:write name="adminGroup" property="description" />
-      </desc>
+      <name><bean:write name="adminGroup" property="account" /></name>
+      <desc><bean:write name="adminGroup" property="description" /></desc>
     </group>
   </logic:iterate>