diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.form b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.form
index 4d452482d19b..4d16b23ed4a6 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.form
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.form
@@ -7,7 +7,7 @@
     </constraints>
     <properties/>
     <clientProperties>
-      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
+      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
     </clientProperties>
     <border type="etched" title-resource-bundle="messages/CompilerBundle" title-key="eclipse.options.group.title"/>
     <children>
@@ -38,8 +38,8 @@
           <text resource-bundle="messages/CompilerBundle" key="java.compiler.option.generate.no.warnings"/>
         </properties>
       </component>
-      <grid id="d7ddf" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="5">
-        <margin top="10" left="0" bottom="0" right="0"/>
+      <grid id="d7ddf" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="10" left="8" bottom="0" right="0"/>
         <constraints>
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form
index ede31f90580e..113e6ace5179 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form
@@ -7,7 +7,7 @@
     </constraints>
     <properties/>
     <clientProperties>
-      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
+      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
     </clientProperties>
     <border type="etched" title-resource-bundle="messages/CompilerBundle" title-key="javac.options.group.title"/>
     <children>
@@ -37,8 +37,8 @@
           <text resource-bundle="messages/CompilerBundle" key="java.compiler.option.generate.no.warnings"/>
         </properties>
       </component>
-      <grid id="d7ddf" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="5">
-        <margin top="10" left="0" bottom="0" right="0"/>
+      <grid id="d7ddf" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="10" left="8" bottom="0" right="0"/>
         <constraints>
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesOptionsPanel.form
index 1936157f726f..39da15a2f707 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesOptionsPanel.form
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesOptionsPanel.form
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.compiler.impl.javaCompiler.jikes.JikesConfigurable">
-  <grid id="66887" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
+  <grid id="66887" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="103" y="66" width="429" height="205"/>
+      <xy x="103" y="66" width="429" height="225"/>
     </constraints>
     <properties/>
     <clientProperties>
-      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
+      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
     </clientProperties>
     <border type="etched" title-resource-bundle="messages/CompilerBundle" title-key="jikes.options.group.title"/>
     <children>
@@ -46,10 +46,10 @@
           <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <grid id="62794" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
+      <grid id="62794" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="8" bottom="0" right="0"/>
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -93,10 +93,10 @@
           </grid>
         </children>
       </grid>
-      <grid id="8f7f6" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
+      <grid id="8f7f6" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="8" bottom="0" right="0"/>
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
index 11cf203ae50b..4ec4d8bd8c01 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
@@ -16,45 +16,11 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="2dbd6" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="-1">
-            <margin top="0" left="0" bottom="0" right="0"/>
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties/>
-            <clientProperties>
-              <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
-            </clientProperties>
-            <border type="none" title-resource-bundle="messages/CompilerBundle" title-key="label.option.resource.patterns.text"/>
-            <children>
-              <component id="263f1" class="javax.swing.JTextField" binding="myResourcePatternsField">
-                <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="9" fill="1" indent="0" use-parent-layout="false">
-                    <preferred-size width="150" height="-1"/>
-                  </grid>
-                </constraints>
-                <properties>
-                  <focusable value="true"/>
-                  <margin top="0" left="2" bottom="0" right="0"/>
-                  <text value="" noi18n="true"/>
-                </properties>
-              </component>
-              <component id="316d6" class="javax.swing.JLabel" binding="myPatternLegendLabel">
-                <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <text resource-bundle="messages/CompilerBundle" key="label.resource.patterns.legend"/>
-                </properties>
-              </component>
-            </children>
-          </grid>
           <component id="889a8" class="javax.swing.JCheckBox" binding="myCbClearOutputDirectory">
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <margin top="2" left="3" bottom="2" right="3"/>
               <text resource-bundle="messages/CompilerBundle" key="label.option.clear.output.directory.on.rebuild"/>
             </properties>
           </component>
@@ -63,7 +29,6 @@
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <margin top="2" left="3" bottom="2" right="3"/>
               <text resource-bundle="messages/CompilerBundle" key="add.notnull.assertions"/>
             </properties>
           </component>
@@ -72,7 +37,6 @@
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <margin top="2" left="3" bottom="2" right="3"/>
               <text resource-bundle="messages/CompilerBundle" key="label.option.compile.in.background"/>
             </properties>
           </component>
@@ -81,10 +45,52 @@
               <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <margin top="2" left="3" bottom="2" right="3"/>
               <text resource-bundle="messages/CompilerBundle" key="label.option.autoshow.first.error"/>
             </properties>
           </component>
+          <grid id="21dd4" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="5" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="2dbd6" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="0" left="0" bottom="0" right="0"/>
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+                <clientProperties>
+                  <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
+                </clientProperties>
+                <border type="none" title-resource-bundle="messages/CompilerBundle" title-key="label.option.resource.patterns.text"/>
+                <children>
+                  <component id="263f1" class="javax.swing.JTextField" binding="myResourcePatternsField">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="9" fill="1" indent="0" use-parent-layout="false">
+                        <preferred-size width="150" height="-1"/>
+                      </grid>
+                    </constraints>
+                    <properties>
+                      <focusable value="true"/>
+                      <margin top="0" left="2" bottom="0" right="0"/>
+                      <text value="" noi18n="true"/>
+                    </properties>
+                  </component>
+                  <component id="316d6" class="javax.swing.JLabel" binding="myPatternLegendLabel">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="messages/CompilerBundle" key="label.resource.patterns.legend"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+            </children>
+          </grid>
         </children>
       </grid>
       <vspacer id="67edf">
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/RmicOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/RmicOptionsPanel.form
index a2cd37ad0ff7..a5a4aafe6385 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/RmicOptionsPanel.form
+++ b/java/compiler/impl/src/com/intellij/compiler/options/RmicOptionsPanel.form
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.compiler.options.RmicConfigurable">
-  <grid id="49284" binding="myPanel" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="49284" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="37" y="129" width="521" height="280"/>
-      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="9b938" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="9b938" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <xy x="0" y="0" width="521" height="111"/>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
           <component id="3c8c0" class="javax.swing.JCheckBox" binding="myCbEnabled">
             <constraints>
-              <xy x="0" y="0" width="191" height="24"/>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="messages/CompilerBundle" key="rmic.option.enable.rmi.stubs"/>
@@ -29,8 +26,7 @@
           </component>
           <component id="70faa" class="javax.swing.JCheckBox" binding="myCbGenerateIiopStubs">
             <constraints>
-              <xy x="0" y="29" width="142" height="24"/>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="messages/CompilerBundle" key="rmic.option.generate.iiop.stubs"/>
@@ -38,8 +34,7 @@
           </component>
           <component id="3d38f" class="javax.swing.JCheckBox" binding="myCbDebuggingInfo">
             <constraints>
-              <xy x="0" y="58" width="170" height="24"/>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <selected value="false"/>
@@ -48,8 +43,7 @@
           </component>
           <component id="90803" class="javax.swing.JCheckBox" binding="myCbGenerateNoWarnings">
             <constraints>
-              <xy x="0" y="87" width="153" height="24"/>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="messages/CompilerBundle" key="java.compiler.option.generate.no.warnings"/>
@@ -57,19 +51,17 @@
           </component>
         </children>
       </grid>
-      <grid id="3f1e9" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="10" left="0" bottom="0" right="0"/>
+      <grid id="3f1e9" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="10" left="8" bottom="0" right="0"/>
         <constraints>
