--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java	Fri Nov 04 11:53:13 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java	Tue Nov 08 13:07:56 2011 +0000
@@ -119,36 +119,30 @@
         rootLayout.setWidth100();
         rootLayout.setMembersMargin(2);
 
-        final Canvas  wrapper = new Canvas();
-        wrapper.setWidth100();
-        wrapper.setHeight100();
+        final HLayout hlayout = new HLayout();
+        hlayout.setHeight("*");
+        hlayout.setWidth100();
+        hlayout.setMembersMargin(2);
 
-        controlPanel = createControlPanel(wrapper);
+        final Canvas themePanelWrapper = createThemePanel();
+
+        controlPanel = createControlPanel();
         mapPanel     = floodMap.getMapWidget();
-        Canvas themePanelWrapper = createThemePanel();
-
         final HorizontalPanel layout = new HorizontalPanel();
         layout.setWidth("99%");
         layout.setHeight("99%");
         layout.add(mapPanel);
 
-        wrapper.addChild(layout);
-
-        HLayout hlayout = new HLayout();
-        hlayout.setHeight("*");
-        hlayout.setWidth100();
-        hlayout.setMembersMargin(2);
-
         hlayout.addMember(themePanelWrapper);
-        hlayout.addMember(wrapper);
+        hlayout.addMember(layout);
 
         rootLayout.addMember(controlPanel);
         rootLayout.addMember(hlayout);
 
-        wrapper.addResizedHandler(new ResizedHandler() {
+        hlayout.addResizedHandler(new ResizedHandler() {
             public void onResized(ResizedEvent e) {
-                Integer height = wrapper.getHeight();
-                Integer width  = wrapper.getWidth();
+                Integer height = hlayout.getHeight();
+                Integer width  = hlayout.getWidth() - themePanelWrapper.getWidth();
 
                 height = height * 99 / 100;
                 width  = width  * 99 / 100;
@@ -378,8 +372,8 @@
     }
 
 
-    protected MapToolbar createControlPanel(Canvas wrapper) {
-        return new MapToolbar(this, floodMap, wrapper, false);
+    protected MapToolbar createControlPanel() {
+        return new MapToolbar(this, floodMap, false);
     }