Index: openacs-4/packages/acs-admin/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-admin/www/index.adp	3 Jul 2015 10:25:36 -0000	1.15
+++ openacs-4/packages/acs-admin/www/index.adp	7 Aug 2017 23:47:45 -0000	1.16
@@ -1,34 +1,25 @@
 <master>
   <property name="doc(title)">@page_title;literal@</property>
 
-<div style="float: right;">
-  <a href="developer" class="button">Developer's Admin</a>
-</div>
+<h1>Site-Wide Administration</h1>
 
-<h1>Core Administration</h1>
+<include src="/packages/acs-admin/lib/site-wide-services"
+    nr_subsites="@subsite_number;literal@" >
 
-<include src="/packages/acs-admin/lib/site-wide-services">
-
 <if @packages:rowcount@ gt 0>
-  <h1>Site-Wide Package Administration</h1>
-  <listtemplate name="packages"></listtemplate>
-</if>
+  <h3>Site-Wide Package Administration</h3>
 
-<if @too_many_subsites_p@ gt 0>
-  <h1>Subsite Administration</h1>
-  <p>Too many subsites to display: @subsite_number@</p>
+  <p>Manage application packages with site-wide administration facilities.
+  These packages have either site-wide parameters (package
+  parameters valid for every instance of the package) or they have an
+  own web interface for site-wide administration (www/sitewide-admin).
+  
+  <listtemplate name="packages" style="table-2third"></listtemplate>
+  <p>
 </if>
-<else>
 
-<if @subsites:rowcount@ gt 0>
-  <h1>Subsite Administration</h1>
-  <ul>
-    <multiple name="subsites">
-      <li><a href="@subsites.admin_url@">@subsites.path_pretty@</a></li>
-    </multiple>
-  </ul>
-</if>
-</else>
 
-<h1>Service Administration</h1>
+<h3>Site-Wide Service Administration</h3>
+<p>Manage service packages having either parameters or pages (for admins or users):
+</p>
 <include src="/packages/acs-admin/lib/service-parameters">