Index: src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/io/UploadDialog.java	(Revision 2328)
+++ src/org/openstreetmap/josm/gui/io/UploadDialog.java	(Arbeitskopie)
@@ -9,6 +9,7 @@
 import java.awt.FlowLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -662,24 +663,16 @@
             bgUseNewOrExisting = new ButtonGroup();
 
             // -- atomic upload
-            gc.gridwidth = 4;
+            gc.gridwidth = 2;
             gc.gridy = 0;
             gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weightx = 1.0;
             gc.anchor = GridBagConstraints.FIRST_LINE_START;
             add(buildAtomicUploadControlPanel(), gc);
 
-            // -- changeset command
-            gc.gridwidth = 4;
+            gc.gridwidth = 2;
             gc.gridy = 1;
             gc.fill = GridBagConstraints.HORIZONTAL;
-            gc.weightx = 1.0;
-            gc.anchor = GridBagConstraints.FIRST_LINE_START;
-            add(buildUploadCommentPanel(), gc);
-
-            gc.gridwidth = 4;
-            gc.gridy = 2;
-            gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weightx = 0.0;
             gc.anchor = GridBagConstraints.FIRST_LINE_START;
             rbUseNew = new JRadioButton(tr("Open a new changeset"));
@@ -687,9 +680,19 @@
             bgUseNewOrExisting.add(rbUseNew);
             add(rbUseNew, gc);
 
+            // -- changeset command
+            gc.gridwidth = 2;
+            gc.gridy = 2;
+            gc.fill = GridBagConstraints.HORIZONTAL;
+            gc.weightx = 1.0;
+            gc.anchor = GridBagConstraints.FIRST_LINE_START;
+            gc.insets = new Insets(0,22,0,0);
+            add(buildUploadCommentPanel(), gc);
+
             gc.gridx = 0;
             gc.gridy = 3;
             gc.gridwidth = 1;
+            gc.insets = new Insets(2,0,0,0);
             rbExisting = new JRadioButton(tr("Use an open changeset"));
             rbExisting.setToolTipText(tr("Upload data to an already opened changeset"));
             bgUseNewOrExisting.add(rbExisting);
@@ -698,7 +701,16 @@
             gc.gridx = 1;
             gc.gridy = 3;
             gc.gridwidth = 1;
+            gc.weightx = 0.0;
+            gc.insets = new Insets(2,2,0,0);
+            btnRefresh = new JButton(new RefreshAction());
+            add(btnRefresh, gc);
+
+            gc.gridx = 0;
+            gc.gridy = 4;
+            gc.gridwidth = 1;
             gc.weightx = 1.0;
+            gc.insets = new Insets(2,22,0,0);
             model = new OpenChangesetModel();
             cbOpenChangesets = new JComboBox(model);
             cbOpenChangesets.setToolTipText("Select an open changeset");
@@ -712,25 +724,20 @@
             model.addListDataListener(this);
             add(cbOpenChangesets, gc);
 
-            gc.gridx = 2;
-            gc.gridy = 3;
+            gc.gridx = 1;
+            gc.gridy = 4;
             gc.gridwidth = 1;
             gc.weightx = 0.0;
-            btnRefresh = new JButton(new RefreshAction());
-            add(btnRefresh, gc);
-
-            gc.gridx = 3;
-            gc.gridy = 3;
-            gc.gridwidth = 1;
-            gc.weightx = 0.0;
+            gc.insets = new Insets(2,2,0,0);
             CloseChangesetAction closeChangesetAction = new CloseChangesetAction();
             btnClose = new JButton(closeChangesetAction);
             cbOpenChangesets.addItemListener(closeChangesetAction);
             add(btnClose, gc);
 
             gc.gridx = 0;
-            gc.gridy = 4;
-            gc.gridwidth = 4;
+            gc.gridy = 5;
+            gc.gridwidth = 2;
+            gc.insets = new Insets(0,0,0,0);
             cbCloseAfterUpload = new JCheckBox(tr("Close changeset after upload"));
             cbCloseAfterUpload.setToolTipText(tr("Select to close the changeset after the next upload"));
             add(cbCloseAfterUpload, gc);