diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
index 6fb804b3249..f0175b7d388 100644
--- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
@@ -19,7 +19,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/UserManagement.html com.sap.sailing.gwt.ui.UserManagement -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/UserManagement.html com.sap.sailing.gwt.ui.UserManagement -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Spectator"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
index fb7b2e9476e..0a10055964b 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
@@ -154,6 +154,10 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
     }
     
     @Override
+    public Widget getEntryWidget() {
+        return this;
+    }
+
     public void updateSettings(LeaderboardSettings result) {
         List<ExpandableSortableColumn<?>> columnsToExpandAgain = new ArrayList<ExpandableSortableColumn<?>>();
         for (int i = 0; i < getLeaderboardTable().getColumnCount(); i++) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/Component.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/Component.java
index b72b8eaff09..e3a0f483a48 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/Component.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/Component.java
@@ -1,6 +1,5 @@
 package com.sap.sailing.gwt.ui.shared.components;
 
-
 /**
  * 
  * @author Axel Uhl (d043530)
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/ComponentTitleBar.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/ComponentTitleBar.java
new file mode 100755
index 00000000000..8d9f11c20c6
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/ComponentTitleBar.java
@@ -0,0 +1,7 @@
+package com.sap.sailing.gwt.ui.shared.components;
+
+import com.google.gwt.user.client.ui.HorizontalPanel;
+
+public class ComponentTitleBar extends HorizontalPanel {
+
+}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/CompositePanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/CompositePanel.java
index aac3587edb9..b68c808a05b 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/CompositePanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/CompositePanel.java
@@ -1,9 +1,6 @@
 package com.sap.sailing.gwt.ui.shared.components;
 
-import java.util.Iterator;
-
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.VerticalPanel;
 
 /**
  * A GWT component that visualizes a {@link ComponentForest} including menus to scroll quickly to the embedded view
@@ -13,24 +10,12 @@ import com.google.gwt.user.client.ui.Widget;
  * @author Axel Uhl (d043530)
  *
  */
-public class CompositePanel extends Panel {
-    private final ComponentForest components;
+public class CompositePanel extends VerticalPanel {
     
     public CompositePanel(ComponentForest components) {
         super();
-        this.components = components;
+        for (ComponentForestEntry entry : components.getEntries()) {
+            entry.toString(); // TODO continue here...
+        }
     }
-
-    @Override
-    public Iterator<Widget> iterator() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean remove(Widget arg0) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
 }
diff --git a/java/com.sap.sailing.xcelsiusadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.xcelsiusadapter/META-INF/MANIFEST.MF
index 0f0fe8c36e0..f01ca26de7b 100755
--- a/java/com.sap.sailing.xcelsiusadapter/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.xcelsiusadapter/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Xcelsiusadapter
 Bundle-SymbolicName: com.sap.sailing.xcelsiusadapter
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: com.sap.sailing.xcelsiusadapter.Activator
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.servlet;version="2.5.0",
diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Activator.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Activator.java
deleted file mode 100755
index 4d03e266720..00000000000
--- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Activator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.sap.sailing.xcelsiusadapter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-    private static BundleContext context;
-
-    static BundleContext getContext() {
-        return context;
-    }
-
-//    private HttpServiceTracker httpServiceTracker;
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext bundleContext) throws Exception {
-        Activator.context = bundleContext;
-        // now track the HTTP service:
-        Map<String, Class<? extends javax.servlet.Servlet>> pathMap = new HashMap<String, Class<? extends javax.servlet.Servlet>>();
-        pathMap.put("/xcelsius", XcelsiusApp.class);
-//        httpServiceTracker = new HttpServiceTracker(context, pathMap, null);
-//        httpServiceTracker.open();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext bundleContext) throws Exception {
-        Activator.context = null;
-        // stop tracking the HTTP service:
-  //      httpServiceTracker.close();
-  //      httpServiceTracker = null;
-    }
-
-}