Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java	(revision 27200)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java	(revision 27201)
@@ -40,5 +40,4 @@
 						node = null;
 						panelMain.mark.clearSign();
-						panelMain.syncPanel();
 						manager.showVisualMessage(Messages.getString("OneNode"));
 					}
@@ -48,5 +47,4 @@
 				node = null;
 				panelMain.mark.clearSign();
-				panelMain.syncPanel();
 				manager.showVisualMessage(Messages.getString("SelectNode"));
 			}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java	(revision 27200)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java	(revision 27201)
@@ -134,13 +134,7 @@
 			sectorButton.setBorderPainted(sectorButton.isSelected());
 			if (sectorButton.isSelected()) {
-				if (panelSector == null) {
-					panelSector = new PanelSectors(dlg);
-				}
 				panelSector.setVisible(true);
 			} else {
-				if (panelSector != null) {
-					panelSector.setVisible(false);
-					panelSector = null;
-				}
+				panelSector.setVisible(false);
 				while (dlg.panelMain.mark.getSectorCount() > 1)
 					dlg.panelMain.mark.delLight(1);
@@ -158,4 +152,6 @@
 		this.add(panelChr, null);
 		this.add(panelCol, null);
+		panelSector = new PanelSectors(dlg);
+		panelSector.setVisible(false);
 
 		typeButtons = new ButtonGroup();
@@ -285,10 +281,4 @@
 
 	public void syncPanel() {
-		if (panelSector != null) {
-			panelSector.setVisible(false);
-			panelSector = null;
-		}
-		singleButton.setBorderPainted(false);
-		sectorButton.setBorderPainted(false);
 		orientationLabel.setVisible(false);
 		orientationBox.setVisible(false);
@@ -319,4 +309,15 @@
 				exhibitionBox.setSelectedIndex(item);
 		}
+		if (dlg.panelMain.mark.isSectored()) {
+			singleButton.setBorderPainted(false);
+			sectorButton.setBorderPainted(true);
+			panelSector.setVisible(true);
+		} else {
+			singleButton.setBorderPainted(true);
+			sectorButton.setBorderPainted(false);
+			panelSector.setVisible(false);
+			while (dlg.panelMain.mark.getSectorCount() > 1)
+				dlg.panelMain.mark.delLight(dlg.panelMain.mark.getSectorCount() - 1);
+		}
 		panelCol.syncPanel();
 		panelChr.syncPanel();
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java	(revision 27200)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java	(revision 27201)
@@ -68,7 +68,7 @@
 		this.getContentPane().add(panel);
 
-		table.setSize(860, ((table.getRowCount() * 16) + 18));
+		table.setSize(860, ((table.getRowCount() * 16) + 20));
 		if (table.getRowCount() > 3) {
-			this.setSize(900, ((table.getRowCount() * 16) + 40));
+			this.setSize(900, ((table.getRowCount() * 16) + 42));
 		}
 		
@@ -126,5 +126,8 @@
 
 		public int getRowCount() {
-			return dlg.panelMain.mark.getSectorCount();
+			if (dlg.panelMain == null)
+				return 1;
+			else
+				return dlg.panelMain.mark.getSectorCount();
 		}
 
@@ -258,7 +261,7 @@
 	public void deleteSector(int idx) {
 		dlg.panelMain.mark.delLight(idx);
-		table.setSize(860, ((table.getRowCount() * 16) + 18));
+		table.setSize(860, ((table.getRowCount() * 16) + 20));
 		if (table.getRowCount() > 3) {
-			this.setSize(900, ((table.getRowCount() * 16) + 40));
+			this.setSize(900, ((table.getRowCount() * 16) + 42));
 		} else {
 			this.setSize(900, 100);
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 27200)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 27201)
@@ -21,4 +21,5 @@
 	public SeaMark(OSeaMAction dia) {
 		dlg = dia;
+		clrLight();
 	}
 
@@ -101,4 +102,25 @@
 	public void setObject(Obj obj) {
 		object = obj;
+		if (obj == Obj.UNKNOWN) {
+			setCategory(Cat.NONE);
+			setShape(Shp.UNKNOWN);
+			setColour(Ent.BODY, Col.UNKNOWN);
+			setPattern(Ent.BODY, Pat.NONE);
+			setTopmark(Top.NONE);
+			setColour(Ent.TOPMARK, Col.UNKNOWN);
+			setPattern(Ent.TOPMARK, Pat.NONE);
+			setFogSound(Fog.NONE);
+			setRadar(Rtb.NONE);
+			setStatus(Sts.UNKNOWN);
+			setConstr(Cns.UNKNOWN);
+			setConsp(Con.UNKNOWN);
+			setRefl(Con.UNKNOWN);
+			setRef("");
+			setObjectHeight("");
+			setElevation("");
+			setInfo("");
+			setSource("");
+			setFixme("");
+		}
 		repaint();
 	}
@@ -559,4 +581,8 @@
 	}
 
+	public boolean isSectored() {
+		return (sectors.size() > 1);
+	}
+
 	public Object getLightAtt(Att att, int i) {
 		return getLightAtt(att.ordinal(), i);
@@ -619,5 +645,5 @@
 
 	public void clrLight() {
-		delLight(0);
+		sectors.clear();
 		addLight();
 	}
@@ -723,4 +749,12 @@
 	public void setRadar(Rtb type) {
 		RaType = type;
+		if (type == Rtb.NONE) {
+			setRaconGroup("");
+			setRaconSequence("");
+			setRaconPeriod("");
+			setRaconRange("");
+			setRaconSector1("");
+			setRaconSector2("");
+		}
 		repaint();
 	}
@@ -816,4 +850,10 @@
 	public void setFogSound(Fog sound) {
 		fogSound = sound;
+		if (sound == Fog.NONE) {
+			setFogGroup("");
+			setFogSequence("");
+			setFogPeriod("");
+			setFogRange("");
+		}
 		repaint();
 	}
@@ -1094,22 +1134,7 @@
 	public void clearSign() {
 		setObject(Obj.UNKNOWN);
-		setCategory(Cat.NONE);
-		setShape(Shp.UNKNOWN);
-		setColour(Ent.BODY, Col.UNKNOWN);
-		setPattern(Ent.BODY, Pat.NONE);
-		setTopmark(Top.NONE);
-		setColour(Ent.TOPMARK, Col.UNKNOWN);
-		setPattern(Ent.TOPMARK, Pat.NONE);
-		setFogSound(Fog.NONE);
-		setRadar(Rtb.NONE);
+		setName("");
 		clrLight();
-		dlg.panelMain.moreButton.setVisible(false);
-		dlg.panelMain.saveButton.setEnabled(false);
-		dlg.panelMain.topButton.setEnabled(false);
-		dlg.panelMain.fogButton.setEnabled(false);
-		dlg.panelMain.radButton.setEnabled(false);
-		dlg.panelMain.litButton.setEnabled(false);
-		dlg.panelMain.panelMore.syncPanel();
-		dlg.panelMain.panelMore.setVisible(false);
+		dlg.panelMain.syncPanel();
 		repaint();
 	}