Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java	(revision 28163)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java	(revision 28164)
@@ -21,4 +21,5 @@
 	public PanelMore panelMore = null;
 	public PanelNotice panelNotice = null;
+	public JScrollPane scrollNotice = null;
 	public PanelTop panelTop = null;
 	public PanelFog panelFog = null;
@@ -170,31 +171,43 @@
 		panelChan.setBounds(new Rectangle(65, 0, 170, 160));
 		panelChan.setVisible(false);
+		add(panelChan);
 		panelHaz = new PanelHaz(dlg);
 		panelHaz.setBounds(new Rectangle(65, 0, 170, 160));
 		panelHaz.setVisible(false);
+		add(panelHaz);
 		panelSpec = new PanelSpec(dlg);
 		panelSpec.setBounds(new Rectangle(65, 0, 170, 160));
 		panelSpec.setVisible(false);
+		add(panelSpec);
 		panelLights = new PanelLights(dlg);
 		panelLights.setBounds(new Rectangle(65, 0, 170, 160));
 		panelLights.setVisible(false);
+		add(panelLights);
 		panelMore = new PanelMore(dlg);
 		panelMore.setBounds(new Rectangle(40, 165, 360, 160));
 		panelMore.setVisible(false);
+		add(panelMore);
 		panelNotice = new PanelNotice(dlg);
-		panelNotice.setBounds(new Rectangle(40, 165, 360, 160));
-		panelNotice.setVisible(false);
+		panelNotice.setPreferredSize(new Dimension(340, 300));
+		scrollNotice = new JScrollPane(panelNotice, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+		scrollNotice.setBounds(new Rectangle(40, 165, 360, 160));
+		scrollNotice.setVisible(false);
+		add(scrollNotice);
 		panelTop = new PanelTop(dlg);
 		panelTop.setBounds(new Rectangle(40, 165, 360, 160));
 		panelTop.setVisible(false);
+		add(panelTop);
 		panelFog = new PanelFog(dlg);
 		panelFog.setBounds(new Rectangle(40, 165, 360, 160));
 		panelFog.setVisible(false);
+		add(panelFog);
 		panelRadar = new PanelRadar(dlg);
 		panelRadar.setBounds(new Rectangle(40, 165, 360, 160));
 		panelRadar.setVisible(false);
+		add(panelRadar);
 		panelLit = new PanelLit(dlg);
 		panelLit.setBounds(new Rectangle(40, 165, 360, 160));
 		panelLit.setVisible(false);
+		add(panelLit);
 
 		add(getButton(chanButton, 0, 0, 62, 40, "Chan"), null);
@@ -202,14 +215,4 @@
 		add(getButton(specButton, 0, 80, 62, 40, "Spec"), null);
 		add(getButton(lightsButton, 0, 120, 62, 40, "Lights"), null);
-		add(panelChan);
-		add(panelHaz);
-		add(panelSpec);
-		add(panelLights);
-		add(panelMore);
-		add(panelNotice);
-		add(panelTop);
-		add(panelFog);
-		add(panelRadar);
-		add(panelLit);
 		typeButtons = new ButtonGroup();
 		typeButtons.add(chanButton);
@@ -289,5 +292,5 @@
 		panelLights.setVisible(false);
 		panelMore.setVisible(false);
-		panelNotice.setVisible(false);
+		scrollNotice.setVisible(false);
 		panelTop.setVisible(false);
 		panelFog.setVisible(false);
@@ -316,5 +319,5 @@
 				break;
 			case NTC:
-				panelNotice.setVisible(true);
+				scrollNotice.setVisible(true);
 			case SPP:
 				specButton.setBorderPainted(true);
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 28163)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 28164)
@@ -223,5 +223,7 @@
 		ROS_SDS, ROS_CKA, ROS_PUB, ROS_COM, ROS_FAX, ROS_TIM, RAS_SRV, RAS_CST, PIL_VESS, PIL_HELI, PIL_SHORE,
 		NTC_A1, NTC_A1a, NTC_A2, NTC_A3, NTC_A4, NTC_A4_1, NTC_A5, NTC_A5_1, NTC_A6, NTC_A7, NTC_A8, NTC_A9,
-		NTC_A10a, NTC_A10b, NTC_A12, NTC_A13, NTC_A14, NTC_A15, NTC_A16, NTC_A17, NTC_A18, NTC_A19, NTC_A20
+		NTC_A10a, NTC_A10b, NTC_A12, NTC_A13, NTC_A14, NTC_A15, NTC_A16, NTC_A17, NTC_A18, NTC_A19, NTC_A20,
+		NTC_B1a, NTC_B1b, NTC_B2a, NTC_B2b, NTC_B3a, NTC_B3b, NTC_B4a, NTC_B4b, NTC_B5, NTC_B6, NTC_B7, NTC_B8, NTC_B9a, NTC_B9b, NTC_B11,
+		NTC_C1, NTC_C2, NTC_C3, NTC_C4, NTC_C5a, NTC_C5b, NTC_D1a, NTC_D1b, NTC_D2a, NTC_D2b, NTC_D3a, NTC_D3b
 	}
 		 
@@ -375,4 +377,31 @@
 		CatSTR.put(Cat.NTC_A19, "no_launching_beaching");
 		CatSTR.put(Cat.NTC_A20, "no_waterbikes");
+		CatSTR.put(Cat.NTC_B1a, "");
+		CatSTR.put(Cat.NTC_B1b, "");
+		CatSTR.put(Cat.NTC_B2a, "");
+		CatSTR.put(Cat.NTC_B2a, "");
+		CatSTR.put(Cat.NTC_B3a, "");
+		CatSTR.put(Cat.NTC_B3a, "");
+		CatSTR.put(Cat.NTC_B4a, "");
+		CatSTR.put(Cat.NTC_B4a, "");
+		CatSTR.put(Cat.NTC_B5, "");
+		CatSTR.put(Cat.NTC_B6, "");
+		CatSTR.put(Cat.NTC_B7, "");
+		CatSTR.put(Cat.NTC_B8, "");
+		CatSTR.put(Cat.NTC_B9a, "");
+		CatSTR.put(Cat.NTC_B9b, "");
+		CatSTR.put(Cat.NTC_B11, "");
+		CatSTR.put(Cat.NTC_C1, "");
+		CatSTR.put(Cat.NTC_C2, "");
+		CatSTR.put(Cat.NTC_C3, "");
+		CatSTR.put(Cat.NTC_C4, "");
+		CatSTR.put(Cat.NTC_C5a, "");
+		CatSTR.put(Cat.NTC_C5b, "");
+		CatSTR.put(Cat.NTC_D1a, "");
+		CatSTR.put(Cat.NTC_D1b, "");
+		CatSTR.put(Cat.NTC_D2a, "");
+		CatSTR.put(Cat.NTC_D2b, "");
+		CatSTR.put(Cat.NTC_D3a, "");
+		CatSTR.put(Cat.NTC_D3b, "");
 	}