diff --git a/.idea/runConfigurations/Designer__JRE_11_.xml b/.idea/runConfigurations/Designer__JRE_11_.xml
index d7b3988a..6fba7b8e 100644
--- a/.idea/runConfigurations/Designer__JRE_11_.xml
+++ b/.idea/runConfigurations/Designer__JRE_11_.xml
@@ -2,11 +2,14 @@
   <configuration default="false" name="Designer (JRE 11)" type="Application" factoryName="Application">
     <option name="ALTERNATIVE_JRE_PATH" value="11" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <envs>
+      <env name="JAVAFX_HOME" value="/usr/lib/jvm/javafx-sdk-11.0.2" />
+    </envs>
     <option name="INCLUDE_PROVIDED_SCOPE" value="true" />
     <option name="MAIN_CLASS_NAME" value="net.sourceforge.pmd.util.fxdesigner.DesignerStarter" />
     <module name="pmd-ui" />
     <option name="PROGRAM_PARAMETERS" value="-v" />
-    <option name="VM_PARAMETERS" value="--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED --illegal-access=warn" />
+    <option name="VM_PARAMETERS" value="--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED --add-opens javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED --illegal-access=warn" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="net.sourceforge.pmd.util.fxdesigner.*" />
diff --git a/.idea/runConfigurations/Designer__JRE_9_.xml b/.idea/runConfigurations/Designer__JRE_9_.xml
index 6c1d8ffa..169ec612 100644
--- a/.idea/runConfigurations/Designer__JRE_9_.xml
+++ b/.idea/runConfigurations/Designer__JRE_9_.xml
@@ -5,7 +5,7 @@
     <option name="MAIN_CLASS_NAME" value="net.sourceforge.pmd.util.fxdesigner.DesignerStarter" />
     <module name="pmd-ui" />
     <option name="PROGRAM_PARAMETERS" value="-v" />
-    <option name="VM_PARAMETERS" value="--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED --add-opens javafx.graphics/javafx.scene.text=ALL-UNNAMED --add-opens javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED --add-opens javafx.graphics/com.sun.javafx.text=ALL-UNNAMED --add-opens javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED --illegal-access=warn" />
+    <option name="VM_PARAMETERS" value="--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED --add-opens javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED --add-opens javafx.graphics/javafx.scene.text=ALL-UNNAMED --add-opens javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED --add-opens javafx.graphics/com.sun.javafx.text=ALL-UNNAMED --add-opens javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED --illegal-access=warn" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="net.sourceforge.pmd.util.fxdesigner.*" />
diff --git a/pmd-ui.iml b/pmd-ui.iml
index 982ceca9..662d56cc 100644
--- a/pmd-ui.iml
+++ b/pmd-ui.iml
@@ -42,6 +42,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.github.oowekyala:fx-live-templates:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.oowekyala:fx-live-templates:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.oowekyala:fx-live-templates:1.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-base:11" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-base:linux:11" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-controls:11" level="project" />
@@ -60,6 +63,7 @@
     <orderEntry type="library" name="Maven: org.fxmisc.flowless:flowless:0.6" level="project" />
     <orderEntry type="library" name="Maven: org.fxmisc.wellbehaved:wellbehavedfx:0.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.controlsfx.custom:controlsfx-mr-jar:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.oowekyala:fx-live-templates:1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
@@ -136,4 +140,4 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.4.0" level="project" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a4cd8e97..36ec1bb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -424,6 +424,11 @@
             <artifactId>controlsfx-mr-jar</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.oowekyala</groupId>
+            <artifactId>fx-live-templates</artifactId>
+            <version>1.0</version>
+        </dependency>
 
         <!-- Those are shaded to avoid duplication -->
         <dependency>
@@ -442,6 +447,7 @@
             <version>2.6</version>
         </dependency>
 
+
         <!-- Icon packs -->
         <dependency>
             <groupId>org.kordamp.ikonli</groupId>
