Index: /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java
===================================================================
--- /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java	(revision 27358)
+++ /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java	(revision 27359)
@@ -13,4 +13,5 @@
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -22,5 +23,5 @@
 import java.util.Set;
 
-import javax.swing.JButton;
+import javax.swing.AbstractAction;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -28,4 +29,5 @@
 
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.plugins.graphview.core.access.AccessRulesetReader;
 import org.openstreetmap.josm.plugins.graphview.core.visualisation.ColorScheme;
@@ -152,21 +154,14 @@
         }
 
-        this.add(BorderLayout.CENTER, selectionPanel);
-
-
-        JPanel buttonPanel = new JPanel();
-        JButton showLayerButton = new JButton(tr("Create/update graph"));
-        showLayerButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                plugin.createGraphViewLayer();
-            }
-        });
-        buttonPanel.add(showLayerButton);
-
-        this.add(BorderLayout.SOUTH, buttonPanel);
+        createLayout(selectionPanel, true, Arrays.asList(new SideButton[] {
+            new SideButton(new AbstractAction(tr("Create/update graph")) {
+                public void actionPerformed(ActionEvent e) {
+                    plugin.createGraphViewLayer();
+                }
+            })
+        }));
 
         updateSelections();
         this.preferences.addObserver(this);
-
     }
 
Index: /applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java
===================================================================
--- /applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java	(revision 27358)
+++ /applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java	(revision 27359)
@@ -14,4 +14,5 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,5 +25,4 @@
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
@@ -93,15 +93,11 @@
         tree.addTreeSelectionListener(new SelectionWatch());
 
-        add(new JScrollPane(tree), BorderLayout.CENTER);
-
-        JPanel buttonPanel = new JPanel(new GridLayout(1, 3));
-
         selectButton = new SideButton(marktr("Select"), "select", "LicenseChange",
                 tr("Set the selected elements on the map to the selected items in the list above."), this);
         selectButton.setEnabled(false);
-        buttonPanel.add(selectButton);
-        buttonPanel.add(new SideButton(plugin.checkAction), "refresh");
-        add(buttonPanel, BorderLayout.SOUTH);
-
+
+        createLayout(tree, true, Arrays.asList(new SideButton[] {
+            selectButton, new SideButton(plugin.checkAction)
+        }));
     }