Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 31808)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 31809)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.gui;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.FlowLayout;
@@ -44,6 +42,5 @@
 public class MapillaryPreferenceSetting implements SubPreferenceSetting, MapillaryLoginListener {
 
-  private JCheckBox reverseButtons = new JCheckBox(
-      tr("Reverse buttons position when displaying images."));
+  private JCheckBox reverseButtons = new JCheckBox(I18n.tr("Reverse buttons position when displaying images."));
   private JComboBox<String> downloadMode = new JComboBox<>(new String[]{
       MapillaryDownloader.MODES.Automatic.toString(),
@@ -51,10 +48,7 @@
       MapillaryDownloader.MODES.Manual.toString()
   });
-  private JCheckBox displayHour = new JCheckBox(
-      tr("Display hour when the picture was taken"));
-  private JCheckBox format24 = new JCheckBox(tr("Use 24 hour format"));
-  private JCheckBox moveTo = new JCheckBox(
-      tr("Move to picture''s location with next/previous buttons"));
-  private JButton login;
+  private JCheckBox displayHour = new JCheckBox(I18n.tr("Display hour when the picture was taken"));
+  private JCheckBox format24 = new JCheckBox(I18n.tr("Use 24 hour format"));
+  private JCheckBox moveTo = new JCheckBox(I18n.tr("Move to picture''s location with next/previous buttons"));
 
   private JButton loginButton = new JButton(new LoginAction(this));
@@ -71,13 +65,13 @@
   public void addGui(PreferenceTabbedPane gui) {
     JPanel panel = new JPanel();
-    this.reverseButtons.setSelected(Main.pref
-        .getBoolean("mapillary.reverse-buttons"));
-    this.displayHour.setSelected(Main.pref.getBoolean("mapillary.display-hour",
-        true));
+    this.reverseButtons.setSelected(Main.pref.getBoolean("mapillary.reverse-buttons"));
+    this.displayHour.setSelected(Main.pref.getBoolean("mapillary.display-hour", true));
     this.format24.setSelected(Main.pref.getBoolean("mapillary.format-24"));
-    this.moveTo.setSelected(Main.pref.getBoolean("mapillary.move-to-picture",
-        true));
-    panel.setLayout(new FlowLayout(FlowLayout.LEFT));
-    panel.add(this.reverseButtons);
+    this.moveTo.setSelected(Main.pref.getBoolean("mapillary.move-to-picture", true));
+
+    panel.setLayout(new GridBagLayout());
+    panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
+    panel.add(this.reverseButtons, GBC.eol());
     // Sets the value of the ComboBox.
     if (Main.pref.get("mapillary.download-mode").equals(MapillaryDownloader.MODES.Automatic.toString())
@@ -87,10 +81,10 @@
     }
     JPanel downloadModePanel = new JPanel();
-    downloadModePanel.add(new JLabel(tr("Download mode: ")));
+    downloadModePanel.add(new JLabel(I18n.tr("Download mode")));
     downloadModePanel.add(this.downloadMode);
-    panel.add(downloadModePanel);
-    panel.add(this.displayHour);
-    panel.add(this.format24);
-    panel.add(this.moveTo);
+    panel.add(downloadModePanel, GBC.eol());
+    panel.add(displayHour, GBC.eol());
+    panel.add(format24, GBC.eol());
+    panel.add(moveTo, GBC.eol());
 
     loginPanel.setLayout(new FlowLayout(FlowLayout.LEADING));
@@ -101,5 +95,5 @@
     panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
 
-    gui.getDisplayPreference().addSubTab(this, "Mapillary", panel);
+    gui.getDisplayPreference().addSubTab(this, "Mapillary", new JScrollPane(panel));
 
     new Thread(new Runnable() {
@@ -144,6 +138,5 @@
   public boolean ok() {
     boolean mod = false;
-    Main.pref
-        .put("mapillary.reverse-buttons", this.reverseButtons.isSelected());
+    Main.pref.put("mapillary.reverse-buttons", this.reverseButtons.isSelected());
 
     MapillaryPlugin.setMenuEnabled(MapillaryPlugin.getDownloadViewMenu(), false);