diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java
index 805ee85e46..3c3eb51dd7 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java
@@ -68,11 +68,6 @@ public class CompositeADTab extends AbstractADTab
     	return div;
     }
     
-    public Component getRootComponent() {
-    	return div;
-    }
-    
-    
     @Override
 	protected void doAddTab(GridTab gTab, ADTabpanel tabPanel) {
     	tabPanel.setParent(div);
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
index 4665c2972c..3d0126ac1f 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
@@ -85,12 +85,6 @@ public class ADWindowPanel extends AbstractADWindowPanel
         toolbar.setHeight("30px");
         toolbar.setParent(n);
         
-        contentArea = new Center();
-        contentArea.setParent(layout);
-        contentArea.setAutoscroll(true);
-        contentArea.setFlex(true);
-        adTab.createPart(contentArea);
-        
         South s = new South();        
         layout.appendChild(s);
         s.setCollapsible(false);
@@ -108,6 +102,12 @@ public class ADWindowPanel extends AbstractADWindowPanel
 	        LayoutUtils.addSclass("adwindow-nav-content", (HtmlBasedComponent) adTab.getTabSelectionComponent());
         }
         
+        contentArea = new Center();
+        contentArea.setParent(layout);
+        contentArea.setAutoscroll(true);
+        contentArea.setFlex(true);
+        adTab.createPart(contentArea);
+        
         if (parent instanceof Tabpanel) {
         	TabOnCloseHanlder handler = new TabOnCloseHanlder();
         	((Tabpanel)parent).setOnCloseHandler(handler);
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java b/zkwebui/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
index f27746c49c..9f6da1bf10 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
@@ -131,7 +131,7 @@ public class WindowContainer extends AbstractUIPart implements EventListener
 	private void deferLayout() {
 		Tabpanel panel = (Tabpanel) tabbox.getSelectedPanel();
 		if (panel.getFirstChild() instanceof Borderlayout) {
-			LayoutUtils.sendDeferLayoutEvent((Borderlayout) panel.getChildren().get(0), 350);
+			LayoutUtils.sendDeferLayoutEvent((Borderlayout) panel.getChildren().get(0), 50);
 		}
 	}