-          <xy x="0" y="116" width="521" height="164"/>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="1" fill="3"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
           <component id="f8a80" class="javax.swing.JLabel" binding="myFieldLabel">
             <constraints>
-              <xy x="0" y="10" width="220" height="16"/>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="1" fill="0"/>
+              <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"/>
             </constraints>
             <properties>
               <text resource-bundle="messages/CompilerBundle" key="java.compiler.option.additional.command.line.parameters"/>
@@ -77,11 +69,11 @@
           </component>
           <component id="479c2" class="com.intellij.ui.RawCommandLineEditor" binding="myAdditionalOptionsField">
             <constraints>
-              <xy x="230" y="10" width="291" height="20"/>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="1" fill="1">
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
+            <properties/>
           </component>
         </children>
       </grid>
diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form
index b6fa04e745f5..6a0c22b8ae78 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.applet.AppletConfigurable">
-  <grid id="e5f4d" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="e5f4d" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="8" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="133" y="39" width="564" height="646"/>
+      <xy x="133" y="39" width="564" height="584"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -22,7 +22,7 @@
             </constraints>
             <properties>
               <selected value="true"/>
-              <text resource-bundle="messages/ExecutionBundle" key="applet.configuration.applet.class.label"/>
+              <text resource-bundle="messages/ExecutionBundle" key="applet.configuration.applet.class.option"/>
             </properties>
           </component>
           <component id="74d77" class="javax.swing.JRadioButton" binding="myURL">
@@ -37,33 +37,38 @@
       </grid>
       <component id="5dbf7" class="com.intellij.openapi.ui.LabeledComponent" binding="myPolicyFile">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
-          <labelInsets top="0" left="0" bottom="5" right="0"/>
+          <labelInsets top="0" left="0" bottom="0" right="0"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="212" height="16"/>
           <text resource-bundle="messages/ExecutionBundle" key="applet.configuration.policy.file.label"/>
         </properties>
       </component>
       <component id="67632" class="com.intellij.openapi.ui.LabeledComponent" binding="myVMParameters">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false">
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="400" height="-1"/>
           </grid>
         </constraints>
         <properties>
           <componentClass value="com.intellij.ui.RawCommandLineEditor"/>
-          <labelInsets top="5" left="0" bottom="2" right="0"/>
+          <labelInsets top="0" left="0" bottom="0" right="0"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="212" height="16"/>
           <text resource-bundle="messages/ExecutionBundle" key="applet.configuration.vm.parameters.for.appletviewer.label"/>
         </properties>
       </component>
       <component id="eac49" class="com.intellij.openapi.ui.LabeledComponent" binding="myModule">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <componentClass value="javax.swing.JComboBox"/>
-          <labelInsets top="5" left="0" bottom="5" right="0"/>
+          <labelInsets top="0" left="0" bottom="0" right="0"/>
+          <labelLocation value="West"/>
           <text resource-bundle="messages/ExecutionBundle" key="applet.configuration.use.classpath.and.jdk.of.module.label"/>
         </properties>
       </component>
@@ -75,16 +80,16 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="dbe39" binding="myHTMLOptions" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="-1">
-            <margin top="5" left="5" bottom="5" right="5"/>
+          <grid id="dbe39" binding="myHTMLOptions" layout-manager="GridLayoutManager" row-count="1" 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>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
             <clientProperties>
-              <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
+              <BorderFactoryClass class="java.lang.String" value=""/>
             </clientProperties>
-            <border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="applet.configuration.url.border"/>
+            <border type="none"/>
             <children>
               <component id="a2b70" class="javax.swing.JLabel" binding="myHtmlFileLabel">
                 <constraints>
@@ -104,8 +109,8 @@
               </component>
             </children>
           </grid>
-          <grid id="71bb1" binding="myClassOptions" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="7">
-            <margin top="5" left="5" bottom="5" right="5"/>
+          <grid id="71bb1" binding="myClassOptions" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
@@ -113,9 +118,9 @@
               <enabled value="true"/>
             </properties>
             <clientProperties>
-              <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
+              <BorderFactoryClass class="java.lang.String" value=""/>
             </clientProperties>
-            <border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="applet.configuration.applet.class.border"/>
+            <border type="none"/>
             <children>
               <grid id="9c777" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
@@ -252,12 +257,18 @@
       </grid>
       <vspacer id="8b063">
         <constraints>
-          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="b2d36" class="com.intellij.execution.ui.AlternativeJREPanel" binding="myAlternativeJREPanel">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="9e31a" class="javax.swing.JSeparator">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
index a70c36b0911a..d3c691ce357d 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.application.ApplicationConfigurable">
-  <grid id="93687" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="10">
+  <grid id="93687" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="53" y="36" width="596" height="433"/>
@@ -21,9 +21,13 @@
       </component>
       <component id="50d08" class="com.intellij.openapi.ui.LabeledComponent" binding="myMainClass" custom-create="true">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="154" height="25"/>
+          </grid>
         </constraints>
         <properties>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="144" height="16"/>
           <text resource-bundle="messages/ExecutionBundle" key="application.configuration.main.class.label"/>
         </properties>
       </component>
@@ -33,6 +37,7 @@
         </constraints>
         <properties>
           <componentClass value="javax.swing.JComboBox"/>
+          <labelLocation value="West"/>
           <text resource-bundle="messages/ExecutionBundle" key="application.configuration.use.classpath.and.jdk.of.module.label"/>
         </properties>
       </component>
diff --git a/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java b/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
index f2f9cb8cc63a..973cc74c180b 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
@@ -45,8 +45,9 @@ public class AlternativeJREPanel extends JPanel {
     super(new GridBagLayout());
 
     myCbEnabled = new JCheckBox(ExecutionBundle.message("run.configuration.use.alternate.jre.checkbox"));
-    final GridBagConstraints gc = new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0, GridBagConstraints.NORTHWEST,
-                                                         GridBagConstraints.HORIZONTAL, new Insets(2, -2, 2, 2), 0, 0);
+    myCbEnabled.setPreferredSize(new Dimension(154, 16));
+    final GridBagConstraints gc = new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.WEST,
+                                                         GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0);
     add(myCbEnabled, gc);
 
     myFieldWithHistory = new TextFieldWithHistory();
@@ -61,7 +62,8 @@ public class AlternativeJREPanel extends JPanel {
                                         ExecutionBundle.message("run.configuration.select.jre.dir.label"),
                                         null, BrowseFilesListener.SINGLE_DIRECTORY_DESCRIPTOR,
                                         TextComponentAccessor.TEXT_FIELD_WITH_HISTORY_WHOLE_TEXT);
-    gc.insets.left = 20;
+    gc.gridx = 1;
+    gc.weightx = 1;
     add(myPathField, gc);
     InsertPathAction.addTo(myFieldWithHistory.getTextEditor());
 
diff --git a/java/execution/impl/src/com/intellij/execution/ui/CommonJavaParametersPanel.java b/java/execution/impl/src/com/intellij/execution/ui/CommonJavaParametersPanel.java
index 2c980cb9d75e..35442ec0d697 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/CommonJavaParametersPanel.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/CommonJavaParametersPanel.java
@@ -20,6 +20,8 @@ import com.intellij.execution.ExecutionBundle;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.ui.RawCommandLineEditor;
 
