diff --git a/java/execution/impl/src/com/intellij/execution/application/JavaApplicationSettingsEditor.java b/java/execution/impl/src/com/intellij/execution/application/JavaApplicationSettingsEditor.java
index d4d6a4fadd0e..17c209eaa125 100644
--- a/java/execution/impl/src/com/intellij/execution/application/JavaApplicationSettingsEditor.java
+++ b/java/execution/impl/src/com/intellij/execution/application/JavaApplicationSettingsEditor.java
@@ -73,12 +73,9 @@ public class JavaApplicationSettingsEditor extends RunConfigurationFragmentedEdi
 
     ShortenCommandLineModeCombo combo =
       new ShortenCommandLineModeCombo(myProject, jrePathEditor, moduleClasspath.component().getComponent());
-    LabeledComponent<ShortenCommandLineModeCombo> component =
-      LabeledComponent.create(combo, ExecutionBundle.message("application.configuration.shorten.command.line.label"));
-    component.setLabelLocation(BorderLayout.WEST);
     fragments.add(new SettingsEditorFragment<>("shorten.command.line",
                                                ExecutionBundle.message("application.configuration.shorten.command.line"),
-                                               group, component,
+                                               group, LabeledComponent.create(combo, ExecutionBundle.message("application.configuration.shorten.command.line.label"), BorderLayout.WEST),
                                                (configuration, c) -> c.getComponent().setItem(configuration.getShortenCommandLine()),
                                                (configuration, c) -> configuration.setShortenCommandLine(c.getComponent().getSelectedItem()),
                                                configuration -> configuration.getShortenCommandLine() != null));
diff --git a/platform/execution-impl/src/com/intellij/execution/ui/CommonTags.java b/platform/execution-impl/src/com/intellij/execution/ui/CommonTags.java
index fe07d82ca3f6..26f6fff3cfef 100644
--- a/platform/execution-impl/src/com/intellij/execution/ui/CommonTags.java
+++ b/platform/execution-impl/src/com/intellij/execution/ui/CommonTags.java
@@ -10,8 +10,8 @@ public class CommonTags {
     return SettingsEditorFragment.createTag("runParallel",
                                             ExecutionBundle.message("run.configuration.allow.running.parallel"),
                                             ExecutionBundle.message("group.operating.system"),
-                             s -> s.isAllowRunningInParallel(),
-                                            (s, aBoolean) -> s.setAllowRunningInParallel(aBoolean)
+                                            s -> s.isAllowRunningInParallel(),
+                                            (s, value) -> s.setAllowRunningInParallel(value)
     );
   }
 }
diff --git a/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java b/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java
index a301e1599554..4d6ba416590d 100644
--- a/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java
+++ b/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java
@@ -50,6 +50,8 @@ public class FragmentedSettingsBuilder<Settings> implements CompositeSettingsBui
       addLine(new JSeparator());
     }
     List<SettingsEditorFragment<Settings, ?>> fragments = new ArrayList<>(myFragments);
+    List<SettingsEditorFragment<Settings, ?>> subGroups = ContainerUtil.filter(fragments, fragment -> !fragment.getChildren().isEmpty());
+    fragments.removeAll(subGroups);
     fragments.sort(Comparator.comparingInt(SettingsEditorFragment::getCommandLinePosition));
     buildBeforeRun(fragments);
     addLine(buildHeader(fragments));
@@ -59,7 +61,6 @@ public class FragmentedSettingsBuilder<Settings> implements CompositeSettingsBui
     addLine(buildCommandLinePanel(fragments));
 
     JPanel tagsPanel = new JPanel(new WrapLayout(FlowLayout.LEADING));
-    tagsPanel.setBorder(JBUI.Borders.empty(5, -5, 5, 0));
     for (SettingsEditorFragment<Settings, ?> fragment : fragments) {
       if (fragment.isTag()) {
         tagsPanel.add(fragment.getComponent());
@@ -69,8 +70,14 @@ public class FragmentedSettingsBuilder<Settings> implements CompositeSettingsBui
       }
     }
     addLine(tagsPanel);
-    myConstraints.weighty = 1;
-    myPanel.add(new JPanel(), myConstraints);
+
+    for (SettingsEditorFragment<Settings, ?> group : subGroups) {
+      addLine(group.getComponent());
+    }
+    if (myMain == null) {
+      myConstraints.weighty = 1;
+      myPanel.add(new JPanel(), myConstraints);
+    }
 
     List<PanelWithAnchor> panels =
       fragments.stream().map(SettingsEditorFragment::component).filter(component -> component instanceof PanelWithAnchor)