Index: /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/dialogs/HarbourAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/dialogs/HarbourAction.java	(revision 24573)
+++ /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/dialogs/HarbourAction.java	(revision 24574)
@@ -1,4 +1,5 @@
 package harbour.dialogs;
 
+import harbour.layers.LayerHarbour;
 import harbour.panels.*;
 
@@ -59,4 +60,5 @@
 	private JToggleButton chartButton = null;
 	private JPanel curPanel = null;
+	private static LayerHarbour curLayer = new LayerHarbour("Harbour");
 	
 	public HarbourAction() {
@@ -146,4 +148,6 @@
 			harbourPanel.add(getQueryjButton(), null);
 			harbourPanel.add(getChartButton(), null);
+			
+			comButton.setEnabled(false);
 		}
 		return harbourPanel;
@@ -171,4 +175,12 @@
 					panelGeneral.setVisible(true);
 					chartButton.setEnabled(false);
+					
+					comButton.setEnabled(false);
+					restButton.setEnabled(true);
+					servButton.setEnabled(true);
+					envButton.setEnabled(true);
+					relButton.setEnabled(true);
+					
+					Main.main.removeLayer(curLayer);
 					curPanel = panelGeneral;
 				}
@@ -197,4 +209,12 @@
 					panelLimits.setVisible(true);
 					chartButton.setEnabled(false);
+					
+					comButton.setEnabled(true);
+					restButton.setEnabled(false);
+					servButton.setEnabled(true);
+					envButton.setEnabled(true);
+					relButton.setEnabled(true);
+					
+					Main.main.removeLayer(curLayer);
 					curPanel = panelLimits;
 				}
@@ -223,4 +243,13 @@
 					panelServices.setVisible(true);
 					chartButton.setEnabled(false);
+					
+					comButton.setEnabled(true);
+					restButton.setEnabled(true);
+					servButton.setEnabled(false);
+					envButton.setEnabled(true);
+					relButton.setEnabled(true);
+					
+					
+					Main.main.removeLayer(curLayer);
 					curPanel = panelServices;
 				}
@@ -249,4 +278,12 @@
 					panelEnv.setVisible(true);
 					chartButton.setEnabled(true);
+					
+					comButton.setEnabled(true);
+					restButton.setEnabled(true);
+					servButton.setEnabled(true);
+					envButton.setEnabled(false);
+					relButton.setEnabled(true);
+
+					Main.main.addLayer(curLayer);
 					curPanel = panelEnv;
 				}
@@ -275,4 +312,12 @@
 					panelRelations.setVisible(true);
 					chartButton.setEnabled(true);
+					
+					comButton.setEnabled(true);
+					restButton.setEnabled(true);
+					servButton.setEnabled(true);
+					envButton.setEnabled(true);
+					relButton.setEnabled(false);
+					
+					Main.main.removeLayer(curLayer);
 					curPanel = panelRelations;
 				}
Index: /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/layers/LayerHarbour.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/layers/LayerHarbour.java	(revision 24574)
+++ /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/layers/LayerHarbour.java	(revision 24574)
@@ -0,0 +1,67 @@
+package harbour.layers;
+
+import java.awt.Graphics2D;
+
+import javax.swing.Action;
+import javax.swing.Icon;
+
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+public class LayerHarbour extends Layer {
+
+	public LayerHarbour(String name) {
+		super(name);
+	}
+
+	@Override
+	public Icon getIcon() {
+		return ImageProvider.get("layer", "Hbr_16x14");
+	}
+
+	@Override
+	public Object getInfoComponent() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Action[] getMenuEntries() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getToolTipText() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean isMergable(Layer arg0) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void mergeFrom(Layer arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void paint(Graphics2D arg0, MapView arg1, Bounds arg2) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visitBoundingBox(BoundingXYVisitor arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
Index: /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/panels/PanelServices.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/panels/PanelServices.java	(revision 24573)
+++ /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/panels/PanelServices.java	(revision 24574)
@@ -152,13 +152,10 @@
 		airLabel = new JLabel();
 		airLabel.setBounds(new Rectangle(215, 26, 20, 20));
-		// airLabel.setText("JLabel");
 		airLabel.setIcon(new ImageIcon(getClass().getResource("/images/Airplane_20x19.png")));
 		infraLabel = new JLabel();
 		infraLabel.setBounds(new Rectangle(5, 26, 20, 20));
-		// infraLabel.setText("JLabel");
 		infraLabel.setIcon(new ImageIcon(getClass().getResource("/images/Bahn_20x16.png")));
 		raPicLabel = new JLabel();
 		raPicLabel.setBounds(new Rectangle(5, 2, 20, 20));
-		// raPicLabel.setText("\"\"");
 		raPicLabel.setIcon(new ImageIcon(getClass().getResource("/images/Telefon_14x20.png")));
 		this.setSize(330, 270);