=== modified file 'src/com/goldencode/p2j/ui/client/gui/FrameWindowGuiImpl.java'
--- src/com/goldencode/p2j/ui/client/gui/FrameWindowGuiImpl.java	2015-10-17 00:13:33 +0000
+++ src/com/goldencode/p2j/ui/client/gui/FrameWindowGuiImpl.java	2015-10-22 14:24:08 +0000
@@ -144,7 +144,9 @@
       setLocation(point);
       
       getContentPane().setSize(frame.dimension());
-      
+      getContentPane().doLayout();
+      super.doLayout();
+
       super.show();   
    }
    
@@ -154,9 +156,6 @@
    @Override
    public void draw()
    {
-      contentPane.doLayout();
-      doLayout();
-      
       super.draw();
    }
    

=== modified file 'src/com/goldencode/p2j/ui/client/widget/BorderedPanel.java'
--- src/com/goldencode/p2j/ui/client/widget/BorderedPanel.java	2015-09-16 12:00:31 +0000
+++ src/com/goldencode/p2j/ui/client/widget/BorderedPanel.java	2015-10-22 15:25:53 +0000
@@ -130,12 +130,6 @@
    @Override
    public void draw()
    {
-      LayoutManager<O> layout = getLayout();
-      if (layout != null)
-      {
-         layout.doLayout(this);
-      }
-      
       super.draw();
    }
 }

=== modified file 'src/com/goldencode/p2j/ui/client/widget/BorderedPanelImpl.java'
--- src/com/goldencode/p2j/ui/client/widget/BorderedPanelImpl.java	2015-09-16 17:27:49 +0000
+++ src/com/goldencode/p2j/ui/client/widget/BorderedPanelImpl.java	2015-10-22 15:27:04 +0000
@@ -64,6 +64,12 @@
    public void draw()
    {
       drawPanel();
+      LayoutManager<ChuiOutputManager> layout = getLayout();
+      if (layout != null)
+      {
+         layout.doLayout(this);
+      }
+
       super.draw();
    }