diff --git a/moduleresolver/nbproject/project.xml b/moduleresolver/nbproject/project.xml
--- a/moduleresolver/nbproject/project.xml
+++ b/moduleresolver/nbproject/project.xml
@@ -11,7 +11,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.4</specification-version>
+                        <specification-version>1.12</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -63,6 +63,14 @@
                         <specification-version>7.9</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.2</specification-version>
+                    </run-dependency>
+                </dependency>
             </module-dependencies>
             <public-packages/>
         </data>
diff --git a/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/ContentPanel.form b/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/ContentPanel.form
--- a/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/ContentPanel.form
+++ b/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/ContentPanel.form
@@ -4,6 +4,7 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
@@ -25,10 +26,10 @@
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <Component id="pCentral" pref="25" max="32767" attributes="0"/>
-              <EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
-              <Component id="spTable" min="-2" pref="247" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
+              <Component id="pCentral" min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="25" max="-2" attributes="1"/>
+              <Component id="spTable" pref="272" max="32767" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git a/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/ContentPanel.java b/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/ContentPanel.java
--- a/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/ContentPanel.java
+++ b/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/ContentPanel.java
@@ -112,8 +112,7 @@ public final class ContentPanel extends 
                 }
             }
         }
-        pCentral.revalidate ();
-        revalidate ();
+        revalidate();
     }
     
     public void replaceComponents (final JComponent... comps) {
@@ -186,9 +185,9 @@ public final class ContentPanel extends 
         layout.setVerticalGroup(
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(layout.createSequentialGroup()
-                .add(pCentral, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 25, Short.MAX_VALUE)
+                .add(pCentral, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .add(25, 25, 25)
-                .add(spTable, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 247, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(spTable, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE)
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
diff --git a/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/LicensePanel.form b/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/LicensePanel.form
--- a/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/LicensePanel.form
+++ b/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/LicensePanel.form
@@ -8,6 +8,7 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
@@ -20,13 +21,13 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="1" attributes="0">
-              <Group type="103" groupAlignment="1" max="-2" attributes="0">
-                  <Component id="rbDismis" alignment="0" max="32767" attributes="1"/>
-                  <Component id="rbAccept" alignment="0" max="32767" attributes="1"/>
-                  <Component id="taTitle" alignment="0" pref="460" max="32767" attributes="1"/>
-                  <Component id="spLicenses" alignment="0" max="32767" attributes="1"/>
+              <Group type="103" groupAlignment="1" attributes="0">
+                  <Component id="rbDismis" alignment="0" pref="460" max="32767" attributes="1"/>
+                  <Component id="rbAccept" alignment="0" pref="460" max="32767" attributes="1"/>
+                  <Component id="taTitle" alignment="0" min="-2" pref="460" max="-2" attributes="1"/>
+                  <Component id="spLicenses" alignment="0" pref="460" max="32767" attributes="2"/>
               </Group>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git a/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/LicensePanel.java b/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/LicensePanel.java
--- a/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/LicensePanel.java
+++ b/moduleresolver/src/org/netbeans/modules/moduleresolver/ui/LicensePanel.java
@@ -183,12 +183,12 @@ public class LicensePanel extends javax.
         layout.setHorizontalGroup(
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, rbDismis, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, rbAccept, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, taTitle, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, spLicenses))
-                .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, rbDismis, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, rbAccept, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, taTitle, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 460, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, spLicenses, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE))
+                .addContainerGap())
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)