Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java	(revision 31267)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java	(revision 31268)
@@ -76,5 +76,5 @@
 				false);
 		ZOOM_MENU = MainMenu.add(Main.main.menu.viewMenu, zoomAction,
-				false);
+				false, 15);
 
 		EXPORT_MENU.setEnabled(false);
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java	(revision 31267)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java	(revision 31268)
@@ -95,10 +95,12 @@
 
 		mode = NORMAL_MODE;
-		this.setLayout(new BorderLayout());
-		top = new JPanel();
-		top.setLayout(new BorderLayout());
-		top.add(titleBar, BorderLayout.NORTH);
+		/*
+		 * this.setLayout(new BorderLayout()); top = new JPanel();
+		 * top.setLayout(new BorderLayout()); top.add(titleBar,
+		 * BorderLayout.NORTH);
+		 */
 		createLayout(mapillaryImageDisplay, normalMode,
 				Main.pref.getBoolean("mapillary.reverse-buttons"));
+		disableAllButtons();
 	}
 
@@ -153,11 +155,12 @@
 			if (this.image == null) {
 				mapillaryImageDisplay.setImage(null);
-				titleBar.setTitle(BASE_TITLE);
+				titleBar.setTitle(tr(BASE_TITLE));
 				disableAllButtons();
 				return;
 			}
 			if (image instanceof MapillaryImage) {
+				mapillaryImageDisplay.hyperlink.setVisible(true);
 				MapillaryImage mapillaryImage = (MapillaryImage) this.image;
-				String title = BASE_TITLE;
+				String title = tr(BASE_TITLE);
 				if (mapillaryImage.getUser() != null)
 					title += " -- " + mapillaryImage.getUser();
@@ -214,4 +217,5 @@
 				imageCache.submit(this, false);
 			} else if (image instanceof MapillaryImportedImage) {
+				mapillaryImageDisplay.hyperlink.setVisible(false);
 				this.nextButton.setEnabled(false);
 				this.previousButton.setEnabled(false);
@@ -234,4 +238,5 @@
 		nextSignalButton.setEnabled(false);
 		previousSignalButton.setEnabled(false);
+		mapillaryImageDisplay.hyperlink.setVisible(false);
 	}
 
@@ -385,19 +390,21 @@
 	public void createLayout(Component data, List<SideButton> buttons,
 			boolean reverse) {
-		add(data, BorderLayout.CENTER);
-		if (!buttons.isEmpty() && buttons.get(0) != null) {
+		JPanel panel = new JPanel();
+		panel.setLayout(new BorderLayout());
+		panel.add(data, BorderLayout.CENTER);
+		if (reverse) {
 			buttonsPanel = new JPanel(new GridLayout(1, 1));
-			final JPanel buttonRowPanel = new JPanel(Main.pref.getBoolean(
-					"dialog.align.left", false) ? new FlowLayout(
-					FlowLayout.LEFT) : new GridLayout(1, buttons.size()));
-			buttonsPanel.add(buttonRowPanel);
-			for (SideButton button : buttons)
-				buttonRowPanel.add(button);
-			if (reverse)
-				top.add(buttonsPanel, BorderLayout.SOUTH);
-			else
-				add(buttonsPanel, BorderLayout.SOUTH);
-		}
-		add(top, BorderLayout.NORTH);
+			if (!buttons.isEmpty() && buttons.get(0) != null) {
+				final JPanel buttonRowPanel = new JPanel(Main.pref.getBoolean(
+						"dialog.align.left", false) ? new FlowLayout(
+						FlowLayout.LEFT) : new GridLayout(1, buttons.size()));
+				buttonsPanel.add(buttonRowPanel);
+				for (SideButton button : buttons)
+					buttonRowPanel.add(button);
+			}
+			panel.add(buttonsPanel, BorderLayout.NORTH);
+			createLayout(panel, true, null);
+		} else
+			createLayout(panel, true, buttons);
 	}