@@ -463,6 +469,7 @@
             <version>${pmd.core.version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-apex</artifactId>
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java
index d0f37ee6..382bd0f4 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java
@@ -19,6 +19,7 @@
 
 import com.sun.javafx.fxml.builder.ProxyBuilder;
 import javafx.application.Application;
+import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -42,7 +43,6 @@ public Designer() {
         initStartTimeMillis = System.currentTimeMillis();
     }
 
-
     @Override
     public void start(Stage stage) throws IOException {
         DesignerParams params = getParameters() == null ? new DesignerParams() : new DesignerParams(getParameters());
@@ -87,7 +87,13 @@ public void start(Stage stage, DesignerRoot owner) throws IOException {
             new SourceEditorController(owner)
         ));
 
-        stage.setOnCloseRequest(e -> mainController.shutdown());
+        stage.setOnCloseRequest(e -> {
+            owner.getService(DesignerRoot.PERSISTENCE_MANAGER).persistSettings(mainController);
+            Platform.exit();
+            // VM sometimes fails to exit for no apparent reason
+            // all our threads are killed so it's not our fault
+            System.exit(0);
+        });
 
         Parent root = loader.load();
         Scene scene = new Scene(root);
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java
index 49928793..281ea3c1 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java
@@ -121,7 +121,7 @@ protected void beforeParentInit() {
         setupAuxclasspathMenuItem.setOnAction(e -> sourceEditorController.showAuxclasspathSetupPopup());
 
         openEventLogMenuItem.setOnAction(e -> {
-            EventLogController wizard = eventLogController.getValue();
+            EventLogController wizard = eventLogController.get();
             Subscription parentToWizSubscription = wizard.errorNodesProperty().values().subscribe(sourceEditorController.currentErrorNodesProperty()::setValue);
             wizard.showPopup(parentToWizSubscription);
         });
@@ -147,12 +147,6 @@ protected void afterChildrenInit() {
     }
 
 
-
-    public void shutdown() {
-        getDesignerRoot().getService(DesignerRoot.PERSISTENCE_MANAGER).persistSettings(this);
-    }
-
-
     private void onFileMenuShowing() {
         openRecentMenu.setDisable(recentFiles.isEmpty());
     }
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/XPathPanelController.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/XPathPanelController.java
index eb990a53..72ce7408 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/XPathPanelController.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/XPathPanelController.java
@@ -6,6 +6,8 @@
 
 
 import static net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil.sanitizeExceptionMessage;
+import static net.sourceforge.pmd.util.fxdesigner.util.reactfx.ReactfxUtil.rewire;
+import static net.sourceforge.pmd.util.fxdesigner.util.reactfx.ReactfxUtil.rewireInit;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -25,6 +27,7 @@
 import org.controlsfx.validation.Validator;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.reactfx.EventStreams;
+import org.reactfx.Subscription;
 import org.reactfx.SuspendableEventStream;
 import org.reactfx.collection.LiveArrayList;
 import org.reactfx.value.Val;
@@ -32,17 +35,18 @@
 
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.rule.XPathRule;
 import net.sourceforge.pmd.lang.rule.xpath.XPathRuleQuery;
 import net.sourceforge.pmd.util.fxdesigner.app.AbstractController;
 import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
 import net.sourceforge.pmd.util.fxdesigner.app.NodeSelectionSource;
 import net.sourceforge.pmd.util.fxdesigner.app.services.LogEntry.Category;
+import net.sourceforge.pmd.util.fxdesigner.model.ObservableRuleBuilder;
 import net.sourceforge.pmd.util.fxdesigner.model.ObservableXPathRuleBuilder;
 import net.sourceforge.pmd.util.fxdesigner.model.XPathEvaluationException;
 import net.sourceforge.pmd.util.fxdesigner.model.XPathEvaluator;
 import net.sourceforge.pmd.util.fxdesigner.popups.ExportXPathWizardController;
 import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
+import net.sourceforge.pmd.util.fxdesigner.util.SoftReferenceCache;
 import net.sourceforge.pmd.util.fxdesigner.util.TextAwareNodeWrapper;
 import net.sourceforge.pmd.util.fxdesigner.util.autocomplete.CompletionResultSource;
 import net.sourceforge.pmd.util.fxdesigner.util.autocomplete.XPathAutocompleteProvider;
@@ -54,7 +58,6 @@
 import net.sourceforge.pmd.util.fxdesigner.util.controls.PropertyTableView;
 import net.sourceforge.pmd.util.fxdesigner.util.controls.ToolbarTitledPane;
 import net.sourceforge.pmd.util.fxdesigner.util.controls.XpathViolationListCell;
-import net.sourceforge.pmd.util.fxdesigner.util.reactfx.ReactfxUtil;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -79,8 +82,11 @@
 
 
 /**
- * XPath panel controller. One such controller is a presenter for an {@link ObservableXPathRuleBuilder},
- * which stores all data about one currently edited rule.
+ * XPath panel controller. This object maintains an {@link ObservableRuleBuilder} which stores information
+ * about the currently edited rule. The properties of that builder are rewired to the export wizard's fields
+ * when it's open. The wizard is just one view on the builder's data, which is supposed to offer the most
+ * customization options. Other views can be implemented in a similar way, for example, PropertyView
+ * implements a view over the properties of the builder.
  *
  * @author Clément Fournier
  * @see ExportXPathWizardController
@@ -91,6 +97,7 @@ public class XPathPanelController extends AbstractController implements NodeSele
     private static final String NO_MATCH_MESSAGE = "No match in text";
     private static final Duration XPATH_REFRESH_DELAY = Duration.ofMillis(100);
     private final ObservableXPathRuleBuilder ruleBuilder = new ObservableXPathRuleBuilder();
+    private final SoftReferenceCache<ExportXPathWizardController> exportWizard;
 
     @FXML
     public ToolbarTitledPane expressionTitledPane;
@@ -116,7 +123,7 @@ public class XPathPanelController extends AbstractController implements NodeSele
 
     public XPathPanelController(DesignerRoot designerRoot) {
         super(designerRoot);
-        getRuleBuilder().setClazz(XPathRule.class);
+        exportWizard = new SoftReferenceCache<>(() -> new ExportXPathWizardController(designerRoot));
     }
 
 
@@ -151,7 +158,10 @@ protected void beforeParentInit() {
 
     @Override
     protected void afterParentInit() {
-        bindToParent();
+        bindBuilderToPanel();
+
+        rewireInit(getRuleBuilder().xpathVersionProperty(), xpathVersionProperty());
+        rewireInit(getRuleBuilder().xpathExpressionProperty(), xpathExpressionProperty());
 
         // init autocompletion only after binding to parent and settings restore
         // otherwise the popup is shown on startup
@@ -161,17 +171,16 @@ protected void afterParentInit() {
 
 
     // Binds the underlying rule parameters to the parent UI, disconnecting it from the wizard if need be
-    private void bindToParent() {
-        ReactfxUtil.rewire(getRuleBuilder().languageProperty(), Val.map(getGlobalState().globalLanguageVersionProperty(),
-                                                                        LanguageVersion::getLanguage));
-
-        ReactfxUtil.rewireInit(getRuleBuilder().xpathVersionProperty(), xpathVersionProperty());
-        ReactfxUtil.rewireInit(getRuleBuilder().xpathExpressionProperty(), xpathExpressionProperty());
+    private void bindBuilderToPanel() {
+        rewire(getRuleBuilder().languageProperty(), Val.map(getGlobalState().globalLanguageVersionProperty(),
+                                                            LanguageVersion::getLanguage));
 
-        ReactfxUtil.rewireInit(getRuleBuilder().rulePropertiesProperty(),
-                               propertyTableView.rulePropertiesProperty(), propertyTableView::setRuleProperties);
+        rewireInit(getRuleBuilder().rulePropertiesProperty(),
+                   propertyTableView.rulePropertiesProperty(),
+                   propertyTableView::setRuleProperties);
     }
 
+
     private void initialiseVersionSelection() {
         ToggleGroup xpathVersionToggleGroup = new ToggleGroup();
 
@@ -293,27 +302,21 @@ private void refreshResults() {
 
 
     public void showExportXPathToRuleWizard() {
-        ExportXPathWizardController wizard
-            = new ExportXPathWizardController(xpathExpressionProperty());
+        ExportXPathWizardController wizard = exportWizard.get();
+        wizard.showYourself(bindToExportWizard(wizard));
+    }
 
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("fxml/xpath-export-wizard.fxml"));
-        loader.setController(wizard);
 
-        final Stage dialog = new Stage();
-        dialog.initOwner(getDesignerRoot().getMainStage());
-        dialog.setOnCloseRequest(e -> wizard.shutdown());
-        dialog.initModality(Modality.WINDOW_MODAL);
+    /**
+     * Binds the properties of the panel to the export wizard.
+     *
+     * @param exportWizard The caller
+     */
+    private Subscription bindToExportWizard(ExportXPathWizardController exportWizard) {
+
+        return exportWizard.bindToRuleBuilder(getRuleBuilder())
+                           .and(this::bindBuilderToPanel);
 
-        Parent root;
-        try {
-            root = loader.load();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        Scene scene = new Scene(root);
-        //stage.setTitle("PMD Rule Designer (v " + PMD.VERSION + ')');
-        dialog.setScene(scene);
-        dialog.show();
     }
 
     public Val<List<Node>> currentResultsProperty() {
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/EventLogger.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/EventLogger.java
index bb007fa4..7af967be 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/EventLogger.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/EventLogger.java
@@ -4,11 +4,11 @@
 
 package net.sourceforge.pmd.util.fxdesigner.app.services;
 
-import static net.sourceforge.pmd.util.fxdesigner.util.reactfx.ReactfxUtil.countNotMatching;
-
 import org.reactfx.collection.LiveList;
 import org.reactfx.value.Val;
 
+import com.github.oowekyala.rxstring.ReactfxExtensions;
+
 /**
  * Logs events. Stores the whole log in case no view was open.
  *
@@ -19,7 +19,8 @@ public interface EventLogger {
 
     /** Number of log entries that were not yet examined by the user. */
     default Val<Integer> numNewLogEntriesProperty() {
-        return countNotMatching(getLog().map(LogEntry::wasExaminedProperty));
+        return LiveList.sizeOf(ReactfxExtensions.flattenVals(getLog().map(LogEntry::wasExaminedProperty))
+                                                .filtered(read -> !read));
     }
 
 
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableRuleBuilder.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableRuleBuilder.java
index 1f61e4ac..22a288e5 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableRuleBuilder.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableRuleBuilder.java
@@ -7,6 +7,8 @@
 import java.util.Optional;
 
 import org.reactfx.collection.LiveArrayList;
+import org.reactfx.collection.LiveList;
+import org.reactfx.value.Val;
 import org.reactfx.value.Var;
 
 import net.sourceforge.pmd.Rule;
@@ -19,9 +21,6 @@
 import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsPersistenceUtil.PersistentProperty;
 import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsPersistenceUtil.PersistentSequence;
 
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 
@@ -38,8 +37,8 @@ public class ObservableRuleBuilder implements SettingsOwner {
     private final Var<Class<?>> clazz = Var.newSimpleVar(null);
 
     // doesn't contain the "xpath" and "version" properties for XPath rules
-    private final ListProperty<PropertyDescriptorSpec> ruleProperties = new SimpleListProperty<>(FXCollections.observableArrayList(PropertyDescriptorSpec.extractor()));
-    private final Var<ObservableList<String>> examples = Var.newSimpleVar(new LiveArrayList<>());
+    private LiveList<PropertyDescriptorSpec> ruleProperties = new LiveArrayList<>();
+    private LiveList<String> examples = new LiveArrayList<>();
 
     private final Var<LanguageVersion> minimumVersion = Var.newSimpleVar(null);
     private final Var<LanguageVersion> maximumVersion = Var.newSimpleVar(null);
@@ -106,17 +105,17 @@ public Var<Class<?>> clazzProperty() {
 
     @PersistentSequence
     public ObservableList<PropertyDescriptorSpec> getRuleProperties() {
-        return ruleProperties.getValue();
+        return ruleProperties;
     }
 
 
     public void setRuleProperties(ObservableList<PropertyDescriptorSpec> ruleProperties) {
-        this.ruleProperties.setValue(ruleProperties);
+        this.ruleProperties.setAll(ruleProperties);
     }
 
 
-    public ListProperty<PropertyDescriptorSpec> rulePropertiesProperty() {
-        return ruleProperties;
+    public Var<ObservableList<PropertyDescriptorSpec>> rulePropertiesProperty() {
+        return Var.fromVal(Val.constant(ruleProperties), this::setRuleProperties);
     }
 
 
@@ -214,13 +213,13 @@ public Var<String> descriptionProperty() {
     }
 
 
-    public Var<ObservableList<String>> getExamples() {
+    public ObservableList<String> getExamples() {
         return examples;
     }
 
 
     public void setExamples(ObservableList<String> examples) {
-        this.examples.setValue(examples);
+        this.examples.setAll(examples);
     }
 
 
@@ -343,8 +342,8 @@ public Optional<Rule> build() throws IllegalArgumentException {
             builder.usesTyperesolution(usesTypeResolution.getValue());
             builder.usesMultifile(usesMultifile.getValue());
 
-            ruleProperties.getValue().stream().map(PropertyDescriptorSpec::build).forEach(builder::defineProperty);
-            examples.getValue().forEach(builder::addExample);
+            ruleProperties.stream().map(PropertyDescriptorSpec::build).forEach(builder::defineProperty);
+            examples.forEach(builder::addExample);
 
             return Optional.of(builder.build());
         } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableXPathRuleBuilder.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableXPathRuleBuilder.java
index ba9bc9bf..cd966473 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableXPathRuleBuilder.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableXPathRuleBuilder.java
@@ -5,7 +5,6 @@
 package net.sourceforge.pmd.util.fxdesigner.model;
 
 import org.reactfx.EventStream;
-import org.reactfx.collection.LiveList;
 import org.reactfx.value.Var;
 
 import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
@@ -64,7 +63,7 @@ public EventStream<?> modificationsTicks() {
         return nameProperty().values()
                              .or(xpathVersion.values())
                              .or(xpathExpression.values())
-                             .or(LiveList.changesOf(rulePropertiesProperty()));
+                             .or(rulePropertiesProperty().changes());
     }
 
     // TODO: Once the xpath expression changes, we'll need to rebuild the rule
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/PropertyDescriptorSpec.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/PropertyDescriptorSpec.java
index ea20d0f8..a33b02de 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/PropertyDescriptorSpec.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/PropertyDescriptorSpec.java
@@ -19,11 +19,6 @@
 import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsOwner;
 import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsPersistenceUtil.PersistentProperty;
 
-import javafx.beans.Observable;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.util.Callback;
-
 
 /**
  * Stores enough data to build a property descriptor, can be displayed within table views.
@@ -192,16 +187,6 @@ public void unbind() {
     }
 
 
-    /** Extractor for observable lists. */
-    public static Callback<PropertyDescriptorSpec, Observable[]> extractor() {
-        return spec -> new Observable[]{spec.nameProperty(), spec.typeIdProperty(), spec.valueProperty()};
-    }
-
-
-    public static ObservableList<PropertyDescriptorSpec> observableList() {
-        return FXCollections.observableArrayList(extractor());
-    }
-
 
     /**
      * Pushes an event every time the rule owning this property needs to be re-evaluated.
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/ExportXPathWizardController.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/ExportXPathWizardController.java
index fad441b6..06bd784e 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/ExportXPathWizardController.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/ExportXPathWizardController.java
@@ -4,147 +4,300 @@
 
 package net.sourceforge.pmd.util.fxdesigner.popups;
 
+import static com.github.oowekyala.rxstring.ItemRenderer.asString;
+import static com.github.oowekyala.rxstring.ItemRenderer.indented;
+import static com.github.oowekyala.rxstring.ItemRenderer.surrounded;
+import static com.github.oowekyala.rxstring.ItemRenderer.wrapped;
+import static net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil.stringConverter;
+import static net.sourceforge.pmd.util.fxdesigner.util.LanguageRegistryUtil.getSupportedLanguageVersions;
+import static net.sourceforge.pmd.util.fxdesigner.util.reactfx.ReactfxUtil.rewireInit;
+
 import java.net.URL;
-import java.util.Map;
 import java.util.ResourceBundle;
-import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.controlsfx.validation.Severity;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.Validator;
+import org.reactfx.Subscription;
+import org.reactfx.value.Var;
+
+import net.sourceforge.pmd.RulePriority;
 import net.sourceforge.pmd.lang.Language;
-import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.properties.PropertyTypeId;
+import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
+import net.sourceforge.pmd.util.fxdesigner.model.ObservableRuleBuilder;
+import net.sourceforge.pmd.util.fxdesigner.model.ObservableXPathRuleBuilder;
+import net.sourceforge.pmd.util.fxdesigner.model.PropertyDescriptorSpec;
+import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 import net.sourceforge.pmd.util.fxdesigner.util.LanguageRegistryUtil;
+import net.sourceforge.pmd.util.fxdesigner.util.StageBuilder;
 import net.sourceforge.pmd.util.fxdesigner.util.codearea.SyntaxHighlightingCodeArea;
 import net.sourceforge.pmd.util.fxdesigner.util.codearea.syntaxhighlighting.XmlSyntaxHighlighter;
+import net.sourceforge.pmd.util.fxdesigner.util.controls.LanguageVersionRangeSlider;
+import net.sourceforge.pmd.util.fxdesigner.util.controls.PropertyTableView;
+import net.sourceforge.pmd.util.fxdesigner.util.controls.RulePrioritySlider;
 
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
+import com.github.oowekyala.rxstring.LiveTemplate;
+import com.github.oowekyala.rxstring.LiveTemplateBuilder;
+import javafx.application.Platform;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.Slider;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
-import javafx.util.StringConverter;
+import javafx.scene.control.TitledPane;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 
 
 /**
+ * Controller for the "Export XPath to rule" dialog. The wizard is split into two parts: a form, and a code area,
+ * which is updated in real time with the values typed in the form.
+ *
+ * <p>This wizard is supposed to offer the most customization options about the user's rules. In terms of state, it's
+ * wired to the XPathPanel's rule builder while it's open. That way the rule metadata can be persisted.
+ *
  * @author Clément Fournier
  * @since 6.0.0
  */
-public class ExportXPathWizardController implements Initializable {
+public final class ExportXPathWizardController implements Initializable {
 
-    private final ObservableValue<String> xpathExpression;
-    Map<ObservableValue<?>, ChangeListener<Object>> registeredListeners = new WeakHashMap<>();
+    // those are not configurable in the form and so need their own property
+    private final Var<String> xpathExpression = Var.newSimpleVar("");
+    private final Var<String> xpathVersion = Var.newSimpleVar(DesignerUtil.defaultXPathVersion());
+    private final Stage myPopupStage;
+    @FXML
+    private Button resetMetadataButton;
+    @FXML
+    private Button copyResultButton;
     @FXML
     private SyntaxHighlightingCodeArea exportResultArea;
     @FXML
-    private TextField descriptionField;
+    private TextArea descriptionArea;
     @FXML
     private TextField messageField;
     @FXML
-    private Slider prioritySlider;
+    private RulePrioritySlider rulePrioritySlider;
     @FXML
     private ChoiceBox<Language> languageChoiceBox;
     @FXML
     private TextField nameField;
+    @FXML
+    private Accordion infoAccordion;
+    @FXML
+    private PropertyTableView propertyTableView;
+    @FXML
+    private LanguageVersionRangeSlider languageVersionRangeSlider;
 
 
-    public ExportXPathWizardController(ObservableValue<String> xpathExpression) {
-        this.xpathExpression = xpathExpression;
+    public ExportXPathWizardController(DesignerRoot root) {
+        this.myPopupStage = createStage(root.getMainStage());
     }
 
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        initialiseLanguageChoiceBox();
 
-        languageChoiceBox.getItems().addAll(LanguageRegistryUtil.getSupportedLanguageVersions()
-                                                                .stream()
-                                                                .map(LanguageVersion::getLanguage)
-                                                                .distinct()
-                                                                .collect(Collectors.toList()));
-
-        languageChoiceBox.setConverter(new StringConverter<Language>() {
-            @Override
-            public String toString(Language object) {
-                return object.getTerseName();
+        Platform.runLater(() -> { // Fixes blurry text in the description text area
+            descriptionArea.setCache(false);
+            ScrollPane sp = (ScrollPane) descriptionArea.getChildrenUnmodifiable().get(0);
+            sp.setCache(false);
+            for (Node n : sp.getChildrenUnmodifiable()) {
+                n.setCache(false);
             }
+        });
+
+        // Expands required info pane
+        Platform.runLater(() -> infoAccordion.setExpandedPane((TitledPane) infoAccordion.getChildrenUnmodifiable().get(0)));
+        Platform.runLater(this::registerValidators);
 
+        exportResultArea.setSyntaxHighlighter(new XmlSyntaxHighlighter());
+        exportResultArea.setEditable(false);
+
+        copyResultButton.setOnAction(e -> {
+            final ClipboardContent content = new ClipboardContent();
+            content.putString(exportResultArea.getText());
+            Clipboard.getSystemClipboard().setContent(content);
+        });
 
-            @Override
-            public Language fromString(String string) {
-                return LanguageRegistry.findLanguageByTerseName(string);
+        resetMetadataButton.setOnAction(e -> {
+            Alert alert = new Alert(AlertType.CONFIRMATION, "Wipe out the rule's metadata?",
+                                    ButtonType.YES, ButtonType.CANCEL);
+            alert.showAndWait();
+
+            exportResultArea.setSyntaxHighlighter(new XmlSyntaxHighlighter());
+            if (alert.getResult() == ButtonType.YES) {
+                nameProperty().setValue("");
+                descriptionProperty().setValue("");
+                messageProperty().setValue("");
+                priorityProperty().setValue(RulePriority.MEDIUM);
             }
         });
 
-        languageChoiceBox.getSelectionModel().select(LanguageRegistry.getDefaultLanguage());
+        languageVersionRangeSlider.currentLanguageProperty().bind(this.languageProperty());
+        Platform.runLater(() -> exportResultArea.moveTo(0));
+    }
 
-        exportResultArea.setSyntaxHighlighter(new XmlSyntaxHighlighter());
+    public Subscription bindToRuleBuilder(ObservableXPathRuleBuilder ruleBuilder) {
+        this.xpathExpressionProperty().setValue(ruleBuilder.xpathExpressionProperty().getValue());
+        this.xpathVersionProperty().setValue(ruleBuilder.xpathVersionProperty().getValue());
 
-        registerListener(nameField.textProperty(), updateResultListener());
-        registerListener(messageField.textProperty(), updateResultListener());
-        registerListener(descriptionField.textProperty(), updateResultListener());
-        registerListener(prioritySlider.valueProperty(), updateResultListener());
-        registerListener(languageChoiceBox.getSelectionModel().selectedItemProperty(), updateResultListener());
-        registerListener(xpathExpression, updateResultListener());
-        updateResultListener().changed(null, null, null);
+        return Subscription.multi(
+            // Rewire the rulebuilder to be updated by the ui, initialise the values of the ui
+            rewireInit(ruleBuilder.nameProperty(), this.nameProperty()),
+            rewireInit(ruleBuilder.descriptionProperty(), this.descriptionProperty()),
+            rewireInit(ruleBuilder.languageProperty(), this.languageProperty()),
+            rewireInit(ruleBuilder.messageProperty(), this.messageProperty()),
+            rewireInit(ruleBuilder.priorityProperty(), this.priorityProperty()),
+            rewireInit(ruleBuilder.rulePropertiesProperty(), this.rulePropertiesProperty()),
+            rewireInit(ruleBuilder.minimumVersionProperty(), this.languageVersionRangeSlider.minVersionProperty()),
+            rewireInit(ruleBuilder.maximumVersionProperty(), this.languageVersionRangeSlider.maxVersionProperty()),
+            // Initialise the live template
+            liveTemplateBuilder().toTemplateSubscription(ruleBuilder, exportResultArea::replaceText)
+        );
     }
 
 
-    public void shutdown() {
-        registeredListeners.entrySet().stream()
-                           .filter(e -> e.getKey() != null)
-                           .forEach(e -> e.getKey().removeListener(e.getValue()));
+    private void initialiseLanguageChoiceBox() {
+        languageChoiceBox.getItems().addAll(getSupportedLanguageVersions().stream()
+                                                                          .map(LanguageVersion::getLanguage)
+                                                                          .distinct()
+                                                                          .collect(Collectors.toList()));
+
+        languageChoiceBox.setConverter(stringConverter(Language::getShortName, LanguageRegistryUtil::findLanguageByShortName));
     }
 
 
-    private <T> void registerListener(ObservableValue<T> value, ChangeListener<Object> listener) {
-        ChangeListener<Object> previous = registeredListeners.put(value, listener);
-        if (previous != null) {
-            value.removeListener(previous);
-        }
+    /** Form validation */
+    private void registerValidators() {
+        ValidationSupport validationSupport = new ValidationSupport();
+
+        Validator<String> noWhitespaceName = Validator.createRegexValidator("Name cannot contain whitespace", "\\S*+", Severity.ERROR);
+        Validator<String> emptyName = Validator.createEmptyValidator("Name required");
 
-        value.addListener(listener);
+        validationSupport.registerValidator(nameField, Validator.combine(noWhitespaceName, emptyName));
+
+        Validator<String> noWhitespaceMessage = Validator.createRegexValidator("Message cannot be whitespace", "(\\s*+\\S.*)?", Severity.ERROR);
+        Validator<String> emptyMessage = Validator.createEmptyValidator("Message required");
+
+        validationSupport.registerValidator(messageField, Validator.combine(noWhitespaceMessage, emptyMessage));
     }
 
 
-    private ChangeListener<Object> updateResultListener() {
-        return (observable, oldValue, newValue) -> exportResultArea.replaceText(getUpToDateRuleElement());
+    private Var<String> nameProperty() {
+        return Var.fromVal(nameField.textProperty(), nameField::setText);
     }
 
 
-    private String getUpToDateRuleElement() {
-        // TODO very inefficient, can we do better?
+    private Var<String> messageProperty() {
+        return Var.fromVal(messageField.textProperty(), messageField::setText);
+    }
 
-        final String template = "<rule name=\"%s\"\n"
-                + "      language=\"%s\"\n"
-                + "      message=\"%s\"\n"
-                + "      class=\"net.sourceforge.pmd.lang.rule.XPathRule\"\n"
-                + "      <!-- externalInfoUrl=\"%s\"--> >\n"
-                + "    <description>\n"
-                + "%s\n"
-                + "    </description>\n"
-                + "    <priority>%d</priority>\n"
-                + "    <properties>\n"
-                + "        <property name=\"xpath\">\n"
-                + "            <value>\n"
-                + "<![CDATA[\n"
-                + "%s\n"
-                + "]]>\n"
-                + "            </value>\n"
-                + "        </property>\n"
-                + "    </properties>\n"
-                + "    <!--<example><![CDATA[]]></example>-->\n"
-                + "</rule>";
 
-        return String.format(template,
-                             nameField.getText(),
-                             languageChoiceBox.getSelectionModel().getSelectedItem().getTerseName(),
-                             messageField.getText(),
-                             "TODO",
-                             descriptionField.getText(), // TODO format
-                             (int) prioritySlider.getValue(),
-                             xpathExpression.getValue()
-        );
+    private Var<String> descriptionProperty() {
+        return Var.fromVal(descriptionArea.textProperty(), descriptionArea::setText);
     }
 
+
+    private Var<RulePriority> priorityProperty() {
+        return rulePrioritySlider.priorityProperty();
+    }
+
+
+    private Var<String> xpathExpressionProperty() {
+        return xpathExpression;
+    }
+
+
+    private Var<String> xpathVersionProperty() {
+        return xpathVersion;
+    }
+
+
+    public Var<Language> languageProperty() {
+        return Var.fromVal(languageChoiceBox.getSelectionModel().selectedItemProperty(), languageChoiceBox.getSelectionModel()::select);
+    }
+
+
+    private Var<ObservableList<PropertyDescriptorSpec>> rulePropertiesProperty() {
+        return Var.fromVal(propertyTableView.rulePropertiesProperty(), propertyTableView::setRuleProperties);
+    }
+
+
+    /** Set the given subscription as close handler and show. */
+    public void showYourself(Subscription parentBinding) {
+        myPopupStage.setOnCloseRequest(e -> parentBinding.unsubscribe());
+        exportResultArea.setSyntaxHighlighter(new XmlSyntaxHighlighter());
+        myPopupStage.show();
+    }
+
+
+    /** Builds the new stage, done in the constructor. */
+    private Stage createStage(Stage mainStage) {
+        return new StageBuilder().withOwner(mainStage)
+                                 .withModality(Modality.WINDOW_MODAL)
+                                 .withStyle(StageStyle.DECORATED)
+                                 .withFxml(DesignerUtil.getFxml("xpath-export-wizard.fxml"), this)
+                                 .withTitle("Export XPath expression to XML rule")
+                                 .newStage();
+    }
+
+    private static String escapeMessageFormatter(String raw) {
+        return raw.replace("\"", "''''");
+    }
+
+
+    /** Gets the template used to initialise the code area. */
+    private static LiveTemplateBuilder<ObservableXPathRuleBuilder> liveTemplateBuilder() {
+        return LiveTemplate.<ObservableXPathRuleBuilder>newBuilder()
+            .withDefaultIndent("      ")
+            .withDefaultEscape(StringEscapeUtils::escapeXml10)
+            .append("<rule name=\"").bind(ObservableRuleBuilder::nameProperty).appendLine("\"")
+            .appendIndent(1).append("language=\"").bind(ObservableRuleBuilder::languageProperty, Language::getTerseName).appendLine("\"")
+            .bind(ObservableRuleBuilder::minimumVersionProperty, indented(2, surrounded("minimumLanguageVersion=\"", "\"\n", asString(LanguageVersion::getVersion))))
+            .bind(ObservableRuleBuilder::maximumVersionProperty, indented(2, surrounded("maximumLanguageVersion=\"", "\"\n", asString(LanguageVersion::getVersion))))
+            .withDefaultEscape(s -> s) // special escape for message
+            .appendIndent(1).append("message=\"").bind(b -> b.messageProperty().map(ExportXPathWizardController::escapeMessageFormatter)).appendLine("\"")
+            .withDefaultEscape(StringEscapeUtils::escapeXml10) // restore escaper
+            .appendIndent(1).append("class=\"").bind(ObservableRuleBuilder::clazzProperty, Class::getCanonicalName).appendLine("\">")
+            .withDefaultIndent("   ")
+            .appendIndent(1).appendLine("<description>")
+            .bind(ObservableRuleBuilder::descriptionProperty, wrapped(55, 2, true, asString())).endLine()
+            .appendIndent(1).appendLine("</description>")
+            .appendIndent(1).append("<priority>").bind(ObservableRuleBuilder::priorityProperty, p -> "" + p.getPriority()).appendLine("</priority>")
+            .appendIndent(1).appendLine("<properties>")
+            .bindTemplatedSeq(
+                ObservableRuleBuilder::getRuleProperties,
+                prop -> prop.appendIndent(2)
+                            .append("<property name=\"").bind(PropertyDescriptorSpec::nameProperty)
+                            .append("\" type=\"").bind(PropertyDescriptorSpec::typeIdProperty, PropertyTypeId::getStringId)
+                            .append("\" value=\"").bind(PropertyDescriptorSpec::valueProperty)
+                            .appendLine("\"/>")
+            )
+            .appendIndent(2).append("<property name=\"version\" value=\"").bind(ObservableXPathRuleBuilder::xpathVersionProperty).appendLine("\"/>")
+            .appendIndent(2).appendLine("<property name=\"xpath\">")
+            .appendIndent(3).appendLine("<value>")
+            .appendLine("<![CDATA[")
+            .bind(ObservableXPathRuleBuilder::xpathExpressionProperty).endLine()
+            .appendLine("]]>")
+            .appendIndent(3).appendLine("</value>")
+            .appendIndent(2).appendLine("</property>")
+            .appendIndent(1).appendLine("</properties>")
+            .appendLine("</rule>");
+    }
 }
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/DesignerUtil.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/DesignerUtil.java
index 7037fec6..4c174826 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/DesignerUtil.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/DesignerUtil.java
@@ -264,4 +264,5 @@ public static Optional<Class<?>> getResolvedType(Node node) {
             return Optional.empty();
         }
     }
+
 }
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/LanguageRegistryUtil.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/LanguageRegistryUtil.java
index 9319e609..c0fe7338 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/LanguageRegistryUtil.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/LanguageRegistryUtil.java
@@ -71,4 +71,13 @@ public static synchronized List<LanguageVersion> getSupportedLanguageVersions()
         }
         return supportedLanguageVersions;
     }
+
+    public static Language findLanguageByShortName(String shortName) {
+        return getSupportedLanguageVersions().stream()
+                                             .map(LanguageVersion::getLanguage)
+                                             .distinct()
+                                             .filter(it -> it.getShortName().equals(shortName))
+                                             .findFirst()
+                                             .get();
+    }
 }
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/SoftReferenceCache.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/SoftReferenceCache.java
index 747c6082..b179aae9 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/SoftReferenceCache.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/SoftReferenceCache.java
@@ -5,41 +5,55 @@
 package net.sourceforge.pmd.util.fxdesigner.util;
 
 import java.lang.ref.SoftReference;
-import java.util.function.Supplier;
 
 
 /**
+ * Caches a value with a soft reference.
+ *
  * @author Clément Fournier
- * @since 7.0.0
+ * @since 6.1.0
  */
 public class SoftReferenceCache<T> {
 
-    private final Supplier<T> mySupplier;
-    private SoftReference<T> myRef;
+    private final UnsafeSupplier<T> valueSupplier;
+    private SoftReference<T> ref;
 
 
-    public SoftReferenceCache(Supplier<T> supplier) {
-        this.mySupplier = supplier;
+    public SoftReferenceCache(UnsafeSupplier<T> supplier) {
+        this.valueSupplier = supplier;
     }
 
-
     public boolean hasValue() {
-        return myRef != null && myRef.get() != null;
+        return ref != null && ref.get() != null;
     }
 
-    public T getValue() {
-        if (myRef == null || myRef.get() == null) {
-            T val = mySupplier.get();
-            if (val == null) {
-                throw new IllegalStateException();
+    /**
+     * Gets the value of this cache. Uses the supplier function
+     * in cache of cache miss.
+     *
+     * @return The value
+     */
+    public T get() {
+        if (ref == null || ref.get() == null) {
+            try {
+                ref = new SoftReference<>(valueSupplier.get());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
-
-            myRef = new SoftReference<>(val);
-            return val;
         }
 
-        return myRef.get();
+        return ref.get();
     }
 
 
+    /**
+     * Supplier which can throw exceptions.
+     *
+     * @param <T> Type of value
+     */
+    @FunctionalInterface
+    public interface UnsafeSupplier<T> {
+        T get() throws Exception;
+    }
+
 }
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/StageBuilder.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/StageBuilder.java
new file mode 100644
index 00000000..89db0d1b
--- /dev/null
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/StageBuilder.java
@@ -0,0 +1,107 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.util.fxdesigner.util;
+
+import static net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil.controllerFactoryKnowing;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Objects;
+
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
+import javafx.stage.Window;
+
+/**
+ * @author Clément Fournier
+ */
+public final class StageBuilder {
+
+
+    private String title;
+    private Modality modality;
+    private Window owner;
+    private StageStyle stageStyle;
+    private Scene scene;
+    private Object userData;
+
+    public StageBuilder withTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public StageBuilder withModality(Modality modality) {
+        this.modality = modality;
+        return this;
+    }
+
+    public StageBuilder withStyle(StageStyle stageStyle) {
+        this.stageStyle = stageStyle;
+        return this;
+    }
+
+    public StageBuilder withOwner(Window owner) {
+        this.owner = owner;
+        return this;
+    }
+
+    public StageBuilder withScene(Scene scene) {
+        this.scene = scene;
+        return this;
+    }
+
+    public StageBuilder withSceneRoot(Parent parent) {
+        return withScene(new Scene(parent));
+    }
+
+    public StageBuilder withFxml(URL fxmlUrl, Object... controllers) {
+        FXMLLoader loader = new FXMLLoader(fxmlUrl);
+        loader.setControllerFactory(controllerFactoryKnowing(controllers));
+        Parent parent;
+        try {
+            parent = loader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+        return withSceneRoot(parent);
+    }
+
+    public StageBuilder withUserData(Object userData) {
+        this.userData = userData;
+        return this;
+    }
+
+    public Stage configure(Stage stage) {
+
+        if (owner != null) {
+            stage.initOwner(owner);
+        }
+        if (modality != null) {
+            stage.initModality(modality);
+        }
+        if (stageStyle != null) {
+            stage.initStyle(stageStyle);
+        }
+
+        Objects.requireNonNull(title, "Untitled stage!");
+        Objects.requireNonNull(scene, "No scene for stage!");
+
+        stage.setTitle(title);
+        stage.setScene(scene);
+        stage.setUserData(userData);
+        return stage;
+    }
+
+    public Stage newStage() {
+        return configure(new Stage());
+    }
+
+
+}
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/SyntaxHighlightingCodeArea.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/SyntaxHighlightingCodeArea.java
index acf34e2f..d4f8727d 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/SyntaxHighlightingCodeArea.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/SyntaxHighlightingCodeArea.java
@@ -129,7 +129,10 @@ private EventStream<?> defaultHighlightingTicks() {
 
     private Subscription subscribeSyntaxHighlighting(EventStream<?> ticks, SyntaxHighlighter highlighter) {
         // captured in the closure, shutdown when unsubscribing
-        final ExecutorService executorService = Executors.newSingleThreadExecutor();
+        // captured in the closure, shutdown when unsubscribing
+        final ExecutorService executorService = Executors.newSingleThreadExecutor(
+            r -> new Thread(r, "Code-area-" + this.hashCode() + "-"
+                + highlighter.getLanguageTerseName() + "-highlighter"));
         return ticks.successionEnds(TEXT_CHANGE_DELAY)
                     .supplyTask(() -> computeHighlightingAsync(executorService, highlighter, this.getText()))
                     .awaitLatest(ticks)
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/LanguageVersionRangeSlider.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/LanguageVersionRangeSlider.java
new file mode 100644
index 00000000..b713937e
--- /dev/null
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/LanguageVersionRangeSlider.java
@@ -0,0 +1,118 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.util.fxdesigner.util.controls;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.controlsfx.control.RangeSlider;
+import org.reactfx.value.Var;
+
+import net.sourceforge.pmd.lang.Language;
+import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
+
+import javafx.util.StringConverter;
+
+
+/**
+ * @author Clément Fournier
+ */
+public class LanguageVersionRangeSlider extends RangeSlider {
+
+
+    private static final int NO_MIN = -1;
+    private static final String NO_MIN_STR = "No minimum";
+    private static final String NO_MAX_STR = "No maximum";
+    private final Var<Language> currentLanguage = Var.newSimpleVar(null);
+    private List<LanguageVersion> curVersions = new ArrayList<>();
+
+
+    public LanguageVersionRangeSlider() {
+
+        setMin(NO_MIN);
+        setBlockIncrement(1);
+        setMajorTickUnit(1);
+        setMinorTickCount(0);
+        setSnapToTicks(true);
+
+        currentLanguage.values().distinct().subscribe(this::initLanguage);
+
+        StringConverter<Number> converter = DesignerUtil.stringConverter(
+            num -> {
+                int n = num.intValue();
+                if (n < 0) {
+                    return NO_MIN_STR;
+                } else if (n >= curVersions.size()) {
+                    return NO_MAX_STR;
+                } else {
+                    return curVersions.get(n).getShortName();
+                }
+            },
+            ver -> {
+                switch (ver) {
+                case NO_MIN_STR:
+                    return -1;
+                case NO_MAX_STR:
+                    return curVersions.size();
+                default:
+                    LanguageVersion withName = curVersions.stream().filter(lv -> lv.getShortName().equals(ver)).findFirst().get();
+                    return curVersions.indexOf(withName);
+                }
+            }
+        );
+
+        setLabelFormatter(converter);
+
+
+    }
+
+
+    private void initLanguage(Language language) {
+
+        if (language == null) {
+            curVersions = Collections.emptyList();
+            setDisable(true);
+            return;
+        }
+
+        // for some reason Collections.sort doesn't work
+        curVersions = language.getVersions().stream().sorted(LanguageVersion::compareTo).collect(Collectors.toList());
+
+        setDisable(curVersions.size() < 2);
+
+        setMax(curVersions.size());
+    }
+
+
+    private LanguageVersion fromIndex(int idx) {
+        return idx < 0 || idx >= curVersions.size() ? null : curVersions.get(idx);
+    }
+
+
+    public Var<LanguageVersion> minVersionProperty() {
+        return Var.mapBidirectional(
+            lowValueProperty(),
+            num -> fromIndex(num.intValue()),
+            ver -> ver == null ? -1 : curVersions.indexOf(ver)
+        );
+    }
+
+
+    public Var<LanguageVersion> maxVersionProperty() {
+        return Var.mapBidirectional(
+            highValueProperty(),
+            num -> fromIndex(num.intValue()),
+            ver -> ver == null ? curVersions.size() : curVersions.indexOf(ver)
+        );
+    }
+
+
+    public Var<Language> currentLanguageProperty() {
+        return currentLanguage;
+    }
+}
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PropertyTableView.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PropertyTableView.java
index cb2c69ed..ed357e54 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PropertyTableView.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PropertyTableView.java
@@ -4,7 +4,6 @@
 
 package net.sourceforge.pmd.util.fxdesigner.util.controls;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.function.Consumer;
 
@@ -15,14 +14,12 @@
 import net.sourceforge.pmd.util.fxdesigner.popups.EditPropertyDialogController;
 import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 import net.sourceforge.pmd.util.fxdesigner.util.SoftReferenceCache;
+import net.sourceforge.pmd.util.fxdesigner.util.StageBuilder;
 
 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
@@ -44,8 +41,8 @@
  * Controls a table view used to inspect and edit the properties of
  * the rule being built. This component is made to be reused in several
  * views.
- * <p>
- * TODO: would be great to make it directly editable without compromising content validation
+ *
+ * <p>TODO: would be great to make it directly editable without compromising content validation
  *
  * @author Clément Fournier
  * @since 6.0.0
@@ -147,7 +144,7 @@ public void onAddPropertyClicked(String name) {
      * @param edited The edited property descriptor
      */
     private void popEditPropertyDialog(PropertyDescriptorSpec edited) {
-        Stage dialog = editPropertyDialogCache.getValue();
+        Stage dialog = editPropertyDialogCache.get();
         EditPropertyDialogController wizard = (EditPropertyDialogController) dialog.getUserData();
         Platform.runLater(() -> wizard.bindToDescriptor(edited, getRuleProperties()));
         dialog.setOnHiding(e -> {
@@ -160,27 +157,13 @@ private void popEditPropertyDialog(PropertyDescriptorSpec edited) {
 
     private Stage createEditPropertyDialog() {
         EditPropertyDialogController wizard = new EditPropertyDialogController();
-
-        FXMLLoader loader = new FXMLLoader(DesignerUtil.getFxml("edit-property-dialog.fxml"));
-        loader.setController(wizard);
-
-        final Stage dialog = new Stage();
-        dialog.initOwner(this.getScene().getWindow());
-        dialog.initModality(Modality.WINDOW_MODAL);
-        dialog.initStyle(StageStyle.UNDECORATED);
-
-        Parent root;
-        try {
-            root = loader.load();
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-
-        Scene scene = new Scene(root);
-        dialog.setTitle("Edit property");
-        dialog.setScene(scene);
-        dialog.setUserData(wizard);
-        return dialog;
+        return new StageBuilder().withFxml(DesignerUtil.getFxml("edit-property-dialog.fxml"), wizard)
+            .withTitle("Edit property")
+            .withModality(Modality.WINDOW_MODAL)
+            .withStyle(StageStyle.UNDECORATED)
+            .withUserData(wizard)
+            .withOwner(this.getScene().getWindow())
+            .newStage();
     }
 
 
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/RulePrioritySlider.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/RulePrioritySlider.java
new file mode 100644
index 00000000..18f1ddae
--- /dev/null
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/RulePrioritySlider.java
@@ -0,0 +1,59 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.util.fxdesigner.util.controls;
+
+import static net.sourceforge.pmd.RulePriority.HIGH;
+import static net.sourceforge.pmd.RulePriority.LOW;
+import static net.sourceforge.pmd.RulePriority.MEDIUM;
+
+import org.reactfx.value.Var;
+
+import net.sourceforge.pmd.RulePriority;
+import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
+
+import javafx.scene.control.Slider;
+
+
+/**
+ * @author Clément Fournier
+ */
+public class RulePrioritySlider extends Slider {
+
+
+    public RulePrioritySlider() {
+
+        setMin(HIGH.getPriority());
+        setMax(LOW.getPriority());
+        setValue(MEDIUM.getPriority());
+        setMajorTickUnit(1);
+        setBlockIncrement(1);
+        setMinorTickCount(0);
+        setSnapToTicks(true);
+
+        setLabelFormatter(DesignerUtil.stringConverter(
+            d -> {
+                RulePriority rp = RulePriority.valueOf(invert(d.intValue()));
+                return rp != LOW && rp != HIGH && rp != MEDIUM ? "" : rp.getName();
+            },
+            s -> {
+                throw new IllegalStateException("Shouldn't be called");
+            }
+        ));
+    }
+
+    // lowest priority has highest number, so we revert
+    // the indices to get the slider in the right order
+    private int invert(int num) {
+        return LOW.getPriority() + HIGH.getPriority() - num;
+    }
+
+
+    public Var<RulePriority> priorityProperty() {
+        return Var.doubleVar(valueProperty()).mapBidirectional(
+            d -> RulePriority.valueOf(invert(d.intValue())),
+            p -> Double.valueOf(invert(p.getPriority()))
+        );
+    }
+}
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/reactfx/ReactfxUtil.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/reactfx/ReactfxUtil.java
index 76e482b1..9e7a371e 100644
--- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/reactfx/ReactfxUtil.java
+++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/reactfx/ReactfxUtil.java
@@ -7,19 +7,14 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
 import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Predicate;
 
 import org.reactfx.EventSource;
 import org.reactfx.EventStream;
-import org.reactfx.EventStreams;
 import org.reactfx.Subscription;
-import org.reactfx.collection.LiveList;
 import org.reactfx.value.Val;
 import org.reactfx.value.ValBase;
 import org.reactfx.value.Var;
@@ -27,7 +22,6 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.Property;
 import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableList;
 
 /**
  * Extensions to ReactFX Val and EventStreams. Some can be deemed as too
@@ -75,8 +69,8 @@ public static Val<Boolean> vetoableYes(Val<Boolean> base, Duration vetoPeriod) {
     }
 
     /** Like the other overload, using the setter of the ui property. */
-    public static <T> void rewireInit(Property<T> underlying, Property<T> ui) {
-        rewireInit(underlying, ui, ui::setValue);
+    public static <T> Subscription rewireInit(Property<T> underlying, Property<T> ui) {
+        return rewireInit(underlying, ui, ui::setValue);
     }
 
     /**
@@ -88,49 +82,23 @@ public static <T> void rewireInit(Property<T> underlying, Property<T> ui) {
      * @param setter     Setter to initialise the UI value
      * @param <T>        Type of values
      */
-    public static <T> void rewireInit(Property<T> underlying, ObservableValue<? extends T> ui, Consumer<? super T> setter) {
+    public static <T> Subscription rewireInit(Property<T> underlying, ObservableValue<? extends T> ui,
+                                              Consumer<? super T> setter) {
         setter.accept(underlying.getValue());
-        rewire(underlying, ui);
+        return rewire(underlying, ui);
     }
 
     /** Like rewireInit, with no initialisation. */
-    public static <T> void rewire(Property<T> underlying, ObservableValue<? extends T> source) {
+    public static <T> Subscription rewire(Property<T> underlying, ObservableValue<? extends T> source) {
         underlying.unbind();
         underlying.bind(source); // Bindings are garbage collected after the popup dies
+        return underlying::unbind;
     }
 
     public static Var<Boolean> booleanVar(BooleanProperty p) {
         return Var.mapBidirectional(p, Boolean::booleanValue, Function.identity());
     }
 
-    // Creating a real function Val<LiveList<T>> => LiveList<T> or LiveList<Val<T>> => LiveList<T> would
-    // allow implementing LiveList.flatMap, which is a long-standing feature request in ReactFX
-    // These utilities are very inefficient, but sufficient for our use case...
-    public static <T> Val<LiveList<T>> flatMapChanges(ObservableList<? extends ObservableValue<T>> listOfObservables) {
-
-        // every time an element changes an invalidation stream
-        EventStream<?> invalidations =
-            LiveList.map(listOfObservables, EventStreams::valuesOf)
-                    .reduce(EventStreams::merge)
-                    .values()
-                    .filter(Objects::nonNull)
-                    .flatMap(Function.identity());
-
-        return Val.create(() -> LiveList.map(listOfObservables, ObservableValue::getValue), invalidations);
-    }
-
-    public static <T, U> Val<U> reduceWElts(ObservableList<? extends ObservableValue<T>> list, U zero, BiFunction<U, T, U> mapper) {
-        return flatMapChanges(list).map(l -> l.stream().reduce(zero, mapper, (u, v) -> v));
-    }
-
-    public static <T> Val<Integer> countMatching(ObservableList<? extends ObservableValue<T>> list, Predicate<? super T> predicate) {
-        return reduceWElts(list, 0, (cur, t) -> predicate.test(t) ? cur + 1 : cur);
-    }
-
-    public static Val<Integer> countNotMatching(ObservableList<? extends ObservableValue<Boolean>> list) {
-        return countMatching(list, b -> !b);
-    }
-
     /**
      * Like reduce if possible, but can be used if the events to reduce are emitted in extremely close
      * succession, so close that some unrelated events may be mixed up. This reduces each new event
diff --git a/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/xpath-export-wizard.fxml b/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/xpath-export-wizard.fxml
index bc34397b..00919267 100644
--- a/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/xpath-export-wizard.fxml
+++ b/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/xpath-export-wizard.fxml
@@ -1,72 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import net.sourceforge.pmd.util.fxdesigner.util.codearea.*?>
+<?import org.kordamp.ikonli.javafx.FontIcon?>
 <?import net.sourceforge.pmd.util.fxdesigner.util.codearea.SyntaxHighlightingCodeArea?>
+<?import net.sourceforge.pmd.util.fxdesigner.util.controls.LanguageVersionRangeSlider?>
+<?import net.sourceforge.pmd.util.fxdesigner.util.controls.PropertyTableView?>
+<?import net.sourceforge.pmd.util.fxdesigner.util.controls.RulePrioritySlider?>
+<?import net.sourceforge.pmd.util.fxdesigner.util.controls.ToolbarTitledPane?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Accordion?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Slider?>
+<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.TitledPane?>
+<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-
-<AnchorPane prefHeight="400.0" prefWidth="600.0" stylesheets="@../css/designer.css" xmlns="http://javafx.com/javafx/8"
-            xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane prefHeight="444.0"
+            prefWidth="819.0"
+            stylesheets="@../css/designer.css"
+            xmlns="http://javafx.com/javafx/8.0.172-ea"
+            xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="net.sourceforge.pmd.util.fxdesigner.popups.ExportXPathWizardController">
     <children>
-        <TitledPane animated="false" collapsible="false" layoutX="155.0" layoutY="107.0" text="Export XPath to rule"
-                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
-                    AnchorPane.topAnchor="0.0">
-            <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                    <children>
-                        <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" AnchorPane.bottomAnchor="0.0"
-                              AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                            <children>
-                                <Pane prefHeight="67.0" prefWidth="578.0"/>
-                                <GridPane hgap="5.0" vgap="10.0">
-                                    <columnConstraints>
-                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                                    </columnConstraints>
-                                    <rowConstraints>
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                                    </rowConstraints>
+        <SplitPane dividerPositions="0.35006119951040393"
+                   layoutY="-1.0"
+                   prefHeight="200.0"
+                   prefWidth="200.0"
+                   AnchorPane.bottomAnchor="0.0"
+                   AnchorPane.leftAnchor="0.0"
+                   AnchorPane.rightAnchor="0.0"
+                   AnchorPane.topAnchor="0.0">
+            <items>
+                <Accordion fx:id="infoAccordion" prefWidth="200.0">
+                    <panes>
+                        <TitledPane text="Required information" animated="false">
+                            <content>
+                                <AnchorPane>
+                                    <children>
+                                        <GridPane hgap="5.0"
+                                                  vgap="5.0"
+                                                  AnchorPane.bottomAnchor="0.0"
+                                                  AnchorPane.leftAnchor="0.0"
+                                                  AnchorPane.rightAnchor="0.0"
+                                                  AnchorPane.topAnchor="0.0">
+                                            <columnConstraints>
+                                                <ColumnConstraints hgrow="NEVER"
+                                                                   maxWidth="-Infinity"
+                                                                   minWidth="-Infinity"
+                                                                   prefWidth="80.0" />
+                                                <ColumnConstraints hgrow="ALWAYS" minWidth="0.0" />
+                                            </columnConstraints>
+                                            <rowConstraints>
+                                                <RowConstraints maxHeight="41.0" minHeight="10.0" prefHeight="36.0" vgrow="SOMETIMES" />
+                                                <RowConstraints maxHeight="58.0" minHeight="10.0" prefHeight="42.0" vgrow="SOMETIMES" />
+                                                <RowConstraints maxHeight="47.0" minHeight="10.0" prefHeight="39.0" vgrow="SOMETIMES" />
+                                                <RowConstraints maxHeight="67.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
+                                                <RowConstraints maxHeight="48.0" minHeight="0.0" prefHeight="24.0" vgrow="SOMETIMES" />
+                                                <RowConstraints maxHeight="103.0" minHeight="10.0" prefHeight="103.0" vgrow="SOMETIMES" />
+                                            </rowConstraints>
+                                            <children>
+                                                <TextField fx:id="nameField" promptText="Rule name..." GridPane.columnIndex="1">
+                                                </TextField>
+                                                <Label text="Name">
+                                                    <tooltip>
+                                                        <Tooltip text="The name of the rule" />
+                                                    </tooltip>
+                                                </Label>
+                                                <Label text="Language" GridPane.rowIndex="1">
+                                                    <tooltip>
+                                                        <Tooltip text="The language to which the rule applies" />
+                                                    </tooltip>
+                                                </Label>
+                                                <ChoiceBox fx:id="languageChoiceBox"
+                                                           prefHeight="28.0"
+                                                           prefWidth="181.0"
+                                                           GridPane.columnIndex="1"
+                                                           GridPane.rowIndex="1" />
+                                                <Label text="Message" GridPane.rowIndex="2">
+                                                    <tooltip>
+                                                        <Tooltip text="Violation message added to the report" />
+                                                    </tooltip>
+                                                </Label>
+                                                <Label text="Priority" GridPane.rowIndex="3">
+                                                    <tooltip>
+                                                        <Tooltip text="Determines the severity of the violation. 5 is an informational warning, 1 is critical." />
+                                                    </tooltip>
+                                                </Label>
+                                                <TextField fx:id="messageField"
+                                                           promptText="Violation message..."
+                                                           GridPane.columnIndex="1"
+                                                           GridPane.rowIndex="2" />
+                                                <RulePrioritySlider fx:id="rulePrioritySlider"
+                                                                    showTickMarks="true"
+                                                                    showTickLabels="true"
+                                                                    GridPane.columnIndex="1"
+                                                                    GridPane.rowIndex="3" />
+                                                <Label text="Description" GridPane.rowIndex="4" />
+                                                <TextArea fx:id="descriptionArea"
+                                                          prefHeight="52.0"
+                                                          prefWidth="199.0"
+                                                          promptText="Enter a description..."
+                                                          wrapText="true"
+                                                          GridPane.columnSpan="2"
+                                                          GridPane.rowIndex="5" />
+                                            </children>
+                                        </GridPane>
+                                    </children>
+                                </AnchorPane>
+                            </content>
+                        </TitledPane>
+                        <TitledPane expanded="false" text="Language version" animated="false">
+                            <content>
+                                <AnchorPane>
+
+                                    <LanguageVersionRangeSlider fx:id="languageVersionRangeSlider"
+                                                                orientation="VERTICAL"
+                                                                showTickLabels="true"
+                                                                showTickMarks="true"
+                                                                AnchorPane.bottomAnchor="5.0"
+                                                                AnchorPane.leftAnchor="10"
+                                                                AnchorPane.topAnchor="5.0" />
+
+                                </AnchorPane>
+                            </content>
+                        </TitledPane>
+                        <TitledPane animated="false" expanded="false" text="Properties">
+                            <content>
+                                <AnchorPane>
                                     <children>
-                                        <TextField fx:id="nameField" GridPane.columnIndex="1"/>
-                                        <Label text="Name"/>
-                                        <Label text="Language" GridPane.rowIndex="1"/>
-                                        <ChoiceBox fx:id="languageChoiceBox" GridPane.columnIndex="1"
-                                                   GridPane.rowIndex="1"/>
-                                        <Label text="Message" GridPane.rowIndex="2"/>
-                                        <Label text="Priority" GridPane.rowIndex="3"/>
-                                        <TextField fx:id="messageField" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                                        <Slider fx:id="prioritySlider" blockIncrement="1.0" majorTickUnit="1.0"
-                                                max="5.0" min="1.0" minorTickCount="0" showTickLabels="true"
-                                                showTickMarks="true" snapToTicks="true" value="3.0"
-                                                GridPane.columnIndex="1" GridPane.rowIndex="3"/>
-                                        <TextField fx:id="descriptionField" GridPane.columnIndex="1"
-                                                   GridPane.rowIndex="4"/>
-                                        <Label text="Description" GridPane.rowIndex="4"/>
+                                        <PropertyTableView fx:id="propertyTableView"
+                                                           AnchorPane.bottomAnchor="0.0"
+                                                           AnchorPane.leftAnchor="0.0"
+                                                           AnchorPane.rightAnchor="0.0"
+                                                           AnchorPane.topAnchor="0.0" />
                                     </children>
-                                </GridPane>
-                                <SyntaxHighlightingCodeArea fx:id="exportResultArea" prefHeight="221.0" prefWidth="563.0"
-                                                            stylesheets="@../css/editor-theme.css" VBox.vgrow="ALWAYS"/>
-                            </children>
-                        </VBox>
+                                    <padding>
+                                        <Insets bottom="-0.5" left="-0.5" right="-0.5" top="-0.5" />
+                                    </padding>
+                                </AnchorPane>
+                            </content>
+                        </TitledPane>
+                    </panes>
+                </Accordion>
+                <AnchorPane>
+                    <children>
+                        <ToolbarTitledPane animated="false"
+                                           collapsible="false"
+                                           layoutY="5.0"
+                                           title="Export result"
+                                           AnchorPane.bottomAnchor="0.0"
+                                           AnchorPane.leftAnchor="0.0"
+                                           AnchorPane.rightAnchor="0.0"
+                                           AnchorPane.topAnchor="0.0">
+                            <toolbarItems>
+                                <Button fx:id="copyResultButton" styleClass="icon-button">
+                                    <graphic>
+                                        <FontIcon iconLiteral="fas-copy" />
+                                    </graphic>
+                                    <tooltip>
+                                        <Tooltip text="Copy to clipboard" />
+                                    </tooltip>
+                                </Button>
+                                <Button fx:id="resetMetadataButton" styleClass="icon-button">
+                                    <graphic>
+                                        <FontIcon iconLiteral="fas-undo" />
+                                    </graphic>
+                                    <tooltip>
+                                        <Tooltip text="Reset metadata (excluding properties)" />
+                                    </tooltip>
+                                </Button>
+                            </toolbarItems>
+                            <content>
+                                <SyntaxHighlightingCodeArea fx:id="exportResultArea"
+                                                            prefHeight="221.0"
+                                                            prefWidth="563.0"
+                                                            stylesheets="@../css/editor-theme.css" />
+
+                            </content>
+                        </ToolbarTitledPane>
                     </children>
                 </AnchorPane>
-            </content>
-        </TitledPane>
+            </items>
+        </SplitPane>
     </children>
 </AnchorPane>
diff --git a/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/designer.less b/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/designer.less
index 083e1c2f..8cf6089c 100644
--- a/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/designer.less
+++ b/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/designer.less
@@ -132,11 +132,21 @@
   -fx-color: -fx-base;
 }
 
+.titled-pane {
+
+  & > .title {
+    -fx-background-color: @app-darker-slate-color;
+  }
+
+  &.full-size-title > .title {
+    .fix-height(30);
+  }
+}
+
 // Supports the ToolbarTitledPane
 .titled-pane.tool-bar-title {
 
   & > .title {
-
     -fx-padding: 0 6 0 6;
     -fx-background-color: @app-darker-slate-color;
     .fix-height(30);