Index: /applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- /applications/editors/josm/plugins/czechaddress/build.xml	(revision 27464)
+++ /applications/editors/josm/plugins/czechaddress/build.xml	(revision 27465)
@@ -33,5 +33,5 @@
             <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/CS:JOSM/Plugins/CzechAddress"/>
             <attribute name="Plugin-Icon" value="images/preferences/czech_flag.png"/>
-            <attribute name="Plugin-Mainversion" value="4549"/>
+            <attribute name="Plugin-Mainversion" value="4733"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java	(revision 27464)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java	(revision 27465)
@@ -23,5 +23,5 @@
                         "Adresy: Přiřadit adresy",
                         KeyEvent.VK_P, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT),
-              true);
+              true, "czechaddress/manager", true);
     }
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 27464)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 27465)
@@ -68,5 +68,5 @@
         initComponents();
         setLayout(originalManager);
-        add(mainPanel);
+        createLayout(mainPanel, false, null);
 
         // Register to all messages
Index: /applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java
===================================================================
--- /applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java	(revision 27464)
+++ /applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java	(revision 27465)
@@ -9,4 +9,5 @@
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
+import java.util.Arrays;
 import java.util.Collection;
 
@@ -87,20 +88,16 @@
 
 		// ButtonPanel
-		JPanel buttonPanel = new JPanel();
-		buttonPanel.setLayout(new GridLayout(1, 3));
 		createDigraphButton = new SideButton(marktr("Create"), "digraphcreation", tr ("start the channel digraph creation"),
 				tr("create the channel digraph"), this);
-		buttonPanel.add(createDigraphButton);
 		checkJunctionButton = new SideButton(marktr("Check "), "junctioncheck", tr("check a marked subset if it is a junction"),
 				tr("check the subust for junction properties"), this);
 		checkJunctionButton.setEnabled(false);
-		buttonPanel.add(checkJunctionButton);
 		searchJunctionButton = new SideButton(marktr("Search "), "junctionsearch", tr ("search for junctions into a subset of channels"),
 				tr("search for junctions in the channel subset"), this);
 		searchJunctionButton.setEnabled(false);
-		buttonPanel.add(searchJunctionButton);
 
-		add(centerPanel, BorderLayout.CENTER);
-		add(buttonPanel, BorderLayout.SOUTH);
+		createLayout(centerPanel, false, Arrays.asList(new SideButton[] {
+			createDigraphButton, checkJunctionButton, searchJunctionButton
+		}));
 	}
 
Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java	(revision 27464)
+++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java	(revision 27465)
@@ -172,5 +172,5 @@
         });
 
-        add(rcPanel, BorderLayout.CENTER);
+        createLayout(rcPanel, false, null);
     }
 
Index: /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java
===================================================================
--- /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java	(revision 27464)
+++ /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java	(revision 27465)
@@ -352,22 +352,14 @@
 		dataPanel.add(geomTree);
 
-		add(new JScrollPane(dataPanel), BorderLayout.CENTER);
-
-		JPanel buttonPanel = new JPanel(new GridLayout(1, 3));
-
 		checkButton = new SideButton(marktr("Check"), "checksignatures", "TrustOSM",
 				tr("Check all available signatures for selected object."), this);
-		buttonPanel.add(checkButton);
-
 		signButton = new SideButton(marktr("Sign"), "sign", "TrustOSM",
 				tr("Digital sign selected Tags, if you believe they are correct."), this);
-		buttonPanel.add(signButton);
-
 		showButton = new SideButton(marktr("Show"), "showsig", "TrustOSM",
 				tr("Show all available signatures for selected attribute."), this);
-		buttonPanel.add(showButton);
-
-
-		add(buttonPanel, BorderLayout.SOUTH);
+
+		createLayout(dataPanel, true, Arrays.asList(new SideButton[] {
+			checkButton, signButton, showButton
+		}));
 		DataSet.addSelectionListener(this);
 	}