diff --git a/platform/util/src/com/intellij/util/ui/FormBuilder.java b/platform/util/src/com/intellij/util/ui/FormBuilder.java
index f5437de681c5..e7065dfd71a7 100644
--- a/platform/util/src/com/intellij/util/ui/FormBuilder.java
+++ b/platform/util/src/com/intellij/util/ui/FormBuilder.java
@@ -52,15 +52,15 @@ public class FormBuilder {
     return new FormBuilder();
   }
 
-  public FormBuilder addLabeledComponent(@Nullable JLabel label, JComponent component) {
+  public FormBuilder addLabeledComponent(@Nullable JComponent label, JComponent component) {
     return addLabeledComponent(label, component, myVerticalGap, false);
   }
 
-  public FormBuilder addLabeledComponent(@Nullable JLabel label, JComponent component, final int topInset) {
+  public FormBuilder addLabeledComponent(@Nullable JComponent label, JComponent component, final int topInset) {
     return addLabeledComponent(label, component, topInset, false);
   }
 
-  public FormBuilder addLabeledComponent(@Nullable JLabel label, JComponent component, boolean labelOnTop) {
+  public FormBuilder addLabeledComponent(@Nullable JComponent label, JComponent component, boolean labelOnTop) {
     return addLabeledComponent(label, component, myVerticalGap, labelOnTop);
   }
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
index 1f9bba3fa3b1..008a1ad75491 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
@@ -676,7 +676,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
     final JLabel commentLabel = new JLabel(COMMIT_MESSAGE_TITLE + ":") {
       @Override
       public Dimension getPreferredSize() {
-        return new Dimension(super.getWidth(), 29);
+        return super.getPreferredSize();
       }
     };
     commentGroup.add(commentLabel, BorderLayout.NORTH);
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form
index 7717abaf507b..74d271602149 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.svn.dialogs.browser.MkdirOptionsDialog">
-  <grid id="740d6" binding="myMainPanel" layout-manager="GridBagLayout">
+  <grid id="740d6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="10" y="10" width="281" height="260"/>
+      <xy x="10" y="10" width="515" height="304"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -10,7 +11,6 @@
       <component id="63d23" class="javax.swing.JLabel">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
         </constraints>
         <properties>
           <text value="Remote Folder URL:"/>
@@ -18,8 +18,7 @@
       </component>
       <component id="d6988" class="javax.swing.JLabel" binding="myURLLabel">
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="0.0"/>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font style="1"/>
@@ -28,7 +27,6 @@
       <component id="bcc7f" class="javax.swing.JLabel">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
         </constraints>
         <properties>
           <text value="Remote Folder Name:"/>
@@ -36,8 +34,7 @@
       </component>
       <component id="a259" class="javax.swing.JTextField" binding="myNameField">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="0.0"/>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <selectionEnd value="9"/>
@@ -46,17 +43,15 @@
       </component>
       <component id="8b69b" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Commit Message:"/>
         </properties>
       </component>
-      <scrollpane class="com.intellij.ui.components.JBScrollPane" id="e742e">
+      <scrollpane id="e742e" class="com.intellij.ui.components.JBScrollPane">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="6" anchor="1" fill="3" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="1.0"/>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="6" anchor="1" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -74,8 +69,7 @@
       </scrollpane>
       <component id="57563" class="javax.swing.JLabel" binding="myRecentMessagesLabel">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Recent Messages: "/>
@@ -83,8 +77,7 @@
       </component>
       <component id="6c8fa" class="javax.swing.JComboBox" binding="myMessagesBox">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
+          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialogOld.form b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialogOld.form
index 4db89de78a79..55c8981b8400 100644
--- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialogOld.form
+++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialogOld.form
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.svn.dialogs.browser.MkdirOptionsDialog1">
-  <grid id="740d6" binding="myMainPanel" layout-manager="GridBagLayout">
+  <grid id="740d6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="10" y="10" width="281" height="260"/>
+      <xy x="10" y="10" width="515" height="304"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -10,7 +11,6 @@
       <component id="63d23" class="javax.swing.JLabel">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
         </constraints>
         <properties>
           <text value="Remote Folder URL:"/>
@@ -18,8 +18,7 @@
       </component>
       <component id="d6988" class="javax.swing.JLabel" binding="myURLLabel">
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="0.0"/>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font style="1"/>
@@ -28,7 +27,6 @@
       <component id="bcc7f" class="javax.swing.JLabel">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
         </constraints>
         <properties>
           <text value="Remote Folder Name:"/>
@@ -36,8 +34,7 @@
       </component>
       <component id="a259" class="javax.swing.JTextField" binding="myNameField">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="0.0"/>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <selectionEnd value="9"/>
@@ -46,17 +43,15 @@
       </component>
       <component id="8b69b" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Commit Message:"/>
         </properties>
       </component>
-      <scrollpane class="com.intellij.ui.components.JBScrollPane" id="e742e">
+      <scrollpane id="e742e" class="com.intellij.ui.components.JBScrollPane">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="6" anchor="1" fill="3" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="1.0"/>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="6" anchor="1" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -74,8 +69,7 @@
       </scrollpane>
       <component id="57563" class="javax.swing.JLabel" binding="myRecentMessagesLabel">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Recent Messages: "/>
@@ -83,8 +77,7 @@
       </component>
       <component id="6c8fa" class="javax.swing.JComboBox" binding="myMessagesBox">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-          <gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
+          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>