diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantBrowsePane.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantBrowsePane.java
index 239b01b4f..6d03c1d44 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantBrowsePane.java
+++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantBrowsePane.java
@@ -50,7 +50,7 @@ import org.apache.log4j.Category;
  *
  * @author ashah (2003/08/15)
  * @version $Id: //portalserver/src/com/arsdigita/portalserver/ui/ParticipantBrowsePane.java#7 $
- +/
+ */
 public class ParticipantBrowsePane {
 
     private static Category s_log = Category.getInstance
@@ -93,7 +93,8 @@ public class ParticipantBrowsePane {
                 }
             };
         initialsList.setLayout(List.HORIZONTAL);
-        initialsList.setEmptyView(new Label(GlobalizationUtil.globalize("cw.workspace.ui.no_participants")));
+        initialsList.setEmptyView(new Label(GlobalizationUtil.globalize(
+                                      "cw.workspace.ui.no_participants")));
         initialsList.setModelBuilder(new AbstractListModelBuilder() {
                 public ListModel makeModel(List l, PageState ps) {
                     Workspace workspace = (Workspace) workspaceRL.get(ps);
@@ -385,7 +386,8 @@ public class ParticipantBrowsePane {
         result.add(bottomHalf);
 
         userSearch.add(
-                       new Label(GlobalizationUtil.globalize("cw.workspace.ui.enter_first_name_last_name_andor_email_address")));
+                   new Label(GlobalizationUtil.globalize(
+                   "cw.workspace.ui.enter_first_name_last_name_andor_email_address")));
         final TextField query = new TextField("query");
         userSearch.add(query);
         userSearch.add(new Label(""));
@@ -406,7 +408,9 @@ public class ParticipantBrowsePane {
                     long count = parties.size();
                     if (count == 0) {
                         bottomHalf.setVisibleComponent(ps, searchRedoLabel);
-                        searchRedoLabel.setLabel( (String) GlobalizationUtil.globalize("cw.workspace.ui.no_matches_found").localize() , ps);
+                        searchRedoLabel.setLabel( 
+                                (String) GlobalizationUtil.globalize(
+                                "cw.workspace.ui.no_matches_found").localize() , ps);
                     } else if (count > 100) {
                         bottomHalf.setVisibleComponent(ps, searchRedoLabel);
                         searchRedoLabel.setLabel(
@@ -419,7 +423,8 @@ public class ParticipantBrowsePane {
                 }
             });
 
-        userAdd.add(new Label(GlobalizationUtil.globalize("cw.workspace.ui.select_user_or_group_to_add")));
+        userAdd.add(new Label(GlobalizationUtil.globalize(
+                        "cw.workspace.ui.select_user_or_group_to_add")));
         final RadioGroup users = new RadioGroup("users");
         users.setLayout(RadioGroup.VERTICAL);
 
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantDisplay.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantDisplay.java
index 712e7c8a1..3e8109a6c 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantDisplay.java
+++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantDisplay.java
@@ -16,12 +16,12 @@
 package com.arsdigita.london.portal.ui;
 
 import com.arsdigita.bebop.*;
-import com.arsdigita.bebop.event.*;
-import com.arsdigita.bebop.form.*;
-import com.arsdigita.bebop.list.ListModel;
-import com.arsdigita.bebop.parameters.StringParameter;
+// import com.arsdigita.bebop.event.*;
+// import com.arsdigita.bebop.form.*;
+// import com.arsdigita.bebop.list.ListModel;
+// import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.kernel.*;
-import com.arsdigita.kernel.permissions.*;
+// import com.arsdigita.kernel.permissions.*;
 import com.arsdigita.london.portal.util.GlobalizationUtil; 
 import com.arsdigita.london.portal.Workspace;
 
@@ -31,7 +31,9 @@ import org.apache.log4j.Category;
  * ParticipantDisplay.
  *
  * @author dennis (2003/08/15)
- * @version $Id: //portalserver/dev/src/com/arsdigita/portalserver/ui/PortalParticipants.java#3 $
+ * Reimplementation using code from the Arsdigita portalserver
+ * @version $Id: com.arsdigita.portalserver.ui.PortalParticipants.java $
+ */
 public class ParticipantDisplay extends CompoundComponent {
 
     private static Category s_log = Category.getInstance
@@ -42,7 +44,8 @@ public class ParticipantDisplay extends CompoundComponent {
                               final RequestLocal participantRL) {
         super(container);
 
-        Label header = new Label(GlobalizationUtil.globalize("cw.workspace.ui.participant_info"));
+        Label header = new Label(GlobalizationUtil.globalize(
+                                 "cw.workspace.ui.participant_info"));
         header.setFontWeight(Label.BOLD);
         add(header);
 
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantListModel.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantListModel.java
index 2a4d0e418..b53417115 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantListModel.java
+++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantListModel.java
@@ -15,14 +15,14 @@
 
 package com.arsdigita.london.portal.ui;
 
-import com.arsdigita.bebop.*;
-import com.arsdigita.bebop.event.*;
-import com.arsdigita.bebop.form.*;
+// import com.arsdigita.bebop.*;
+// import com.arsdigita.bebop.event.*;
+// import com.arsdigita.bebop.form.*;
 import com.arsdigita.bebop.list.ListModel;
-import com.arsdigita.bebop.parameters.StringParameter;
+// import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.kernel.*;
-import com.arsdigita.kernel.permissions.*;
-import com.arsdigita.london.portal.util.GlobalizationUtil; 
+// import com.arsdigita.kernel.permissions.*;
+// import com.arsdigita.london.portal.util.GlobalizationUtil;
 import com.arsdigita.london.portal.Workspace;
 
 import org.apache.log4j.Category;
@@ -32,6 +32,7 @@ import org.apache.log4j.Category;
  *
  * @author dennis (2003/08/15)
  * @version $Id: com/arsdigita/portalserver/ui/PortalParticipants.java $
+ */
 public class ParticipantListModel implements ListModel {
 
     private static Category s_log = Category.getInstance
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantModel.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantModel.java
index 96bdc6202..9c37e8d1f 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantModel.java
+++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantModel.java
@@ -16,12 +16,12 @@
 package com.arsdigita.london.portal.ui;
 
 import com.arsdigita.bebop.*;
-import com.arsdigita.bebop.event.*;
-import com.arsdigita.bebop.form.*;
-import com.arsdigita.bebop.list.ListModel;
-import com.arsdigita.bebop.parameters.StringParameter;
+// import com.arsdigita.bebop.event.*;
+// import com.arsdigita.bebop.form.*;
+// import com.arsdigita.bebop.list.ListModel;
+// import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.kernel.*;
-import com.arsdigita.kernel.permissions.*;
+// import com.arsdigita.kernel.permissions.*;
 import com.arsdigita.london.portal.util.GlobalizationUtil; 
 import com.arsdigita.london.portal.Workspace;
 import com.arsdigita.globalization.GlobalizedMessage;
@@ -34,6 +34,7 @@ import org.apache.log4j.Category;
  * Reimplementation using original arsdigita portalserver code. 
  * @author dennis (2003/08/15)
  * @version $Id: com/arsdigita/portalserver/ui/PortalParticipants.java $
+ */
 public class ParticipantModel implements PropertySheetModel {
 
     private static Category s_log = Category.getInstance