Index: trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl (revision 33)
+++ trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl (revision 37)
@@ -201,4 +201,7 @@
             <xsl:when test="/bedeworkadmin/page='modAdminGroupMembers'">
               <xsl:call-template name="modAdminGroupMembers"/>
+            </xsl:when>
+            <xsl:when test="/bedeworkadmin/page='deleteAdminGroupConfirm'">
+              <xsl:call-template name="deleteAdminGroupConfirm"/>
             </xsl:when>
             <xsl:when test="/bedeworkadmin/page='noGroup'">
@@ -2085,9 +2088,5 @@
     <p>Click on the group name to modify the group owner or description.<br/>
     Click "add/remove members" to modify group membership.</p>
-    <p>
-      <strong>
-        <a href="{$admingroup-initAdd}">Add a new group</a>
-      </strong>
-    </p>
+    <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initAdd}')" value="Add a new group"/></p>
     <table id="commonListTable">
       <tr>
@@ -2123,4 +2122,5 @@
       </xsl:for-each>
     </table>
+    <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initAdd}')" value="Add a new group"/></p>
   </xsl:template>
 
@@ -2227,7 +2227,6 @@
 
   <xsl:template name="modAdminGroupMembers">
-
-    <p><a href="{$admingroup-initUpdate}">return to Admin Group listing</a></p>
-
+    <h2>Update Group Membership</h2>
+    <p>Enter a userid and click "add" or "remove" to change group membership.</p>
     <form name="adminGroupMembersForm" method="post" action="{$admingroup-updateMembers}">
       <table id="adminGroupFormTable">
@@ -2261,4 +2260,18 @@
         </tr>
       </table>
+      <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initUpdate}')" value="Return to Admin Group listing"/></p>
+    </form>
+  </xsl:template>
+
+  <xsl:template name="deleteAdminGroupConfirm">
+    <h2>Delete Admin Group?</h2>
+    <p>The following group will be deleted. Continue?</p>
+    <p>
+      <strong><xsl:value-of select="/bedeworkadmin/groups/group/name"/></strong>:
+      <xsl:value-of select="/bedeworkadmin/groups/group/desc"/>
+    </p>
+    <form  name="adminGroupDelete" method="post" action="{$admingroup-delete}">
+      <input type="submit" name="removeAdminGroupOK" value="Yes: Delete!"/>
+      <input type="submit" name="cancelled" value="No: Cancel"/>
     </form>
   </xsl:template>
@@ -2327,19 +2340,9 @@
             Choose Administrative Group
           </xsl:when>
-          <xsl:when test="/bedeworkadmin/page='adminGroupList'">
+          <xsl:when test="/bedeworkadmin/page='adminGroupList' or
+                          /bedeworkadmin/page='modAdminGroup' or
+                          /bedeworkadmin/page='modAdminGroup' or
+                          /bedeworkadmin/page='modAdminGroupMembers'">
             Manage Administrative Groups
-          </xsl:when>
-          <xsl:when test="/bedeworkadmin/page='modAdminGroup'">
-            <xsl:choose>
-              <xsl:when test="/bedeworkadmin/creating = 'true'">
-                Add Administrative Group
-              </xsl:when>
-              <xsl:otherwise>
-                Update Administrative Group
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:when test="/bedeworkadmin/page='modAdminGroupMembers'">
-            Update Administrative Group Members
           </xsl:when>
           <xsl:when test="/bedeworkadmin/page='noGroup'">
Index: trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/errors.xsl
===================================================================
--- trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/errors.xsl (revision 29)
+++ trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/errors.xsl (revision 37)
@@ -69,8 +69,8 @@
       </xsl:when>
       <xsl:when test="id='org.bedework.validation.error.notitle'">
-        You must supply a title
+        You must supply a title<br/>
       </xsl:when>
       <xsl:when test="id='org.bedework.validation.error.nodescription'">
-        You must supply a description
+        You must supply a description<br/>
       </xsl:when>
       <xsl:when test="id='org.bedework.validation.error.event.startafterend'">
@@ -87,8 +87,8 @@
       </xsl:when>
       <xsl:when test="id='org.bedework.client.error.missingfield'">
-        Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em>
+        Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em><br/>
       </xsl:when>
       <xsl:when test="id='org.bedework.validation.error.missingfield'">
-        Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em>
+        Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em><br/>
       </xsl:when>
       <xsl:when test="id='org.bedework.validation.error.forbidden.calmode'">
