diff --git a/ccm-cms/src/com/arsdigita/cms/CustomizableContentItemXMLRenderer.java b/ccm-cms/src/com/arsdigita/cms/CustomizableContentItemXMLRenderer.java
index d8d95bbaa..fdad253c9 100644
--- a/ccm-cms/src/com/arsdigita/cms/CustomizableContentItemXMLRenderer.java
+++ b/ccm-cms/src/com/arsdigita/cms/CustomizableContentItemXMLRenderer.java
@@ -19,11 +19,9 @@
  */
 package com.arsdigita.cms;
 
-import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
 import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.domain.DomainObject;
 import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.domain.DomainObjectTraversal;
 import com.arsdigita.domain.DomainObjectTraversalAdapter;
 import com.arsdigita.domain.DomainObjectXMLRenderer;
 import com.arsdigita.kernel.ACSObject;
@@ -54,7 +52,7 @@ public class CustomizableContentItemXMLRenderer
             CustomizableContentItemXMLRenderer.class);
     private int m_pageSize = 20;
     private String m_order;
-    private List<String> m_filters;
+    private List<String> m_filters;    
 
     public CustomizableContentItemXMLRenderer(Element root) {
         super(root);
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
index 27e95aee4..8e41dd5ac 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -239,10 +239,10 @@ public class Loader extends PackageLoader {
         template = Template.create(
                 "SciOrganization Description Only",
                 "Display only the description of a SciOrganization",
-                "/packages/navigation/templates/" +
-                "SciOrganizationDescription.jsp");
+                "/packages/navigation/templates/"
+                + "SciOrganizationDescription.jsp");
 
-         template = Template.create(
+        template = Template.create(
                 "SciProject List",
                 "List of SciProjects",
                 "/packages/navigation/templates/SciProjectList.jsp");
@@ -259,6 +259,27 @@ public class Loader extends PackageLoader {
                 + "(and the short description)",
                 "/packages/navigation/templates/SciOrganizationMembers.jsp");
 
+        template =
+        Template.create(
+                "SciOrganization Active Members",
+                "Displays only the active members of a SciOrganization "
+                + "(and the short description)",
+                "/packages/navigation/templates/SciOrganizationActiveMembers.jsp");
+
+        template =
+        Template.create(
+                "SciOrganization Associated Members",
+                "Displays only the associated members of a SciOrganization "
+                + "(and the short description)",
+                "/packages/navigation/templates/SciOrganizationAssociatedMembers.jsp");
+
+        template =
+        Template.create(
+                "SciOrganization Former Members",
+                "Displays only the former members of a SciOrganization "
+                + "(and the short description)",
+                "/packages/navigation/templates/SciOrganizationFormerMembers.jsp");
+
         template = Template.create(
                 "SciOrganization Departments",
                 "Displays only the departments of a SciOrganization",
@@ -271,6 +292,20 @@ public class Loader extends PackageLoader {
                 + "departments",
                 "/packages/navigation/templates/SciOrganizationProjects.jsp");
 
+        template =
+        Template.create(
+                "SciOrganization Ongoing Projects",
+                "Displays only the ongoging projects of a SciOrganization "
+                + "(and its departments)",
+                "/packages/navigation/templates/SciOrganizationOngoingProjects.jsp");
+
+        template =
+        Template.create(
+                "SciOrganization Finished Projects",
+                "Displays only the finished projects of a SciOrganization "
+                + "(and its departments)",
+                "/packages/navigation/templates/SciOrganizationFinishedProjects.jsp");
+
         template = Template.create(
                 "SciDepartment Description Only",
                 "Display only the description of a SciDepartment",
@@ -283,9 +318,28 @@ public class Loader extends PackageLoader {
                 + "(and the short description)",
                 "/packages/navigation/templates/SciDepartmentMembers.jsp");
 
+        template = Template.create(
+                "SciDepartment Active Members",
+                "Displays only the active members of a SciDepartment "
+                + "(and the short description)",
+                "/packages/navigation/templates/SciDepartmentActiveMembers.jsp");
+
+        template =
+        Template.create(
+                "SciDepartment Associated Members",
+                "Displays only the associated members of a SciDepartment "
+                + "(and the short description)",
+                "/packages/navigation/templates/SciDepartmentAssociatedMembers.jsp");
+
+        template = Template.create(
+                "SciDepartment Former Members",
+                "Displays only the former members of a SciDepartment "
+                + "(and the short description)",
+                "/packages/navigation/templates/SciDepartmentFormerMembers.jsp");
+
         template = Template.create(
                 "SciDepartment Departments",
-                "Displays only the departments of a SciDepartment",
+                "Displays only the subdepartments of a SciDepartment",
                 "/packages/naviagation/templates/"
                 + "SciDepartmentDepartments.jsp");
 
@@ -295,6 +349,20 @@ public class Loader extends PackageLoader {
                 + "departments",
                 "/packages/navigation/templates/SciDepartmentProjects.jsp");
 
+        template =
+        Template.create(
+                "SciDepartment Ongoing Projects",
+                "Displays only the ongoing projects of a SciDepartment (and its "
+                + "subdepartments",
+                "/packages/navigation/templates/SciDepartmentOngoingProjects.jsp");
+
+        template =
+        Template.create(
+                "SciDepartment Finished Projects",
+                "Displays only the finished projects of a SciDepartment (and its "
+                + "subdepartments",
+                "/packages/navigation/templates/SciDepartmentFinishedProjects.jsp");
+
     }
 
     /**
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentActiveMembers.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentActiveMembers.jsp
new file mode 100644
index 000000000..6e81f3f34
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentActiveMembers.jsp
@@ -0,0 +1,56 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");        
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentAssociatedMembers.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentAssociatedMembers.jsp
new file mode 100644
index 000000000..890957e58
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentAssociatedMembers.jsp
@@ -0,0 +1,57 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember = true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentFinishedProjects.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentFinishedProjects.jsp
new file mode 100644
index 000000000..b6c5815fa
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentFinishedProjects.jsp
@@ -0,0 +1,60 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet><![CDATA[
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+
+        java.util.Calendar today = new java.util.GregorianCalendar();
+        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
+                                                today.get(java.util.Calendar.MONTH) + 1,
+                                                today.get(java.util.Calendar.DAY_OF_MONTH));
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ]]></jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentFormerMembers.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentFormerMembers.jsp
new file mode 100644
index 000000000..706a76a3a
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentFormerMembers.jsp
@@ -0,0 +1,56 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentOngoingProjects.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentOngoingProjects.jsp
new file mode 100644
index 000000000..e910d132d
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciDepartmentOngoingProjects.jsp
@@ -0,0 +1,60 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet><![CDATA[
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+
+        java.util.Calendar today = new java.util.GregorianCalendar();
+        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
+                                                today.get(java.util.Calendar.MONTH) + 1,
+                                                today.get(java.util.Calendar.DAY_OF_MONTH));
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ]]></jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationActiveMembers.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationActiveMembers.jsp
new file mode 100644
index 000000000..f94befbc7
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationActiveMembers.jsp
@@ -0,0 +1,58 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationAssociatedMembers.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationAssociatedMembers.jsp
new file mode 100644
index 000000000..6041bad0d
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationAssociatedMembers.jsp
@@ -0,0 +1,58 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember = true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationDescription.jsp~ b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationDescription.jsp~
deleted file mode 100644
index 6eb9e031a..000000000
--- a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationDescription.jsp~
+++ /dev/null
@@ -1,45 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-          xmlns:define="/WEB-INF/bebop-define.tld"
-          xmlns:show="/WEB-INF/bebop-show.tld"
-          version="1.2">
-
-    <jsp:directive.page
-        import="com.arsdigita.london.navigation.NavigationModel,
-        com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-
-    <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-    </jsp:scriptlet>
-
-    <define:page name="defaultItemPage" application="navigation"
-                 title="Navigation" cache="true">
-
-        <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-        <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
-        <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-        <define:component name="itemList"
-                          classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-
-        <define:component name="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>        
-
-        <define:component name="itemXML"
-                          classname="com.arsdigita.cms.dispatcher.SciOrganizationDescriptionPanel"/>
-
-          <define:component name="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationFinishedProjects.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationFinishedProjects.jsp
new file mode 100644
index 000000000..c31ed85e1
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationFinishedProjects.jsp
@@ -0,0 +1,61 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet><![CDATA[
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
+
+        java.util.Calendar today = new java.util.GregorianCalendar();
+        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
+                                                today.get(java.util.Calendar.MONTH) + 1,
+                                                today.get(java.util.Calendar.DAY_OF_MONTH));
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ]]></jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationFormerMembers.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationFormerMembers.jsp
new file mode 100644
index 000000000..3e702b584
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationFormerMembers.jsp
@@ -0,0 +1,57 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationOngoingProjects.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationOngoingProjects.jsp
new file mode 100644
index 000000000..5b2f64a9d
--- /dev/null
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganizationOngoingProjects.jsp
@@ -0,0 +1,61 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet><![CDATA[
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
+        
+        java.util.Calendar today = new java.util.GregorianCalendar();
+        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
+                                                today.get(java.util.Calendar.MONTH) + 1,
+                                                today.get(java.util.Calendar.DAY_OF_MONTH));
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ]]></jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file