Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/PreferencesKeys.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/PreferencesKeys.java	(revision 14422)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/PreferencesKeys.java	(revision 14423)
@@ -28,13 +28,14 @@
 
 public enum PreferencesKeys {
-	KEY_ROUTE_COLOR ("routing.route.color"),
+	KEY_ACTIVE_ROUTE_COLOR ("routing.active.route.color"),
+	KEY_INACTIVE_ROUTE_COLOR ("routing.inactive.route.color"),
 	KEY_ROUTE_WIDTH ("routing.route.width"),
 	KEY_ROUTE_SELECT ("routing.route.select");
-	
+
 	public final String key;
 	PreferencesKeys (String key) {
 		this.key=key;
 	}
-	
+
 	public String getKey() {return key;};
 }
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java	(revision 14422)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java	(revision 14423)
@@ -208,5 +208,5 @@
         Collection<Component> components = new ArrayList<Component>();
         components.add(new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)));
-        components.add(new JMenuItem(new LayerListDialog.ShowHideMarkerText(this)));
+//        components.add(new JMenuItem(new LayerListDialog.ShowHideMarkerText(this)));
         components.add(new JMenuItem(new LayerListDialog.DeleteLayerAction(this)));
         components.add(new JSeparator());
@@ -223,12 +223,7 @@
 	@Override
 	public String getToolTipText() {
-		if (routingModel.getRouteEdges() != null) {
-			// If there's a calculated route
-	        return "Showing calculated route. You can still add route nodes and compute a new route or delete layer to start a new route";
-		} else if (routingModel.getSelectedNodes() != null) {
-			// If there are some route nodes but not a calculated route
-	        return "Keep selecting route nodes and compute route";
-		}
-        return "Select as many route nodes as you want and compute route";
+		String tooltip = this.routingModel.routingGraph.getVertexCount() + " vertices, "
+				+ this.routingModel.routingGraph.getEdgeCount() + " edges";
+		return tooltip;
 	}
 
@@ -257,4 +252,5 @@
 	@Override
 	public void paint(Graphics g, MapView mv) {
+		boolean isActiveLayer = (mv.getActiveLayer().equals(this));
 		// Get routing nodes (start, middle, end)
         List<Node> nodes = routingModel.getSelectedNodes();
@@ -265,9 +261,20 @@
 
         // Get path stroke color from preferences
-//		Main.pref.hasKey(PreferencesKeys.KEY_ROUTE_COLOR.key);
-        String colorString = Main.pref.get(PreferencesKeys.KEY_ROUTE_COLOR.key);
-        if(colorString.length() == 0) {
-            colorString = ColorHelper.color2html(Color.RED);
-            // FIXME add after good color is found: Main.pref.put(KEY_ROUTE_COLOR, colorString);
+        // Color is different for active and inactive layers
+        String colorString;
+        if (isActiveLayer) {
+        	if (Main.pref.hasKey(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key))
+        			colorString = Main.pref.get(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key);
+        	else {
+        		colorString = ColorHelper.color2html(Color.RED);
+        		Main.pref.put(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key, colorString);
+        	}
+        } else {
+        	if (Main.pref.hasKey(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key))
+        		colorString = Main.pref.get(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key);
+        	else {
+        		colorString = ColorHelper.color2html(Color.decode("#dd2222"));
+        		Main.pref.put(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key, colorString);
+        	}
         }
         Color color = ColorHelper.html2color(colorString);
@@ -275,5 +282,5 @@
         // Get path stroke width from preferences
         String widthString = Main.pref.get(PreferencesKeys.KEY_ROUTE_WIDTH.key);
-        if(widthString.length() == 0) {
+        if (widthString.length() == 0) {
             widthString = "8";
             // FIXME add after good width is found: Main.pref.put(KEY_ROUTE_WIDTH, widthString);
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 14422)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 14423)
@@ -132,5 +132,4 @@
 	public RoutingPlugin() {
 		super();
-		//FIXME: maybe check if plugin already exists
 		plugin = this; // Assign reference to the plugin class
 		DOMConfigurator.configure("log4j.xml");
@@ -250,6 +249,4 @@
 			for (int i=0;i<layersArray.length;i++) {
 				if (layersArray[i].getDataLayer().equals(oldLayer)) {
-					// Move layer to the top
-					Main.map.mapView.moveLayer(layersArray[i], 0);
 					try {
 						// Remove layer
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java	(revision 14422)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java	(revision 14423)
@@ -71,5 +71,5 @@
 		// TODO Use constructor with shortcut
 		super(tr("Routing"), "add",
-				tr("Click to add route nodes."),
+				tr("Click to add destination."),
 				mapFrame, ImageProvider.getCursor("crosshair", null));
         this.routingDialog = RoutingPlugin.getInstance().getRoutingDialog();
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java	(revision 14422)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java	(revision 14423)
@@ -86,5 +86,5 @@
 		// TODO Use constructor with shortcut
 		super(tr("Routing"), "move",
-				tr("Click and drag to move route nodes."),
+				tr("Click and drag to move destination"),
 				mapFrame, ImageProvider.getCursor("normal", "move"));
         this.routingDialog = RoutingPlugin.getInstance().getRoutingDialog();
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java	(revision 14422)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java	(revision 14423)
@@ -75,5 +75,5 @@
 		// TODO Use constructor with shortcut
 		super(tr("Routing"), "remove",
-				tr("Remove route nodes"),
+				tr("Click to remove destination"),
 				mapFrame, ImageProvider.getCursor("normal", "delete"));
         this.routingDialog = RoutingPlugin.getInstance().getRoutingDialog();