Index: openacs-4/packages/acs-subsite/www/admin/group-types/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/index-postgresql.xql,v
diff -u -N -r1.3 -r1.3.30.1
--- openacs-4/packages/acs-subsite/www/admin/group-types/index-postgresql.xql	4 Dec 2001 00:20:47 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/index-postgresql.xql	13 Jun 2016 11:02:34 -0000	1.3.30.1
@@ -16,14 +16,19 @@
 	     where t1.object_type = 'group'
 	       and t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey)) t
                    left outer join
-           (select o.object_type, count(*) as number_groups
-              from groups g, acs_objects o,  
-                   application_group_element_map app_group
-             where acs_permission__permission_p(g.group_id, :user_id, 'read')
-               and o.object_id = g.group_id
-               and app_group.package_id = :package_id
-               and app_group.element_id = g.group_id
-             group by o.object_type) num
+	   (select object_type, count(group_id) as number_groups from 
+  	     (select distinct o.object_type, g.group_id   
+                from groups g, acs_objects o,  
+                     application_group_element_map app_group
+               where acs_permission__permission_p(g.group_id, :user_id, 'read')
+                 and o.object_id = g.group_id
+                 and ((app_group.package_id = :package_id and app_group.element_id = g.group_id)
+		 -- the or-clause below is just needed for "Registered Users" (-2)
+		 -- which is an application group for e.g. a subsite,
+		 -- but not mapped to it via application_group_element_map
+	         or  (o.object_id = -2)
+	     )) counts
+             group by object_type) num
              using (object_type)
      order by t.tree_sortkey
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql,v
diff -u -N -r1.3 -r1.3.28.1
--- openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql	13 Jun 2016 11:02:34 -0000	1.3.28.1
@@ -16,8 +16,7 @@
             and perm.privilege = 'read'
             and g.group_id = o.object_id
             and o.object_type = :group_type
-            and app_group.package_id = :package_id
-            and app_group.element_id = g.group_id
+            and (app_group.package_id = :package_id and app_group.element_id = g.group_id or o.object_id = -2)
           order by g.group_name, g.group_id) my_view 
     limit 26
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.adp,v
diff -u -N -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	10 Jun 2016 12:06:30 -0000	1.7.2.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	13 Jun 2016 11:02:34 -0000	1.7.2.3
@@ -4,6 +4,11 @@
 				   
 <h1>@doc.title@</h1>
 
+<ul>
+<li>Group: @type_info.pretty_name@
+<li>Supertype: <a href="one?group_type=@type_info.supertype@">@type_info.supertype@</a>
+</ul>
+
 <h2>#acs-subsite.Groups_of_this_type#</h2>
 
 <blockquote>
@@ -43,7 +48,7 @@
 </ul>
 <ul>
   <if @dynamic_p@ eq "t"> 
-      <li><a href="@add_attribute_url@">#acs-subsite.Add_an_attribute#</a></li>
+      <li><a href="@add_attribute_url@" class="button">#acs-subsite.Add_an_attribute#</a></li>
   </if>
   <else>
       <li>#acs-subsite.Attributes_can_only_be_added_by_programmers#</li>
@@ -67,7 +72,7 @@
   </else>
 </ul>
 <ul>
-  <li><a href="rel-type-add?group_type=@group_type_enc@">#acs-subsite.Add_a_permissible_relationship_type#</a></li>
+  <li><a href="rel-type-add?group_type=@group_type_enc@" class="button">#acs-subsite.Add_a_permissible_relationship_type#</a></li>
 </ul>
 
 
@@ -79,7 +84,7 @@
       <li>#acs-subsite.Default_join_policy#: @default_join_policy@
            (<a href="change-join-policy?group_type=@group_type_enc@">#acs-subsite.edit#</a>)
         </li>
-      <li> <a href="delete?group_type=@group_type_enc@">#acs-subsite.Delete_this_group_type#</a>
+      <li> <a href="delete?group_type=@group_type_enc@" class="button">#acs-subsite.Delete_this_group_type#</a>
       </li>
   </if>
   <else>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl,v
diff -u -N -r1.7.2.4 -r1.7.2.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	10 Jun 2016 12:10:04 -0000	1.7.2.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	13 Jun 2016 11:02:34 -0000	1.7.2.5
@@ -35,9 +35,10 @@
 }
 
 set doc(title) [_ acs-subsite.Details_for__group_type_pretty_name]
-
 set context [list [list "[ad_conn package_url]admin/group-types/" [_ acs-subsite.Group_Types]] $group_type_pretty_name]
 
+acs_object_type::get -object_type $group_type -array type_info
+
 # Pull out the first 25 groups of this type. If there are more, we'll
 # offer a link to display them all. Alphabetize the first 25 groups