+import java.awt.*;
+
 public class CommonJavaParametersPanel extends CommonProgramParametersPanel {
   private LabeledComponent<RawCommandLineEditor> myVMParameters;
 
@@ -33,6 +35,9 @@ public class CommonJavaParametersPanel extends CommonProgramParametersPanel {
                                              ExecutionBundle.message("run.configuration.java.vm.parameters.label"));
     copyDialogCaption(myVMParameters);
 
+    myVMParameters.setLabelLocation(BorderLayout.WEST);
+    myVMParameters.setLabelPreferredSize(super.getProgramParametersComponent().getLabelPreferredSize());
+
     add(myVMParameters);
     super.addComponents();
   }
diff --git a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java
index 77bc11669912..b772186338b7 100644
--- a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java
+++ b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java
@@ -72,10 +72,10 @@ public class ClassFilterEditor extends JPanel implements ComponentWithEmptyText
     myTable = new JBTable();
     JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable);
 
-    add(scrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 3, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(4, 4, 4, 6), 0, 0));
-    add(myAddClassButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(4, 0, 0, 4), 0, 0));
-    add(myAddPatternButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(4, 0, 0, 4), 0, 0));
-    add(myRemoveButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(4, 0, 0, 4), 0, 0));
+    add(scrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 3, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(4, 0, 4, 6), 0, 0));
+    add(myAddClassButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(4, 0, 0, 0), 0, 0));
+    add(myAddPatternButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(4, 0, 0, 0), 0, 0));
+    add(myRemoveButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(4, 0, 0, 0), 0, 0));
 
     myChooserFilter = classFilter;
     myProject = project;
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form b/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
index bc914ba1a65f..2506873a81ce 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.application.options.CodeCompletionPanel">
-  <grid id="8765f" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="0" vgap="0">
+  <grid id="8765f" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="17" y="22" width="446" height="422"/>
+      <xy x="17" y="22" width="442" height="502"/>
     </constraints>
     <properties>
       <enabled value="true"/>
@@ -18,10 +18,10 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="7f988" layout-manager="GridLayoutManager" row-count="10" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="7f988" layout-manager="GridLayoutManager" row-count="11" 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>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
             <clientProperties>
@@ -119,6 +119,41 @@
                   <text value="0"/>
                 </properties>
               </component>
+              <component id="ae843" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="8" 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>
+                  <iconTextGap value="4"/>
+                  <inheritsPopupMenu value="true"/>
+                  <text value="Preselect the first suggestion:"/>
+                </properties>
+              </component>
+              <component id="6cbc" class="javax.swing.JComboBox" binding="myFocusLookup">
+                <constraints>
+                  <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id="749a1" class="javax.swing.JCheckBox" binding="myCbAutopopupJavaDoc">
+                <constraints>
+                  <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <margin top="2" left="2" bottom="0" right="2"/>
+                  <text resource-bundle="messages/ApplicationBundle" key="editbox.autopopup.javadoc.in.ms"/>
+                </properties>
+              </component>
+              <component id="b0975" class="com.intellij.ui.components.JBLabel">
+                <constraints>
+                  <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <horizontalAlignment value="4"/>
+                  <style value="SMALL"/>
+                  <text value="For explicitly invoked completion"/>
+                </properties>
+              </component>
               <component id="a1f3b" class="javax.swing.JTextField" binding="myAutopopupJavaDocField">
                 <constraints>
                   <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="9" fill="0" indent="0" use-parent-layout="false">
@@ -132,62 +167,6 @@
                   <text value="1000"/>
                 </properties>
               </component>
-              <grid id="42a0" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                <margin top="0" left="15" bottom="3" right="0"/>
-                <constraints>
-                  <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties/>
-                <border type="none"/>
-                <children>
-                  <component id="ae843" 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"/>
-                    </constraints>
-                    <properties>
-                      <iconTextGap value="4"/>
-                      <inheritsPopupMenu value="true"/>
-                      <text value="Preselect the first suggestion:"/>
-                    </properties>
-                  </component>
-                </children>
-              </grid>
-              <component id="6cbc" class="javax.swing.JComboBox" binding="myFocusLookup">
-                <constraints>
-                  <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties/>
-              </component>
-              <grid id="96793" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                <margin top="0" left="0" bottom="0" right="0"/>
-                <constraints>
-                  <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties/>
-                <border type="none"/>
-                <children>
-                  <component id="749a1" class="javax.swing.JCheckBox" binding="myCbAutopopupJavaDoc">
-                    <constraints>
-                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                    </constraints>
-                    <properties>
-                      <margin top="2" left="2" bottom="0" right="2"/>
-                      <text resource-bundle="messages/ApplicationBundle" key="editbox.autopopup.javadoc.in.ms"/>
-                    </properties>
-                  </component>
-                  <component id="b0975" class="com.intellij.ui.components.JBLabel">
-                    <constraints>
-                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
-                    </constraints>
-                    <properties>
-                      <foreground color="-10066330"/>
-                      <horizontalAlignment value="4"/>
-                      <style value="SMALL"/>
-                      <text value="For explicitly invoked completion"/>
-                    </properties>
-                  </component>
-                </children>
-              </grid>
             </children>
           </grid>
           <grid id="8dae3" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
