diff --git a/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.form b/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.form
index 198f47535..b860ccbd0 100644
--- a/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.form
+++ b/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.form
@@ -715,7 +715,7 @@
                           </Events>
                           <Constraints>
                             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                              <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="2" anchor="12" weightX="1.0" weightY="0.0"/>
+                              <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="12" weightX="1.0" weightY="0.0"/>
                             </Constraint>
                           </Constraints>
                         </Component>
@@ -728,7 +728,7 @@
                           </Events>
                           <Constraints>
                             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                              <GridBagConstraints gridX="2" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="2" anchor="12" weightX="0.0" weightY="0.0"/>
+                              <GridBagConstraints gridX="2" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="2" insetsBottom="4" insetsRight="4" anchor="12" weightX="0.0" weightY="0.0"/>
                             </Constraint>
                           </Constraints>
                         </Component>
@@ -821,20 +821,20 @@
                         </Component>
                         <Component class="javax.swing.JButton" name="bmCancelButton">
                           <Properties>
-                            <Property name="text" type="java.lang.String" value=" Cancel "/>
+                            <Property name="text" type="java.lang.String" value="Cancel"/>
                           </Properties>
                           <Events>
                             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bmCancelButtonActionPerformed"/>
                           </Events>
                           <Constraints>
                             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                              <GridBagConstraints gridX="3" gridY="20" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="4" anchor="12" weightX="0.0" weightY="0.0"/>
+                              <GridBagConstraints gridX="3" gridY="20" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="4" anchor="12" weightX="0.0" weightY="0.0"/>
                             </Constraint>
                           </Constraints>
                         </Component>
                         <Component class="javax.swing.JButton" name="bmOkButton">
                           <Properties>
-                            <Property name="text" type="java.lang.String" value=" OK "/>
+                            <Property name="text" type="java.lang.String" value="OK"/>
                             <Property name="enabled" type="boolean" value="false"/>
                           </Properties>
                           <Events>
@@ -842,7 +842,7 @@
                           </Events>
                           <Constraints>
                             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                              <GridBagConstraints gridX="2" gridY="20" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="2" anchor="12" weightX="1.0" weightY="0.0"/>
+                              <GridBagConstraints gridX="2" gridY="20" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="2" anchor="12" weightX="1.0" weightY="0.0"/>
                             </Constraint>
                           </Constraints>
                         </Component>
diff --git a/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.java b/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.java
index b351933b4..41194e92a 100644
--- a/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.java
+++ b/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.java
@@ -2238,7 +2238,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.gridy = 3;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
         gridBagConstraints.weightx = 1.0;
-        gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 2);
+        gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0);
         loadJMPanel.add(loadExtractionModelButton, gridBagConstraints);
 
         jmOkButton.setText(" OK ");
@@ -2251,7 +2251,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.gridx = 2;
         gridBagConstraints.gridy = 3;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
-        gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 2);
+        gridBagConstraints.insets = new java.awt.Insets(4, 2, 4, 4);
         loadJMPanel.add(jmOkButton, gridBagConstraints);
 
         jPanel7.setBorder(javax.swing.BorderFactory.createTitledBorder("Recent Files"));
@@ -2320,7 +2320,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
         bookmarkPanel.add(infoBarLabelBookmark, gridBagConstraints);
 
-        bmCancelButton.setText(" Cancel ");
+        bmCancelButton.setText("Cancel");
         bmCancelButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 bmCancelButtonActionPerformed(evt);
@@ -2330,10 +2330,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.gridx = 3;
         gridBagConstraints.gridy = 20;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
-        gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 4);
+        gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 4);
         bookmarkPanel.add(bmCancelButton, gridBagConstraints);
 
-        bmOkButton.setText(" OK ");
+        bmOkButton.setText("OK");
         bmOkButton.setEnabled(false);
         bmOkButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -2345,7 +2345,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.gridy = 20;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
         gridBagConstraints.weightx = 1.0;
-        gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 2);
+        gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 2);
         bookmarkPanel.add(bmOkButton, gridBagConstraints);
 
         jTabbedPane1.addTab("Layout", bookmarkPanel);