Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryToggleDialog.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryToggleDialog.java	(revision 31177)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryToggleDialog.java	(revision 31178)
@@ -10,4 +10,5 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashMap;
 
@@ -55,20 +56,24 @@
 
 	public MapillaryToggleDialog() {
-		super(tr("Mapillary image"), "mapillary.png", tr("Open Mapillary window"),
-				null, 200);
+		super(tr("Mapillary image"), "mapillary.png",
+				tr("Open Mapillary window"), null, 200);
 		mapillaryImageDisplay = new MapillaryImageDisplay();
 		this.add(mapillaryImageDisplay);
 		buttons = new JPanel();
 		buttons.setLayout(new FlowLayout(FlowLayout.CENTER));
-		blueButton.setBackground(Color.BLUE);
-		redButton.setBackground(Color.RED);
-		blueButton.setForeground(Color.WHITE);
-		redButton.setForeground(Color.WHITE);
+		blueButton.setForeground(Color.BLUE);
+		redButton.setForeground(Color.RED);
 		buttons.add(blueButton);
 		buttons.add(previousButton);
-		buttons.add(nextButton);		
+		buttons.add(nextButton);
 		buttons.add(redButton);
-		
+
 		this.add(buttons, BorderLayout.SOUTH);
+
+		createLayout(
+				mapillaryImageDisplay,
+				true,
+				Arrays.asList(new SideButton[] { blueButton, previousButton,
+						nextButton, redButton }));
 	}
 
@@ -111,5 +116,5 @@
 							200000, new HashMap<String, String>());
 					thumbnailCache.submit(this, false);
-					
+
 					if (imageCache != null)
 						imageCache.cancelOutstandingTasks();
@@ -189,5 +194,5 @@
 		}
 	}
-	
+
 	class redAction extends AbstractAction {
 		public redAction() {
@@ -200,6 +205,8 @@
 		public void actionPerformed(ActionEvent e) {
 			if (MapillaryToggleDialog.getInstance().getImage() != null) {
-				MapillaryData.getInstance().setSelectedImage(MapillaryLayer.RED);
-				MapillaryToggleDialog.getInstance().setImage(MapillaryLayer.RED);
+				MapillaryData.getInstance()
+						.setSelectedImage(MapillaryLayer.RED);
+				MapillaryToggleDialog.getInstance()
+						.setImage(MapillaryLayer.RED);
 				MapillaryToggleDialog.getInstance().updateImage();
 				Main.map.mapView.zoomTo(MapillaryData.getInstance()
@@ -208,5 +215,5 @@
 		}
 	}
-	
+
 	class blueAction extends AbstractAction {
 		public blueAction() {
@@ -219,6 +226,8 @@
 		public void actionPerformed(ActionEvent e) {
 			if (MapillaryToggleDialog.getInstance().getImage() != null) {
-				MapillaryData.getInstance().setSelectedImage(MapillaryLayer.BLUE);
-				MapillaryToggleDialog.getInstance().setImage(MapillaryLayer.BLUE);
+				MapillaryData.getInstance().setSelectedImage(
+						MapillaryLayer.BLUE);
+				MapillaryToggleDialog.getInstance().setImage(
+						MapillaryLayer.BLUE);
 				MapillaryToggleDialog.getInstance().updateImage();
 				Main.map.mapView.zoomTo(MapillaryData.getInstance()
@@ -242,5 +251,5 @@
 				}
 			});
-		} else if (data != null){
+		} else if (data != null) {
 			try {
 				BufferedImage img = ImageIO.read(new ByteArrayInputStream(data
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java	(revision 31177)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java	(revision 31178)
@@ -65,5 +65,5 @@
 										.getJsonNumber(j).doubleValue()));
 					} catch (Exception e) {
-						System.out.println(e);
+						Main.error(e);
 					}
 				}