diff --git a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
index 44bc0fb647fe..73a0f3593db2 100644
--- a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
@@ -34,6 +34,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,6 +123,7 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane
   protected final void addTab(CodeStyleAbstractPanel tab) {
     myTabs.add(tab);
     tab.setShouldUpdatePreview(true);
+    tab.getPanel().setBorder(new EmptyBorder(5, 8, 5, 5));
     addPanelToWatch(tab.getPanel());
     myTabbedPane.addTab(tab.getTabTitle(), tab.getPanel());
     if (myActiveTab == null) {
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form
index 83ff3444fd9f..5e48ae721831 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form
@@ -24,13 +24,11 @@
       </vspacer>
       <grid id="d489d" binding="myStepsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false">
-            <minimum-size width="200" height="-1"/>
-          </grid>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <clientProperties>
-          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
         </clientProperties>
         <border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="before.launch.panel.title"/>
         <children/>
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
index 92bdfba069af..495a6ece9d23 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
@@ -103,6 +103,12 @@ public class CommonProgramParametersPanel extends JPanel {
     myWorkingDirectoryComponent = LabeledComponent.create(panel, ExecutionBundle.message("run.configuration.working.directory.label"));
     myEnvVariablesComponent = new EnvironmentVariablesComponent();
 
+    myEnvVariablesComponent.setLabelLocation(BorderLayout.WEST);
+    myProgramParametersComponent.setLabelLocation(BorderLayout.WEST);
+    myWorkingDirectoryComponent.setLabelLocation(BorderLayout.WEST);
+    myProgramParametersComponent.setLabelPreferredSize(new Dimension(myEnvVariablesComponent.getLabelPreferredSize().width - 4, myEnvVariablesComponent.getLabelPreferredSize().height));
+    myWorkingDirectoryComponent.setLabelPreferredSize(myProgramParametersComponent.getLabelPreferredSize());
+
     addComponents();
 
     setPreferredSize(new Dimension(10, 10));
diff --git a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java
index c92beeb58b76..1a8e80e72f91 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java
@@ -127,7 +127,7 @@ class FilterDialog extends DialogWrapper {
               new GridBagConstraints(1, 0, 1, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 0), 0, 0));
 
     JPanel patternsPanel = new JPanel(new GridBagLayout());
-    Border border = IdeBorderFactory.createTitledBorder(IdeBundle.message("group.todo.filter.patterns"), false, true, true);
+    Border border = IdeBorderFactory.createTitledBorder(IdeBundle.message("group.todo.filter.patterns"), false, false, true);
     patternsPanel.setBorder(border);
     myTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable);
diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.form b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.form
index 96be700ca69e..dd44a8e6ff33 100644
--- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.form
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.form
@@ -3,7 +3,7 @@
   <grid id="80cff" binding="myPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="44" y="67" width="749" height="670"/>
+      <xy x="44" y="67" width="939" height="670"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -76,6 +76,8 @@
                           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                         </constraints>
                         <properties>
+                          <boldFont value="false"/>
+                          <smallFont value="true"/>
                           <text value="PSI &amp;Structure"/>
                         </properties>
                       </component>
diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form
index 57d3f175847e..ed2fc5fbe1ac 100644
--- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form
+++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form
@@ -7,9 +7,9 @@
     </constraints>
     <properties/>
     <clientProperties>
-      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+      <BorderFactoryClass class="java.lang.String" value=""/>
     </clientProperties>
-    <border type="none" title=""/>
+    <border type="none"/>
     <children>
       <component id="e9af6" class="javax.swing.JLabel" binding="myTitleLabel">
         <constraints>
diff --git a/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form
index e5fb374a0e32..6c2980376b3c 100644
--- a/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form
+++ b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.ui.OptionalChooserComponent">
   <grid id="27dc6" binding="myContentPane" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="10" left="7" bottom="7" right="7"/>
+    <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="455" height="247"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <scrollpane class="com.intellij.ui.components.JBScrollPane" id="4c4f5">
+      <scrollpane id="4c4f5" class="com.intellij.ui.components.JBScrollPane">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
diff --git a/platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form b/platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form
index dc9f5a6dcf83..fd2d4dfbdc22 100644
--- a/platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form
+++ b/platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.ui.PathsChooserComponent">
   <grid id="27dc6" binding="myContentPane" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="10" left="7" bottom="7" right="7"/>
+    <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="591" height="247"/>
     </constraints>
@@ -13,7 +13,7 @@
           <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <scrollpane class="com.intellij.ui.components.JBScrollPane" id="837a">
+      <scrollpane id="837a" class="com.intellij.ui.components.JBScrollPane">
         <constraints>
           <grid row="0" column="0" row-span="3" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
diff --git a/platform/platform-impl/src/com/intellij/ui/TabbedPaneWrapper.java b/platform/platform-impl/src/com/intellij/ui/TabbedPaneWrapper.java
index fad4918474e4..3e9169065891 100644
--- a/platform/platform-impl/src/com/intellij/ui/TabbedPaneWrapper.java
+++ b/platform/platform-impl/src/com/intellij/ui/TabbedPaneWrapper.java
@@ -28,6 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import javax.swing.border.EmptyBorder;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.awt.event.MouseListener;
@@ -345,6 +346,7 @@ public class TabbedPaneWrapper  {
       super(new BorderLayout());
       myComponent = component;
       add(component, BorderLayout.CENTER);
+      setBorder(new EmptyBorder(5, 8, 5, 5));
     }
 
     /*
diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties
index c13a51c13e4d..b410c81470e3 100644
--- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties
+++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties
@@ -167,7 +167,8 @@ remote.debug.configuration.display.name=Remote
 applet.configuration.url.label=&URL
 applet.configuration.applet.class.border=Applet Class
 applet.configuration.applet.parameters.label=Applet Parameters
-applet.configuration.applet.class.label=Applet &class
+applet.configuration.applet.class.option=&Applet class
+applet.configuration.applet.class.label=Applet &class:
 button.remove=&Remove
 button.add=&Add
 applet.configuration.height.label=               &Height:
@@ -197,7 +198,7 @@ no.tests.found.in.package.error.message=No tests found in the package ''{0}''
 package.does.not.exist.error.message=Package ''{0}'' does not exist
 choose.main.class.dialog.title=Choose Main Class
 choose.applet.class.dialog.title=Choose Applet Class
-junit.configuration.test.runner.parameters.label=Test runner pa&rameters:
+junit.configuration.test.runner.parameters.label=Test runner pa&rams:
 junit.configuration.use.classpath.and.jdk.of.module.label=Use classpath and JDK of m&odule:
 junit.configuration.test.border=Test
 junit.configuration.across.module.dependencies.radio=Across modu&le dependencies
diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties
index e53f78536dac..d939a32248f0 100644
--- a/platform/platform-resources-en/src/messages/VcsBundle.properties
+++ b/platform/platform-resources-en/src/messages/VcsBundle.properties
@@ -115,7 +115,7 @@ dialog.title.version.control.configurations=Version Control Configurations
 message.text.unable.to.save.settings=Unable to save settings. {0}
 message.title.unable.to.save.settings=Unable To Save Settings
 label.configure.vcses.available.vcses=Configure available version controls:
-border.display.dialog.when.commands.invoked=Display options dialog when these commands are invoked:
+border.display.dialog.when.commands.invoked=Display options dialog when these commands are invoked
 border.display.dialog.for.files.creation.deletion=Files Creation/Deletion
 checkbox.show.clear.read.only.status.dialog=Show "&Clear Read-only Status" Dialog
 radio.after.deletion.do.not.remove=Do &not remove
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form
index 23f71847b3cb..e3f298b1c7d9 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form
@@ -13,86 +13,16 @@
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <grid id="e714c" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <grid id="aa6eb" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="0" left="0" bottom="0" right="0"/>
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties/>
-            <border type="none"/>
-            <children>
-              <component id="2c789" class="javax.swing.JCheckBox" binding="myCbOfferToMoveChanges">
-                <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <text resource-bundle="messages/VcsBundle" key="checkbox.changelist.move.offer"/>
-                </properties>
-              </component>
-              <component id="5f121" class="javax.swing.JCheckBox" binding="myForceNonEmptyComment">
-                <constraints>
-                  <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <text resource-bundle="messages/VcsBundle" key="checkbox.force.non.empty.messages"/>
-                </properties>
-              </component>
-              <component id="9ee4d" class="javax.swing.JCheckBox" binding="myShowReadOnlyStatusDialog">
-                <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <text resource-bundle="messages/VcsBundle" key="checkbox.show.clear.read.only.status.dialog"/>
-                </properties>
-              </component>
-              <grid id="da366" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="0">
-                <constraints>
-                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties/>
-                <border type="none"/>
-                <children>
-                  <component id="d6cff" class="javax.swing.JLabel">
-                    <constraints/>
-                    <properties>
-                      <labelFor value="c8cb8"/>
-                      <text resource-bundle="messages/VcsBundle" key="create.changelist.on.failed.commit"/>
-                    </properties>
-                  </component>
-                  <component id="c8cb8" class="javax.swing.JComboBox" binding="myFailedCommitChangelistCombo" default-binding="true">
-                    <constraints/>
-                    <properties>
-                      <model>
-                        <item value="Yes"/>
-                        <item value="No"/>
-                        <item value="Ask"/>
-                      </model>
-                    </properties>
-                  </component>
-                </children>
-              </grid>
-            </children>
-          </grid>
-        </children>
-      </grid>
       <grid id="4ec1c" binding="myAddConfirmationPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+        </clientProperties>
         <border type="etched" title="When files are created"/>
-<clientProperties>
-  <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
-</clientProperties>
         <children>
           <component id="61373" class="javax.swing.JRadioButton" binding="myShowDialogOnAddingFile">
             <constraints>
@@ -127,10 +57,10 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+        </clientProperties>
         <border type="etched" title="When empty changelist becomes inactive"/>
-<clientProperties>
-  <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
-</clientProperties>
         <children>
           <component id="7b546" class="javax.swing.JRadioButton">
             <constraints>
@@ -165,10 +95,10 @@
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+        </clientProperties>
         <border type="etched" title="When files are deleted"/>
-<clientProperties>
-  <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
-</clientProperties>
         <children>
           <component id="1256b" class="javax.swing.JRadioButton" binding="myShowDialogOnRemovingFile">
             <constraints>
@@ -209,10 +139,10 @@
           </grid>
         </constraints>
         <properties/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+        </clientProperties>
         <border type="etched" title-resource-bundle="messages/VcsBundle" title-key="border.display.dialog.when.commands.invoked"/>
-<clientProperties>
-  <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
-</clientProperties>
         <children/>
       </grid>
       <hspacer id="308c6">
@@ -220,6 +150,66 @@
           <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
+      <grid id="aa6eb" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="2c789" class="javax.swing.JCheckBox" binding="myCbOfferToMoveChanges">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="messages/VcsBundle" key="checkbox.changelist.move.offer"/>
+            </properties>
+          </component>
+          <component id="5f121" class="javax.swing.JCheckBox" binding="myForceNonEmptyComment">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="messages/VcsBundle" key="checkbox.force.non.empty.messages"/>
+            </properties>
+          </component>
+          <component id="9ee4d" class="javax.swing.JCheckBox" binding="myShowReadOnlyStatusDialog">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="messages/VcsBundle" key="checkbox.show.clear.read.only.status.dialog"/>
+            </properties>
+          </component>
+          <grid id="da366" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="0">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="d6cff" class="javax.swing.JLabel">
+                <constraints/>
+                <properties>
+                  <labelFor value="c8cb8"/>
+                  <text resource-bundle="messages/VcsBundle" key="create.changelist.on.failed.commit"/>
+                </properties>
+              </component>
+              <component id="c8cb8" class="javax.swing.JComboBox" binding="myFailedCommitChangelistCombo" default-binding="true">
+                <constraints/>
+                <properties>
+                  <model>
+                    <item value="Yes"/>
+                    <item value="No"/>
+                    <item value="Ask"/>
+                  </model>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
     </children>
   </grid>
   <buttonGroups>
diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/AdvancedSettingsUI.form b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/AdvancedSettingsUI.form
index e4a5a13766f9..b1c2f5f0c0ae 100644
--- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/AdvancedSettingsUI.form
+++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/AdvancedSettingsUI.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.intellij.plugins.intelliLang.AdvancedSettingsUI">
   <grid id="27dc6" binding="myRoot" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
+    <margin top="5" left="8" bottom="5" right="5"/>
     <constraints>
-      <xy x="20" y="20" width="562" height="489"/>
+      <xy x="20" y="20" width="562" height="499"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -14,10 +14,10 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+        </clientProperties>
         <border type="none" title="Annotation Classes"/>
-<clientProperties>
-  <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
-</clientProperties>
         <children>
           <component id="f36cc" class="javax.swing.JLabel">
             <constraints>
@@ -82,10 +82,10 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="none" title="Runtime Pattern Validation"/>
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
         </clientProperties>
+        <border type="none" title="Runtime Pattern Validation"/>
         <children>
           <component id="633b5" class="javax.swing.JRadioButton" binding="myNoInstrumentation">
             <constraints>
@@ -119,10 +119,10 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="none" title="Performance"/>
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
         </clientProperties>
+        <border type="none" title="Performance"/>
         <children>
           <component id="8aa19" class="javax.swing.JRadioButton" binding="myDfaOff">
             <constraints>
diff --git a/plugins/android/src/org/jetbrains/android/run/testing/TestRunParameters.form b/plugins/android/src/org/jetbrains/android/run/testing/TestRunParameters.form
index bb0908fc68fe..25c888f56fc9 100644
--- a/plugins/android/src/org/jetbrains/android/run/testing/TestRunParameters.form
+++ b/plugins/android/src/org/jetbrains/android/run/testing/TestRunParameters.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="10">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="477" height="265"/>
+      <xy x="20" y="20" width="475" height="272"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -76,6 +76,7 @@
         </constraints>
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
+          <labelLocation value="West"/>
           <text resource-bundle="messages/AndroidBundle" key="android.run.configuration.package.label"/>
         </properties>
       </component>
@@ -85,6 +86,8 @@
         </constraints>
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="55" height="16"/>
           <text resource-bundle="messages/AndroidBundle" key="android.run.configuration.class.label"/>
         </properties>
       </component>
@@ -94,6 +97,8 @@
         </constraints>
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="55" height="16"/>
           <text resource-bundle="messages/AndroidBundle" key="android.run.configuration.method.label"/>
         </properties>
       </component>
diff --git a/plugins/devkit/src/run/PluginRunConfigurationEditor.java b/plugins/devkit/src/run/PluginRunConfigurationEditor.java
index bb227b0c9a28..ae1da5511c7d 100644
--- a/plugins/devkit/src/run/PluginRunConfigurationEditor.java
+++ b/plugins/devkit/src/run/PluginRunConfigurationEditor.java
@@ -134,17 +134,26 @@ public class PluginRunConfigurationEditor extends SettingsEditor<PluginRunConfig
     myVMParameters.setText(DevKitBundle.message("vm.parameters"));
     myVMParameters.setComponent(new RawCommandLineEditor());
     myVMParameters.getComponent().setDialogCaption(myVMParameters.getRawText());
+    myVMParameters.setLabelLocation(BorderLayout.WEST);
 
     myProgramParameters.setText(DevKitBundle.message("program.parameters"));
     myProgramParameters.setComponent(new RawCommandLineEditor());
     myProgramParameters.getComponent().setDialogCaption(myProgramParameters.getRawText());
+    myProgramParameters.setLabelLocation(BorderLayout.WEST);
+    myVMParameters.setLabelPreferredSize(new Dimension(myProgramParameters.getLabelPreferredSize().width - 4, myProgramParameters.getLabelPreferredSize().height));
 
-    GridBagConstraints gc = new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 0, 5, 0), 0, 0);
+
+    GridBagConstraints gc = new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 0, 5, 0), 0, 0);
     wholePanel.add(myVMParameters, gc);
     wholePanel.add(myProgramParameters, gc);
     wholePanel.add(myShowLogs, gc);
+    gc.gridwidth = 1;
+    gc.gridy = 3;
+    gc.weightx = 0;
     wholePanel.add(myModuleLabel, gc);
     gc.weighty = 1;
+    gc.gridx = 1;
+    gc.weightx = 1;
     wholePanel.add(myModules, gc);
     return wholePanel;
   }
diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
index c02e4930db18..575c2eceb333 100644
--- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
+++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
@@ -446,7 +446,7 @@ update.locally.modified.revert=Revert Files
 update.locally.modified.title=Locally modified files are detected
 update.options.display.name=Git Update Settings
 update.options.no.commit=No &Commit
-update.options.save.before.update=Clean working tree before update:
+update.options.save.before.update=Clean working tree before update
 update.options.save.keep.tooltip=Leave changes on working tree
 update.options.save.keep=Do &Not Clean
 update.options.save.shelve.tooltip=Use IDEA Shelve (the files will be restored when update finishes)
@@ -459,7 +459,7 @@ update.options.type.merge.tooltip=Use merge update strategy for all git vcs root
 update.options.type.merge=&Merge
 update.options.type.rebase.tooltip=Use rebase update strategy for all git vcs roots
 update.options.type.rebase=&Rebase
-update.options.type=Update Type:
+update.options.type=Update Type
 update.rebase.no.change.cancel=Cancel Update
 update.rebase.no.change.retry=Retry Continue
 update.rebase.no.change.skip=Skip Commit
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
index 206efca85c12..7583cba52f59 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
@@ -1,32 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="git4idea.update.GitUpdateOptionsPanel">
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
+    <margin top="0" left="10" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="489" height="112"/>
+      <xy x="20" y="20" width="472" height="115"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="150f4" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="30" bottom="0" right="60"/>
+      <grid id="150f4" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="none"/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+        </clientProperties>
+        <border type="none" title-resource-bundle="git4idea/i18n/GitBundle" title-key="update.options.type"/>
         <children>
-          <component id="fad0d" 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"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="git4idea/i18n/GitBundle" key="update.options.type"/>
-            </properties>
-          </component>
           <component id="dcccd" class="javax.swing.JRadioButton" binding="myForceMergeRadioButton" default-binding="true">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="git4idea/i18n/GitBundle" key="update.options.type.merge"/>
@@ -35,7 +30,7 @@
           </component>
           <component id="864a1" class="javax.swing.JRadioButton" binding="myForceRebaseRadioButton" default-binding="true">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="git4idea/i18n/GitBundle" key="update.options.type.rebase"/>
@@ -44,7 +39,7 @@
           </component>
           <component id="48ad6" class="javax.swing.JRadioButton" binding="myBranchDefaultRadioButton" default-binding="true">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <selected value="true"/>
@@ -54,25 +49,20 @@
           </component>
         </children>
       </grid>
-      <grid id="fff58" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="30"/>
+      <grid id="fff58" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="100"/>
         <constraints>
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="none"/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+        </clientProperties>
+        <border type="none" title-resource-bundle="git4idea/i18n/GitBundle" title-key="update.options.save.before.update"/>
         <children>
-          <component id="2d59e" 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"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.before.update"/>
-            </properties>
-          </component>
           <component id="98593" class="javax.swing.JRadioButton" binding="myStashRadioButton" default-binding="true">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <selected value="true"/>
@@ -82,7 +72,7 @@
           </component>
           <component id="d7fb3" class="javax.swing.JRadioButton" binding="myShelveRadioButton" default-binding="true">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.shelve"/>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfigurationEditor.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfigurationEditor.form
index c01ba6251cfe..812eb385d51b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfigurationEditor.form
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfigurationEditor.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="6" 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="20" y="20" width="549" height="187"/>
+      <xy x="20" y="20" width="549" height="201"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -18,7 +18,9 @@
       </component>
       <component id="bb2b7" 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"/>
+          <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">
+            <preferred-size width="144" height="-1"/>
+          </grid>
         </constraints>
         <properties>
           <labelFor value="25c6f"/>
@@ -75,7 +77,9 @@
         <constraints>
           <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <labelLocation value="West"/>
+        </properties>
       </component>
     </children>
   </grid>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.form
index f7d1ad3f51cf..b3a3c9d424a4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.form
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.plugins.groovy.runner.GroovyRunConfigurationEditor">
-  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="10" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="8" 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="20" y="20" width="500" height="329"/>
@@ -10,82 +10,41 @@
     <children>
       <vspacer id="41261">
         <constraints>
-          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <component id="5f62b" class="javax.swing.JLabel">
-        <constraints>
-          <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="Script Parameters:"/>
-        </properties>
-      </component>
       <component id="3b65f" class="com.intellij.ui.RawCommandLineEditor" binding="myVMParameters">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
       <component id="3d033" class="com.intellij.ui.RawCommandLineEditor" binding="myParameters" default-binding="true">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
       <grid id="27781" binding="scriptPathPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children/>
       </grid>
-      <grid id="80aef" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="86e25" 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"/>
-            </constraints>
-            <properties>
-              <labelFor value="d1e7d"/>
-              <text value="Module:"/>
-            </properties>
-          </component>
-          <component id="d1e7d" class="javax.swing.JComboBox" binding="myModulesBox">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties/>
-          </component>
-        </children>
-      </grid>
       <grid id="4852" binding="workDirPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
         <constraints>
-          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children/>
       </grid>
-      <component id="c5c05" class="javax.swing.JLabel">
-        <constraints>
-          <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="VM Options:"/>
-        </properties>
-      </component>
       <grid id="ee314" layout-manager="GridLayoutManager" row-count="1" 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>
-          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="5" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -108,10 +67,67 @@
       </grid>
       <component id="39213" class="com.intellij.execution.configuration.EnvironmentVariablesComponent" binding="myEnvVariables">
         <constraints>
-          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <labelLocation value="West"/>
+        </properties>
+      </component>
+      <component id="5f62b" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="144" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value="Script Parameters:"/>
+        </properties>
+      </component>
+      <component id="c5c05" class="javax.swing.JLabel">
+        <constraints>
+          <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">
+            <preferred-size width="144" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value="VM Options:"/>
+        </properties>
+      </component>
+      <component id="86e25" 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">
+            <preferred-size width="144" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <labelFor value="d1e7d"/>
+          <text value="Module:"/>
+        </properties>
+      </component>
+      <component id="d1e7d" class="javax.swing.JComboBox" binding="myModulesBox">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
+      <component id="5194" 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">
+            <preferred-size width="144" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value="Script path:"/>
+        </properties>
+      </component>
+      <component id="ae9d1" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="6" 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="Working directory:"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
index 4779d4d3f952..a46e50b107cf 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
@@ -60,7 +60,7 @@ public class GroovyRunConfigurationEditor extends SettingsEditor<GroovyScriptRun
             return file.getFileType() == GroovyFileType.GROOVY_FILE_TYPE;
           }
         });
-    final FieldPanel scriptFieldPanel = new FieldPanel(scriptPathField, "Script path:", null, scriptBrowseListener, null);
+    final FieldPanel scriptFieldPanel = new FieldPanel(scriptPathField, null, null, scriptBrowseListener, null);
     scriptPathPanel.setLayout(new BorderLayout());
     scriptPathPanel.add(scriptFieldPanel, BorderLayout.CENTER);
 
@@ -69,7 +69,7 @@ public class GroovyRunConfigurationEditor extends SettingsEditor<GroovyScriptRun
         "Working directory",
         "Specify working directory",
         BrowseFilesListener.SINGLE_DIRECTORY_DESCRIPTOR);
-    final FieldPanel workDirFieldPanel = new FieldPanel(workDirField, "Working directory:", null, workDirBrowseFilesListener, null);
+    final FieldPanel workDirFieldPanel = new FieldPanel(workDirField, null, null, workDirBrowseFilesListener, null);
     workDirPanel.setLayout(new BorderLayout());
     workDirPanel.add(workDirFieldPanel, BorderLayout.CENTER);
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
index f5afdaefcacc..5823d9e82ca7 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
@@ -49,7 +49,7 @@ public abstract class SdkHomeConfigurable implements SearchableConfigurable {
   }
 
   public JComponent createComponent() {
-    myPanel = new JPanel(new BorderLayout());
+    myPanel = new JPanel(new BorderLayout(10, 5));
     final JPanel contentPanel = new JPanel(new BorderLayout());
     myPanel.add(contentPanel, BorderLayout.NORTH);
     contentPanel.add(new JLabel(myFrameworkName + " home:"), BorderLayout.WEST);
diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
index 74e48560ca94..1b1617ebcb38 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.junit2.configuration.JUnitConfigurable">
-  <grid id="ece1c" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="5">
+  <grid id="ece1c" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="5">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="28" y="28" width="722" height="746"/>
+      <xy x="28" y="28" width="722" height="548"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -82,31 +82,28 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="5947e" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="5" left="5" bottom="5" right="5"/>
+          <grid id="5947e" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="-1" height="120"/>
-              </grid>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <clientProperties>
-              <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
-            </clientProperties>
-            <border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="junit.configuration.test.border"/>
+            <border type="none"/>
             <children>
               <component id="b109" class="com.intellij.openapi.ui.LabeledComponent" binding="myMethod" custom-create="true">
                 <constraints>
-                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <enabled value="true"/>
+                  <labelLocation value="West"/>
+                  <labelPreferredSize width="62" height="16"/>
                   <text resource-bundle="messages/ExecutionBundle" key="junit.configuration.method.label"/>
                 </properties>
               </component>
               <vspacer id="c588d">
                 <constraints>
-                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
               <grid id="27b84" binding="myPackagePanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -123,6 +120,8 @@
                     </constraints>
                     <properties>
                       <enabled value="true"/>
+                      <labelLocation value="West"/>
+                      <labelPreferredSize width="62" height="16"/>
                       <text resource-bundle="messages/ExecutionBundle" key="junit.configuration.package.label"/>
                       <visible value="true"/>
                     </properties>
@@ -177,41 +176,46 @@
                 </constraints>
                 <properties>
                   <componentClass value="javax.swing.JPanel"/>
-                  <enabled value="true"/>
+                  <labelLocation value="West"/>
+                  <labelPreferredSize width="62" height="16"/>
                   <text value="Pattern"/>
                   <visible value="true"/>
                 </properties>
               </component>
-              <component id="45b8" class="com.intellij.openapi.ui.LabeledComponent" binding="myDir">
-                <constraints>
-                  <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
-                  <text value="Directory"/>
-                </properties>
-              </component>
               <component id="89ba4" class="com.intellij.openapi.ui.LabeledComponent" binding="myClass" custom-create="true">
                 <constraints>
                   <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <labelLocation value="West"/>
+                  <labelPreferredSize width="62" height="16"/>
                   <text resource-bundle="messages/ExecutionBundle" key="junit.configuration.class.label"/>
                 </properties>
               </component>
+              <component id="ac0a6" class="com.intellij.openapi.ui.LabeledComponent" binding="myDir">
+                <constraints>
+                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
+                  <labelLocation value="West"/>
+                  <labelPreferredSize width="62" height="16"/>
+                  <text value="Directory"/>
+                </properties>
+              </component>
             </children>
           </grid>
         </children>
       </grid>
       <vspacer id="72285">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <grid id="92997" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="10">
         <margin top="5" left="0" bottom="5" right="0"/>
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -230,6 +234,7 @@
               <componentClass value="javax.swing.JComboBox"/>
               <enabled value="true"/>
               <labelInsets top="7" left="0" bottom="2" right="0"/>
+              <labelLocation value="West"/>
               <text resource-bundle="messages/ExecutionBundle" key="junit.configuration.use.classpath.and.jdk.of.module.label"/>
             </properties>
           </component>
@@ -270,6 +275,12 @@
           </hspacer>
         </children>
       </grid>
+      <component id="5e32d" class="javax.swing.JSeparator">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="7" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java
index 300578ca7bfc..637544bcb9ba 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java
@@ -62,7 +62,7 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable
 
     GridBagConstraints c = new GridBagConstraints();
     c.fill = GridBagConstraints.HORIZONTAL;
-    c.anchor = GridBagConstraints.NORTHWEST;
+    c.anchor = GridBagConstraints.WEST;
 
     myRunInBackgroundCheckbox = new JCheckBox("Run in background");
     myRunInBackgroundCheckbox.setMnemonic('b');
@@ -76,7 +76,7 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable
     }
     c.gridwidth = 1;
 
-    JLabel labelVMParameters = new JLabel("VM Options");
+    JLabel labelVMParameters = new JLabel("VM Options:");
     labelVMParameters.setDisplayedMnemonic('v');
     labelVMParameters.setLabelFor(myVMParametersEditor = new RawCommandLineEditor());
     myVMParametersEditor.setDialogCaption(labelVMParameters.getText());
@@ -88,9 +88,11 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable
 
     c.gridx = 1;
     c.weightx = 1;
+    c.insets.left = 10;
     panel.add(myVMParametersEditor, c);
+    c.insets.left = 0;
 
-    JLabel jdkLabel = new JLabel("JRE");
+    JLabel jdkLabel = new JLabel("JRE:");
     jdkLabel.setDisplayedMnemonic('j');
     jdkLabel.setLabelFor(myJdkCombo = new JComboBox());
     c.gridx = 0;
@@ -100,7 +102,9 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable
     c.gridx = 1;
     c.weightx = 1;
     c.fill = GridBagConstraints.NONE;
+    c.insets.left = 10;
     panel.add(myJdkCombo, c);
+    c.insets.left = 0;
     c.fill = GridBagConstraints.HORIZONTAL;
 
     JPanel propertiesPanel = new JPanel(new BorderLayout());
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form
index d25d5f8aa8ac..d7e726d7c145 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form
@@ -14,7 +14,8 @@
         </constraints>
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
-          <labelLocation value="North"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="195" height="16"/>
           <text value="Working &amp;directory"/>
         </properties>
       </component>
@@ -29,7 +30,9 @@
         </constraints>
         <properties>
           <componentClass value="javax.swing.JTextField"/>
-          <labelLocation value="North"/>
+          <labelInsets top="0" left="0" bottom="0" right="0"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="195" height="16"/>
           <text value="&amp;Goals (separated with space)"/>
         </properties>
       </component>
@@ -39,7 +42,8 @@
         </constraints>
         <properties>
           <componentClass value="javax.swing.JTextField"/>
-          <labelLocation value="North"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="195" height="16"/>
           <text value="&amp;Profiles (separated with space)"/>
         </properties>
       </component>
diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form
index ec29d32fdeea..4df92a315a3e 100644
--- a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form
@@ -65,8 +65,8 @@
                   </grid>
                 </children>
               </grid>
-              <grid id="b6b2d" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                <margin top="0" left="0" bottom="0" right="0"/>
+              <grid id="b6b2d" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="5" left="8" bottom="5" right="5"/>
                 <constraints>
                   <tabbedpane title="Dictionaries"/>
                 </constraints>
@@ -76,11 +76,11 @@
                   <grid id="b9ce9" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties/>
                     <clientProperties>
-                      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithoutIndent"/>
+                      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithoutIndent"/>
                     </clientProperties>
                     <border type="etched" title-resource-bundle="com/intellij/spellchecker/util/SpellCheckerBundle" title-key="dictionaries.panel.title"/>
                     <children>
@@ -112,7 +112,7 @@
                     </constraints>
                     <properties/>
                     <clientProperties>
-                      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithoutIndent"/>
+                      <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithoutIndent"/>
                     </clientProperties>
                     <border type="etched" title-resource-bundle="com/intellij/spellchecker/util/SpellCheckerBundle" title-key="add.directory.title"/>
                     <children>
diff --git a/plugins/tasks/tasks-api/src/com/intellij/tasks/config/BaseRepositoryEditor.form b/plugins/tasks/tasks-api/src/com/intellij/tasks/config/BaseRepositoryEditor.form
index c15452cabdb4..07c9f16ebc1e 100644
--- a/plugins/tasks/tasks-api/src/com/intellij/tasks/config/BaseRepositoryEditor.form
+++ b/plugins/tasks/tasks-api/src/com/intellij/tasks/config/BaseRepositoryEditor.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="8" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
+      <xy x="20" y="20" width="552" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -91,7 +91,7 @@
       <grid id="20c67" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="5" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
index 858929c0ab98..01045803e59f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
@@ -33,7 +33,7 @@
         </properties>
       </component>
       <grid id="b9bd" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="2" bottom="0" right="0"/>
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
@@ -41,13 +41,15 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
         </clientProperties>
-        <border type="etched" title="Search for tests"/>
+        <border type="none"/>
         <children>
           <component id="3d515" class="com.intellij.openapi.ui.LabeledComponent" binding="methodField">
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <labelLocation value="West"/>
+              <labelPreferredSize width="108" height="16"/>
               <text value="M&amp;ethod"/>
             </properties>
           </component>
@@ -56,6 +58,8 @@
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <labelLocation value="West"/>
+              <labelPreferredSize width="108" height="16"/>
               <text value="&amp;Suite"/>
             </properties>
           </component>
@@ -80,6 +84,8 @@
                   <forms/>
                 </constraints>
                 <properties>
+                  <labelLocation value="West"/>
+                  <labelPreferredSize width="108" height="16"/>
                   <text value="Packa&amp;ge"/>
                 </properties>
               </component>
@@ -117,6 +123,8 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <labelLocation value="West"/>
+              <labelPreferredSize width="108" height="16"/>
               <text value="&amp;Class"/>
             </properties>
           </component>
@@ -125,6 +133,7 @@
               <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <labelLocation value="West"/>
               <text value="&amp;Output directory"/>
             </properties>
           </component>
@@ -133,6 +142,8 @@
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <labelLocation value="West"/>
+              <labelPreferredSize width="108" height="16"/>
               <text value="&amp;Group"/>
             </properties>
           </component>
@@ -160,6 +171,7 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <labelLocation value="West"/>
                   <text value="Use classpath and JDK of m&amp;odule"/>
                 </properties>
               </component>
@@ -201,6 +213,7 @@
                   <forms/>
                 </constraints>
                 <properties>
+                  <labelLocation value="West"/>
                   <text value="&amp;Properties file"/>
                 </properties>
               </component>
@@ -281,6 +294,7 @@
                   <forms/>
                 </constraints>
                 <properties>
+                  <labelLocation value="West"/>
                   <text value="&amp;Listener classes"/>
                 </properties>
               </component>
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form
index b09a461f896a..5d0145f1dc91 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form
@@ -2,7 +2,7 @@
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.intellij.lang.xpath.xslt.run.XsltRunSettingsEditor.Editor">
   <tabbedpane id="fb52f" binding="myComponent">
     <constraints>
-      <xy x="115" y="24" width="576" height="497"/>
+      <xy x="115" y="24" width="580" height="497"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -15,7 +15,7 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="4a3d1" layout-manager="GridLayoutManager" row-count="5" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="2">
+          <grid id="4a3d1" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="2">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -37,7 +37,7 @@
               </component>
               <component id="4756e" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myOutputFile">
                 <constraints>
-                  <grid row="2" column="2" row-span="1" col-span="2" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                  <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties/>
               </component>
@@ -52,7 +52,7 @@
               </hspacer>
               <component id="39d7b" class="javax.swing.JCheckBox" binding="myOpenOutputFile">
                 <constraints>
-                  <grid row="3" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="3" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <text value="&amp;Open file in editor after execution"/>
@@ -77,7 +77,7 @@
                 </properties>
               </component>
               <grid id="2d7da" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                <margin top="0" left="0" bottom="0" right="0"/>
+                <margin top="0" left="4" bottom="0" right="0"/>
                 <constraints>
                   <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                 </constraints>
@@ -104,14 +104,9 @@
                   </component>
                 </children>
               </grid>
-              <hspacer id="ab4f0">
-                <constraints>
-                  <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-              </hspacer>
               <component id="ef135" class="javax.swing.JCheckBox" binding="myOpenInBrowser">
                 <constraints>
-                  <grid row="4" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <text value="Open file in web &amp;browser after execution"/>
@@ -119,7 +114,7 @@
               </component>
             </children>
           </grid>
-          <grid id="46598" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="46598" layout-manager="GridLayoutManager" row-count="2" 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>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -132,25 +127,13 @@
             <children>
               <component id="13095" class="javax.swing.JLabel">
                 <constraints>
-                  <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"/>
+                  <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"/>
                 </constraints>
                 <properties>
                   <labelFor value="39930"/>
                   <text value="&amp;Choose XML input file:"/>
                 </properties>
               </component>
-              <component id="39930" class="com.intellij.ui.ComboboxWithBrowseButton" binding="myXmlInputFile">
-                <constraints>
-                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties/>
-              </component>
-              <component id="a3132" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myXsltFile">
-                <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties/>
-              </component>
               <component id="1a243" 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"/>
@@ -162,6 +145,18 @@
                   <verticalAlignment value="0"/>
                 </properties>
               </component>
+              <component id="a3132" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myXsltFile">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id="39930" class="com.intellij.ui.ComboboxWithBrowseButton" binding="myXmlInputFile">
+                <constraints>
+                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+              </component>
             </children>
           </grid>
           <grid id="30b22" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -202,7 +197,7 @@
           </grid>
         </children>
       </grid>
-      <grid id="764ea" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="764ea" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="5" left="5" bottom="0" right="5"/>
         <constraints>
           <tabbedpane title="Advanced"/>
@@ -219,20 +214,14 @@
               <text value="&amp;VM Arguments:"/>
             </properties>
           </component>
-          <component id="7eae5" class="com.intellij.ui.RawCommandLineEditor" binding="myVmArguments">
-            <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties/>
-          </component>
           <vspacer id="12efc">
             <constraints>
-              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
             </constraints>
           </vspacer>
           <component id="3c82" class="javax.swing.JCheckBox" binding="mySmartErrorHandling">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="&amp;Smart error handling"/>
@@ -241,7 +230,7 @@
           <grid id="a66df" binding="myClasspathAndJDKPanel" layout-manager="GridLayoutManager" row-count="2" 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>
-              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
             <clientProperties>
@@ -281,16 +270,22 @@
           </grid>
           <component id="abb10" class="javax.swing.JLabel">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <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>
               <labelFor value="63c49"/>
               <text value="&amp;Working directory:"/>
             </properties>
           </component>
+          <component id="7eae5" class="com.intellij.ui.RawCommandLineEditor" binding="myVmArguments">
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+          </component>
           <component id="63c49" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myWorkingDirectory">
             <constraints>
-              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
           </component>