Index: trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/messages.xsl
===================================================================
--- trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/messages.xsl (revision 35)
+++ trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/messages.xsl (revision 37)
@@ -90,4 +90,7 @@
         Category updated
       </xsl:when>
+      <xsl:when test="id='org.bedework.client.message.subscription.removed'">
+        Subscription removed
+      </xsl:when>
       <xsl:when test="id='org.bedework.client.message.view.deleted'">
         View deleted
@@ -104,4 +107,7 @@
       <xsl:when test="id='org.bedework.client.message.authuser.updated'">
         Administrator updated
+      </xsl:when>
+      <xsl:when test="id='org.bedework.client.message.admingroup.deleted'">
+        Administrative group deleted
       </xsl:when>
       <xsl:when test="id='org.bedework.client.message.timezones.imported'">
Index: trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEDeleteAGAction.java
===================================================================
--- trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEDeleteAGAction.java (revision 2)
+++ trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEDeleteAGAction.java (revision 37)
@@ -100,5 +100,5 @@
     adgrps.removeGroup(updgrp);
     form.setUpdAdminGroup(null);
-
+    form.getMsg().emit("org.bedework.client.message.admingroup.deleted");
     return "continue";
   }
Index: trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml
===================================================================
--- trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml (revision 34)
+++ trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml (revision 37)
@@ -859,4 +859,5 @@
       <forward name="inUse" path="/admingroup/showReferenced.rdo" redirect="true" />
       <forward name="notFound" path="/admingroup/showUpdateList.rdo" redirect="true" />
+      <forward name="cancelled" path="/admingroup/showUpdateList.rdo" redirect="true" />
       <forward name="continue" path="/admingroup/showUpdateList.rdo" redirect="true" />
     </action>
Index: trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp (revision 28)
+++ trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp (revision 37)
@@ -1,7 +1,4 @@
 <%@ taglib uri='struts-bean' prefix='bean' %>
 <%@ taglib uri='struts-logic' prefix='logic' %>
-<%@ taglib uri='struts-html' prefix='html' %>
-<%@ taglib uri='struts-genurl' prefix='genurl' %>
-<html:xhtml/>
 
 <%@include file="/docs/header.jsp"%>
Index: trunk/calendar3/webadmin/war/docs/admingroup/chooseAdminGroup.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/chooseAdminGroup.jsp (revision 28)
+++ trunk/calendar3/webadmin/war/docs/admingroup/chooseAdminGroup.jsp (revision 37)
@@ -1,7 +1,4 @@
 <%@ taglib uri='struts-bean' prefix='bean' %>
 <%@ taglib uri='struts-logic' prefix='logic' %>
-<%@ taglib uri='struts-html' prefix='html' %>
-<%@ taglib uri='struts-genurl' prefix='genurl' %>
-<html:xhtml/>
 
 <%@include file="/docs/header.jsp"%>
Index: trunk/calendar3/webadmin/war/docs/admingroup/deleteAdminGroupConfirm.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/deleteAdminGroupConfirm.jsp (revision 2)
+++ trunk/calendar3/webadmin/war/docs/admingroup/deleteAdminGroupConfirm.jsp (revision 37)
@@ -3,5 +3,4 @@
 <%@ taglib uri='struts-html' prefix='html' %>
 <%@ taglib uri='struts-genurl' prefix='genurl' %>
-<html:xhtml/>
 
 <%@include file="/docs/header.jsp"%>
@@ -13,11 +12,4 @@
 </groups>
 
-<formElements>
-  <genurl:form action="admingroup/delete.do" >
-    <html:submit property="cancelled" value="Cancel"/>
-    <html:submit property="removeAdminGroupOK" value="Delete"/>
-  </genurl:form>
-</formElements>
-
 <%@include file="/docs/footer.jsp"%>
 
Index: trunk/calendar3/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp (revision 2)
+++ trunk/calendar3/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp (revision 37)
@@ -1,5 +1,4 @@
 <%@ taglib uri='struts-bean' prefix='bean' %>
 <%@ taglib uri='struts-logic' prefix='logic' %>
-<html:xhtml/>
 
 <group>
Index: trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/UnsubscribeAction.java
===================================================================
--- trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/UnsubscribeAction.java (revision 24)
+++ trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/UnsubscribeAction.java (revision 37)
@@ -108,5 +108,5 @@
 
     svc.removeSubscription(sub);
-
+    form.getMsg().emit("org.bedework.client.message.subscription.removed");
     return "success";
   }