From 661768abddb8c45f9b71ae5ffd6a679b921d5bff Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 11 Feb 2025 11:26:46 +0100
Subject: [PATCH] Grouped some view with tab controls as defined by CH

---
 ENI2/Properties/Resources.Designer.cs         | 144 ++++
 ENI2/Properties/Resources.resx                |  48 ++
 .../DangerousCargoControl.xaml                | 313 ++++----
 ENI2/SheetDisplayControls/PortControl.xaml    | 734 +++++++++---------
 ENI2/SheetDisplayControls/PortControl.xaml.cs |  10 +-
 .../SheetDisplayControls/ShipDataControl.xaml | 365 ++++-----
 ENI2/SheetDisplayControls/VoyageControl.xaml  | 560 ++++++-------
 bsmd.database/DatabaseEntity.cs               |   4 +-
 8 files changed, 1236 insertions(+), 942 deletions(-)

diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index f17f7862..c4e05a3c 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -858,6 +858,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 2 IBC.
+        /// </summary>
+        public static string text102 {
+            get {
+                return ResourceManager.GetString("text102", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 10.2 IBC data (on arrival), if applicable.
         /// </summary>
@@ -867,6 +876,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 3 IGC.
+        /// </summary>
+        public static string text103 {
+            get {
+                return ResourceManager.GetString("text103", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 10.3 IGC data (on arrival), if applicable.
         /// </summary>
@@ -876,6 +894,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 4 IMSBC.
+        /// </summary>
+        public static string text104 {
+            get {
+                return ResourceManager.GetString("text104", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 10.4 IMSBC data (on arrival), if applicable.
         /// </summary>
@@ -885,6 +912,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 5 MARPOL I.
+        /// </summary>
+        public static string text105 {
+            get {
+                return ResourceManager.GetString("text105", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 10.5 MARPOL I data (on arrival), if applicable.
         /// </summary>
@@ -894,6 +930,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 6 IMDG.
+        /// </summary>
+        public static string text106 {
+            get {
+                return ResourceManager.GetString("text106", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 10.6 IMDG data (on arrival), if applicable.
         /// </summary>
@@ -5556,6 +5601,105 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 1-6 Actual.
+        /// </summary>
+        public static string textTab11 {
+            get {
+                return ResourceManager.GetString("textTab11", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 7-9 Tables.
+        /// </summary>
+        public static string textTab12 {
+            get {
+                return ResourceManager.GetString("textTab12", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 10 MDH.
+        /// </summary>
+        public static string textTab13 {
+            get {
+                return ResourceManager.GetString("textTab13", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cruise.
+        /// </summary>
+        public static string textTab14 {
+            get {
+                return ResourceManager.GetString("textTab14", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 1-2 Berth.
+        /// </summary>
+        public static string textTab21 {
+            get {
+                return ResourceManager.GetString("textTab21", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 3-4 Contact.
+        /// </summary>
+        public static string textTab22 {
+            get {
+                return ResourceManager.GetString("textTab22", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 5-6 Cargo.
+        /// </summary>
+        public static string textTab23 {
+            get {
+                return ResourceManager.GetString("textTab23", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 7 Waste.
+        /// </summary>
+        public static string textTab24 {
+            get {
+                return ResourceManager.GetString("textTab24", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 1 General.
+        /// </summary>
+        public static string textTab51 {
+            get {
+                return ResourceManager.GetString("textTab51", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 2-3 MDH / SEC.
+        /// </summary>
+        public static string textTab52 {
+            get {
+                return ResourceManager.GetString("textTab52", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 4 Tanker.
+        /// </summary>
+        public static string textTab53 {
+            get {
+                return ResourceManager.GetString("textTab53", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Border police.
         /// </summary>
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index a5e0cd9c..3c31bdc3 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -2170,4 +2170,52 @@
   <data name="clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="text102" xml:space="preserve">
+    <value>2 IBC</value>
+  </data>
+  <data name="text103" xml:space="preserve">
+    <value>3 IGC</value>
+  </data>
+  <data name="text104" xml:space="preserve">
+    <value>4 IMSBC</value>
+  </data>
+  <data name="text105" xml:space="preserve">
+    <value>5 MARPOL I</value>
+  </data>
+  <data name="text106" xml:space="preserve">
+    <value>6 IMDG</value>
+  </data>
+  <data name="textTab11" xml:space="preserve">
+    <value>1-6 Actual</value>
+  </data>
+  <data name="textTab12" xml:space="preserve">
+    <value>7-9 Tables</value>
+  </data>
+  <data name="textTab13" xml:space="preserve">
+    <value>10 MDH</value>
+  </data>
+  <data name="textTab14" xml:space="preserve">
+    <value>Cruise</value>
+  </data>
+  <data name="textTab21" xml:space="preserve">
+    <value>1-2 Berth</value>
+  </data>
+  <data name="textTab22" xml:space="preserve">
+    <value>3-4 Contact</value>
+  </data>
+  <data name="textTab23" xml:space="preserve">
+    <value>5-6 Cargo</value>
+  </data>
+  <data name="textTab24" xml:space="preserve">
+    <value>7 Waste</value>
+  </data>
+  <data name="textTab51" xml:space="preserve">
+    <value>1 General</value>
+  </data>
+  <data name="textTab52" xml:space="preserve">
+    <value>2-3 MDH / SEC</value>
+  </data>
+  <data name="textTab53" xml:space="preserve">
+    <value>4 Tanker</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI2/SheetDisplayControls/DangerousCargoControl.xaml b/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
index a7c1261d..e5e396de 100644
--- a/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
+++ b/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
@@ -22,24 +22,15 @@
                     <RowDefinition Height="36" />
                     <RowDefinition Height="56" />
                     <RowDefinition Height="28" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="240" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="240" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="240" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="240" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="240" />
+                    <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
 
                 <TextBlock x:Name="textBlock101" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text101General}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
                 <Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width=".2*" />
-                        <ColumnDefinition Width=".2*" />
-                        <ColumnDefinition Width=".2*" />
+                        <ColumnDefinition Width=".15*" />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition Width=".25*" />
                         <ColumnDefinition Width=".2*" />
                         <ColumnDefinition Width=".2*" />
                     </Grid.ColumnDefinitions>
@@ -47,146 +38,178 @@
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                     </Grid.RowDefinitions>
-                    <Label Content="{x:Static p:Resources.textDGManifestOnBoard}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Center" Margin="0,0,10,0"/>
-                    <Label Content="{x:Static p:Resources.textDGContactFamilyName}" Grid.Column="1" Grid.Row="0" HorizontalContentAlignment="Center" Margin="0,0,10,0"/>
-                    <Label Content="{x:Static p:Resources.textDGContactPhone}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Center" Margin="0,0,10,0"/>
-                    <Label Content="{x:Static p:Resources.textMoUBalticRoRo}" Grid.Column="3" Grid.Row="0" HorizontalContentAlignment="Center" Margin="0,0,10,0"/>
+                    <Label Content="{x:Static p:Resources.textDGManifestOnBoard}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <Label Content="{x:Static p:Resources.textDGContactFamilyName}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <Label Content="{x:Static p:Resources.textDGContactPhone}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <Label Content="{x:Static p:Resources.textMoUBalticRoRo}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                     <Label Content="{x:Static p:Resources.textVesselClass}" Grid.Column="4" Grid.Row="0" HorizontalContentAlignment="Center" Margin="0,0,10,0"/>
 
-                    <CheckBox Name="checkBoxDGManifestOnBoard" IsChecked="{Binding DPGManifestOnBoardOnArrival}" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                    <TextBox Grid.Row="18" Grid.Column="1" Name="textBoxDGManifestContactFamilyName" MaxLength="99" Margin="2" Text="{Binding DPGContactFamilyName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
-                    <TextBox Grid.Row="18" Grid.Column="2" Name="textBoxDGManifestContactPhone" MaxLength="99" Margin="2" Text="{Binding DPGContactPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
-                    <CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    <CheckBox Name="checkBoxDGManifestOnBoard" IsChecked="{Binding DPGManifestOnBoardOnArrival}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    <TextBox Grid.Row="0" Grid.Column="3" Name="textBoxDGManifestContactFamilyName" MaxLength="99" Margin="2" Text="{Binding DPGContactFamilyName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
+                    <TextBox Grid.Row="1" Grid.Column="3" Name="textBoxDGManifestContactPhone" MaxLength="99" Margin="2" Text="{Binding DPGContactPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
+                    <CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     <ComboBox x:Name="comboBoxVesselClass" Grid.Row="1" Grid.Column="4" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" IsEditable="True" />
                 </Grid>
                 
                 <TextBlock Name="textBlockMessageClass" FontWeight="DemiBold" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" />
                 <Button Content="{x:Static p:Resources.textNewDGItem}" Name="buttonNewItem" Margin="2" Click="buttonNewItem_Click" Grid.Row="2" Grid.Column="1" Background="Transparent" />
+                <TabControl Grid.Row="3" Grid.ColumnSpan="2">
+                    <TabItem Header="{x:Static p:Resources.text102}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="36"/>
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <TextBlock x:Name="textBlock102" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text102IBCData}" Grid.Column="0" Grid.Row="0"/>
+                            <enictrl:ENIDataGrid x:Name="dataGridIBCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="1">
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textProductName}" Binding="{Binding ProductName}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPollutionCategory}" Binding="{Binding PollutionCategoryDisplay}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textRisks}" Binding="{Binding HazardsDisplay}" IsReadOnly="True" Width="auto" />
+                                    <DataGridCheckBoxColumn Header="{x:Static p:Resources.textColumsOfIBC}" Binding="{Binding SpecRef15_19}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textFlashpointInformation}" Binding="{Binding FlashpointInformationDisplay}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
+                                </DataGrid.Columns>
+                            </enictrl:ENIDataGrid>
+                        </Grid>
+                    </TabItem>
+                    <TabItem Header="{x:Static p:Resources.text103}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="36"/>
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <TextBlock x:Name="textBlock103" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text103IGCData}" Grid.Row="0" />
+                            <enictrl:ENIDataGrid x:Name="dataGridIGCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="1" AutoGenerateColumns="False" Margin="0,5,0,0">
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textProductName}" Binding="{Binding ProductName}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textIMOClassSubclass}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
+                                </DataGrid.Columns>
+                            </enictrl:ENIDataGrid>
+                        </Grid>
+                    </TabItem>
+                    <TabItem Header="{x:Static p:Resources.text104}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="36"/>
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <TextBlock x:Name="textBlock104" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text104IMSBCData}" Grid.Row="0" />
+                            <enictrl:ENIDataGrid x:Name="dataGridIMSBCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="1" AutoGenerateColumns="False" Margin="0,5,0,0">
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textBulkCargoShippingName}" Binding="{Binding BulkCargoShippingName}" IsReadOnly="True" Width="auto" />
+                                    <DataGridCheckBoxColumn Header="{x:Static p:Resources.textMaterialHazard}" Binding="{Binding MHB}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textIMOClassSubclass}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
+                                    <DataGridComboBoxColumn Header="{x:Static p:Resources.textIMOHazardClass}" ItemsSource="{x:Static util:GlobalStructures.imoHazardClasses}" IsReadOnly="True" Width="auto">
+                                        <DataGridComboBoxColumn.ElementStyle>
+                                            <Style TargetType="ComboBox">
+                                                <Setter Property="SelectedIndex" Value="{Binding IMOHazardClass,  UpdateSourceTrigger=PropertyChanged}" />
+                                            </Style>
+                                        </DataGridComboBoxColumn.ElementStyle>
+                                    </DataGridComboBoxColumn>
+                                </DataGrid.Columns>
+                            </enictrl:ENIDataGrid>
+                        </Grid>
+                    </TabItem>
+                    <TabItem Header="{x:Static p:Resources.text105}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="36"/>
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <TextBlock x:Name="textBlock105" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text105MARPOLData}" Grid.Row="0" />
+                            <enictrl:ENIDataGrid x:Name="dataGridMARPOLItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="1" AutoGenerateColumns="False" Margin="0,5,0,0">
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding Name}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textFlashpointInformation}" Binding="{Binding FlashpointInformationDisplay}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
+                                </DataGrid.Columns>
+                            </enictrl:ENIDataGrid>
+                        </Grid>
+                    </TabItem>
+                    <TabItem Header="{x:Static p:Resources.text106}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="36"/>
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <TextBlock x:Name="textBlock106" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text106IMDGData}" Grid.Row="0"/>
+                            <enictrl:ENIDataGrid x:Name="dataGridIMDGItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="1" AutoGenerateColumns="False" Margin="0,5,0,0">
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="auto" />
+                                    <DataGridComboBoxColumn Header="{x:Static p:Resources.textPackingGroup}" ItemsSource="{x:Static util:GlobalStructures.PackingGroups}" IsReadOnly="True" Width="auto">
+                                        <DataGridComboBoxColumn.ElementStyle>
+                                            <Style TargetType="ComboBox">
+                                                <Setter Property="SelectedIndex" Value="{Binding PackingGroup,  UpdateSourceTrigger=PropertyChanged}" />
+                                            </Style>
+                                        </DataGridComboBoxColumn.ElementStyle>
+                                    </DataGridComboBoxColumn>
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textProperShippingName}" Binding="{Binding ProperShippingName}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textIMOClassDivision}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textTechnicalName}" Binding="{Binding TechnicalName}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textNetExplosiveMass}" Binding="{Binding NetExplosiveMass_KGM, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textRadioNuclideName}" Binding="{Binding Class7NuclideName}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textMaxActivity}" Binding="{Binding Class7MaxActivity_BQL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textCategory}" Binding="{Binding Class7Category}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textTransportIndex}" Binding="{Binding Class7TransportIndex}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textCriticalSafetyIndex}" Binding="{Binding Class7CSI}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textSubsidiaryRisk}" Binding="{Binding SubsidiaryRiskText}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textControlTemperature}" Binding="{Binding ControlTemperature_CEL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyTemperature}" Binding="{Binding EmergencyTemperature_CEL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridCheckBoxColumn Header="{x:Static p:Resources.textMarinePollutant}" Binding="{Binding MarinePollutant}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textNumberOfPackages}" Binding="{Binding NumberOfPackages}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPackageType}" Binding="{Binding PackageType}" IsReadOnly="True" Width="auto" />
+                                    <DataGridCheckBoxColumn Header="{x:Static p:Resources.textLimitedQuantity}" Binding="{Binding LimitedQuantities}" IsReadOnly="True" Width="auto" />
+                                    <DataGridCheckBoxColumn Header="{x:Static p:Resources.textExceptedQuantities}" Binding="{Binding ExceptedQuantities}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textNetQuantity}" Binding="{Binding NetQuantity_KGM, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textGrossQuantity}" Binding="{Binding GrossQuantity_KGM, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
+                                    <!--DataGridTextColumn Header="{x:Static p:Resources.textExceptedQuantities}" Binding="{Binding ExceptedQuantities, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" /-->
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textCargoVolume}" Binding="{Binding Volume_MTQ, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
+                                    <DataGridCheckBoxColumn Header="{x:Static p:Resources.textGeneralCargo}" Binding="{Binding GeneralCargoIBC}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textContainerNo}" Binding="{Binding ContainerNumber}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textVehicleLicensePlate}" Binding="{Binding VehicleLicenseNumber}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textSubsidiaryRisk}" Binding="{Binding SubsidiaryRiskText}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionBay}" Binding="{Binding Bay}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionRow}" Binding="{Binding Row}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionTier}" Binding="{Binding Tier}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
+                                    <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
 
-                <TextBlock x:Name="textBlock102" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text102IBCData}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid x:Name="dataGridIBCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                         AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textProductName}" Binding="{Binding ProductName}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPollutionCategory}" Binding="{Binding PollutionCategoryDisplay}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRisks}" Binding="{Binding HazardsDisplay}" IsReadOnly="True" Width="auto" />
-                        <DataGridCheckBoxColumn Header="{x:Static p:Resources.textColumsOfIBC}" Binding="{Binding SpecRef15_19}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFlashpointInformation}" Binding="{Binding FlashpointInformationDisplay}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
-
-                <TextBlock x:Name="textBlock103" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text103IGCData}" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid x:Name="dataGridIGCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"
-                         AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textProductName}" Binding="{Binding ProductName}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textIMOClassSubclass}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
-
-                <TextBlock x:Name="textBlock104" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text104IMSBCData}" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid x:Name="dataGridIMSBCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2"
-                         AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textBulkCargoShippingName}" Binding="{Binding BulkCargoShippingName}" IsReadOnly="True" Width="auto" />
-                        <DataGridCheckBoxColumn Header="{x:Static p:Resources.textMaterialHazard}" Binding="{Binding MHB}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textIMOClassSubclass}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
-                        <DataGridComboBoxColumn Header="{x:Static p:Resources.textIMOHazardClass}" ItemsSource="{x:Static util:GlobalStructures.imoHazardClasses}" IsReadOnly="True" Width="auto">
-                            <DataGridComboBoxColumn.ElementStyle>
-                                <Style TargetType="ComboBox">
-                                    <Setter Property="SelectedIndex" Value="{Binding IMOHazardClass,  UpdateSourceTrigger=PropertyChanged}" />
-                                </Style>
-                            </DataGridComboBoxColumn.ElementStyle>
-                        </DataGridComboBoxColumn>
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
-
-                <TextBlock x:Name="textBlock105" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text105MARPOLData}" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid x:Name="dataGridMARPOLItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="2"
-                         AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding Name}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFlashpointInformation}" Binding="{Binding FlashpointInformationDisplay}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
-
-                <TextBlock x:Name="textBlock106" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text106IMDGData}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid x:Name="dataGridIMDGItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="12" Grid.ColumnSpan="2"
-                         AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="auto" />
-                        <DataGridComboBoxColumn Header="{x:Static p:Resources.textPackingGroup}" ItemsSource="{x:Static util:GlobalStructures.PackingGroups}" IsReadOnly="True" Width="auto">
-                            <DataGridComboBoxColumn.ElementStyle>
-                                <Style TargetType="ComboBox">
-                                    <Setter Property="SelectedIndex" Value="{Binding PackingGroup,  UpdateSourceTrigger=PropertyChanged}" />
-                                </Style>
-                            </DataGridComboBoxColumn.ElementStyle>
-                        </DataGridComboBoxColumn>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textProperShippingName}" Binding="{Binding ProperShippingName}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textIMOClassDivision}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textTechnicalName}" Binding="{Binding TechnicalName}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textNetExplosiveMass}" Binding="{Binding NetExplosiveMass_KGM, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRadioNuclideName}" Binding="{Binding Class7NuclideName}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textMaxActivity}" Binding="{Binding Class7MaxActivity_BQL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCategory}" Binding="{Binding Class7Category}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textTransportIndex}" Binding="{Binding Class7TransportIndex}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCriticalSafetyIndex}" Binding="{Binding Class7CSI}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textSubsidiaryRisk}" Binding="{Binding SubsidiaryRiskText}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textControlTemperature}" Binding="{Binding ControlTemperature_CEL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyTemperature}" Binding="{Binding EmergencyTemperature_CEL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
-                        <DataGridCheckBoxColumn Header="{x:Static p:Resources.textMarinePollutant}" Binding="{Binding MarinePollutant}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textNumberOfPackages}" Binding="{Binding NumberOfPackages}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPackageType}" Binding="{Binding PackageType}" IsReadOnly="True" Width="auto" />
-                        <DataGridCheckBoxColumn Header="{x:Static p:Resources.textLimitedQuantity}" Binding="{Binding LimitedQuantities}" IsReadOnly="True" Width="auto" />
-                        <DataGridCheckBoxColumn Header="{x:Static p:Resources.textExceptedQuantities}" Binding="{Binding ExceptedQuantities}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textNetQuantity}" Binding="{Binding NetQuantity_KGM, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textGrossQuantity}" Binding="{Binding GrossQuantity_KGM, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
-                        <!--DataGridTextColumn Header="{x:Static p:Resources.textExceptedQuantities}" Binding="{Binding ExceptedQuantities, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" /-->
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCargoVolume}" Binding="{Binding Volume_MTQ, StringFormat={}{0:N2}}" IsReadOnly="True" Width="auto" />
-                        <DataGridCheckBoxColumn Header="{x:Static p:Resources.textGeneralCargo}" Binding="{Binding GeneralCargoIBC}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textContainerNo}" Binding="{Binding ContainerNumber}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textVehicleLicensePlate}" Binding="{Binding VehicleLicenseNumber}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textSubsidiaryRisk}" Binding="{Binding SubsidiaryRiskText}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionBay}" Binding="{Binding Bay}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionRow}" Binding="{Binding Row}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionTier}" Binding="{Binding Tier}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
-
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
+                                </DataGrid.Columns>
+                            </enictrl:ENIDataGrid>
+                        </Grid>
+                    </TabItem>
+                </TabControl>
             </Grid>
         </ScrollViewer>
     </GroupBox>
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml b/ENI2/SheetDisplayControls/PortControl.xaml
index cc69c225..a719dca8 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml
+++ b/ENI2/SheetDisplayControls/PortControl.xaml
@@ -10,263 +10,118 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
              mc:Ignorable="d" 
-             d:DesignHeight="2450" d:DesignWidth="800">
+             d:DesignHeight="1050" d:DesignWidth="800">
     <GroupBox Name="portCallGroupBox" Header="{x:Static p:Resources.text2PortCall}">
-        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width=".35*"/>
-                    <ColumnDefinition Width=".65*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="120" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="140" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="140" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="56" />
-                    <RowDefinition Height="56" />
-                    <RowDefinition Height="280" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="140" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="140" />
-
-                </Grid.RowDefinitions>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text21ReferenceNumbers}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textVisitTransitId}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxDisplayId" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="1" IsReadOnly="True" Margin="2" VerticalContentAlignment="Center" />
-                <Label HorizontalAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text22PortOperations}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
-                <GroupBox Grid.Row="4" Grid.ColumnSpan="2" Name="groupBoxCallPurpose" Header="{x:Static p:Resources.textCallPurposes}" >
-                    <enictrl:ENIDataGrid x:Name="dataGridCallPurposes" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                     SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding CallPurposeCode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding CallPurposeDescription, Mode=TwoWay}" IsReadOnly="True" Width="0.9*" />
-                        </DataGrid.Columns>
-                    </enictrl:ENIDataGrid>
-                </GroupBox>
-                <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textPortArea}" Name="label_INFOPortArea" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                <Grid Grid.Row="5" Grid.Column="1">
+        <TabControl>
+            <TabItem Header="{x:Static p:Resources.textTab21}">
+                <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width=".7*" />
-                        <ColumnDefinition Width=".3*" />
-                    </Grid.ColumnDefinitions>
-                    <ComboBox Grid.Row="0" Grid.Column="0" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
-                    <Button Grid.Row="0" Grid.Column="1" x:Name="buttonSearchPortArea" Margin="2" Content="Lookup port area" Click="buttonSearchPortArea_Click" />
-                </Grid>
-                <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textRequestedPositionInPortOfCall}" Name="label_INFORequestedBerth" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                <TextBox Grid.Row="6" Grid.Column="1" Name="textRequestedPostionInPortOfCall" Margin="2" Text="{Binding RequestedPositionInPortOfCall, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                <TextBox Grid.Row="7" Grid.Column="1" Grid.RowSpan="1" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                <TextBox Grid.Row="8" Grid.Column="1" Grid.RowSpan="1" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <Label Content="{x:Static p:Resources.textPlannedOperations}" Grid.Column="0" Grid.Row="9" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <TextBox Text="{Binding PlannedOperations, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxPlannedOperations" Grid.Column="1" Grid.Row="9"  Margin="2,2,2,2" VerticalContentAlignment="Center" MaxLength="99"/>
-                <Label Content="{x:Static p:Resources.textPlannedInspection}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <TextBox Text="{Binding PlannedWorks, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxPlannedWorks" Grid.Column="1" Grid.Row="10"  Margin="2,2,2,2" MaxLength="255" />
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text23Agency}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textAgentTemplate}" Name="labelAgentTemplate" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="14" Grid.Column="0" Content="{x:Static p:Resources.textCompanyName}" Name="label_AgentCompanyName" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textStreetNumber}" Name="label_AgentStreetAndNumber" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textPostalCode}" Name="label_AgentPostalCode" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="17" Grid.Column="0" Content="{x:Static p:Resources.textCity}" Name="label_AgentCity" Margin="0,0,10,0" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="0" Content="{x:Static p:Resources.textCountry}" Name="label_AgentCountry" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="19" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" Name="label_AgentPhone"  Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="20" Grid.Column="0" Content="{x:Static p:Resources.textFax}" Name="label_AgentFax" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="21" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_AgentEMail" Margin="0,0,10,0" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="22" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" Name="label_AgentLastName" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="23" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" Name="label_AgentFirstName" Margin="0,0,10,0"/>
-
-                <ComboBox Grid.Row="12" Grid.Column="1" Name="comboBox_AgentTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="AgentTitle" SelectionChanged="comboBox_AgentTemplate_SelectionChanged" />
-                <Grid Grid.Column="0" Grid.Row="13" HorizontalAlignment="Right">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="26" />
-                    </Grid.ColumnDefinitions>
-                    <Button Name="buttonSetTemplate" Margin="2"  Click="buttonSetTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Apply template" HorizontalContentAlignment="Right" IsEnabled="False">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="../Resources/check.png" Margin="0,0,0,0" Height="20" Width="20" />
-                        </StackPanel>
-                    </Button>
-                </Grid>
-                <Grid Grid.Row="13" Grid.Column="1" Name="gridTemplateControls" Visibility="Visible">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <!-- Name -->
-                        <ColumnDefinition Width="26"/>
-                        <!-- Save button -->
-                        <ColumnDefinition Width="26"/>
-                        <!-- Delete button -->
-                        <ColumnDefinition Width="52"/>
-                        <!-- Undo button -->
-                    </Grid.ColumnDefinitions>
-                    <TextBox Grid.Column="0" Margin="2" Name="textBoxTemplateTitle" VerticalContentAlignment="Center"/>
-                    <Button Name="buttonSaveTemplate" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSaveTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Save template">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="../Resources/floppy_disk_blue.png" Margin="0,0,0,0" Height="20" Width="20" />
-                        </StackPanel>
-                    </Button>
-                    <Button Name="buttonDeleteTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonDeleteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="../Resources/delete.png" Margin="0,0,0,0" Height="20" Width="20" />
-                        </StackPanel>
-                    </Button>
-                    <Button Name="buttonUndoTemplate" Grid.Column="3" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Undo last overwrite" IsEnabled="False">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="../Resources/undo.png" Margin="0,0,0,0" Height="20" Width="20" />
-                        </StackPanel>
-                    </Button>
-                </Grid>
-
-                <TextBox Grid.Row="14" Grid.Column="1" Name="textBox_AgentCompanyName" MaxLength="99" Margin="2" Text="{Binding AgentCompanyName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="15" Grid.Column="1" Name="textBox_AgentStreetAndNumber" MaxLength="99" Margin="2" Text="{Binding AgentStreetAndNumber, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="16" Grid.Column="1" Name="textBox_AgentPostalCode" MaxLength="99" Margin="2" Text="{Binding AgentPostalCode, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="17" Grid.Column="3" Name="textBox_AgentCity" MaxLength="99" Margin="2" Text="{Binding AgentCity, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="18" Grid.Column="1" Name="textBox_AgentCountry" MaxLength="99" Margin="2" Text="{Binding AgentCountry, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
-                <TextBox Grid.Row="19" Grid.Column="1" Name="textBox_AgentPhone" MaxLength="99" Margin="2" Text="{Binding AgentPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="20" Grid.Column="3" Name="textBox_AgentFax" MaxLength="99" Margin="2" Text="{Binding AgentFax, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="21" Grid.Column="1" Name="textBox_AgentEMail" MaxLength="99" Margin="2" Text="{Binding AgentEMail, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="22" Grid.Column="1" Name="textBox_AgentLastName" MaxLength="99" Margin="2" Text="{Binding AgentLastName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="23" Grid.Column="3" Name="textBox_AgentFirstName" MaxLength="99" Margin="2" Text="{Binding AgentFirstName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text24Invoice}" Grid.Column="0" Grid.Row="24" Grid.ColumnSpan="2"/>
-                <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="25" Grid.Column="0" Grid.ColumnSpan="2">
-                    <enictrl:ENIDataGrid x:Name="dataGridSERV" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                             AutoGenerateColumns="False" Margin="0,5,0,0">
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textServiceName}" Binding="{Binding ServiceName, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textServiceBeneficiary}" Binding="{Binding ServiceBeneficiary, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textServiceInvoiceRecipient}" Binding="{Binding ServiceInvoiceRecipient, Mode=TwoWay}" IsReadOnly="True" Width="0.4*" />
-                        </DataGrid.Columns>
-                    </enictrl:ENIDataGrid>
-                </GroupBox>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text25CargeOnBoard}" Grid.Column="0" Grid.Row="26" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="27" Grid.Column="0" Content="{x:Static p:Resources.textGeneralCargoDescription}" Name="label_GeneralCargoDescription" Margin="0,0,10,0"/>
-                <ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="27" Grid.Column="1" IsEditable="True" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2"  IsTextSearchEnabled="True"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="28" Grid.Column="0" Content="{x:Static p:Resources.textFumigatedBulkCargo}" Name="label_INFOFumigatedBulkCargo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                <CheckBox Grid.Row="28" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2"/>
-                <Label Content="{x:Static p:Resources.textTankerCondition}" Grid.Column="0" Grid.Row="29" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <ComboBox Grid.Row="29" Grid.Column="1" Name="comboBoxConditionCargoBallastTanks" Margin="2" SelectedIndex="{Binding ConditionCargoBallastTanks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
-                <Label Content="{x:Static p:Resources.textTankerNatureOfCargo}" Grid.Column="0" Grid.Row="30" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <TextBox Text="{Binding NatureOfCargo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxNatureOfCargo" Grid.Column="1" Grid.Row="30"  Margin="2,2,2,2"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" VerticalContentAlignment="Center" MaxLength="99" />
-                <Label Content="{x:Static p:Resources.textTankerVolumeOfCargo}" Grid.Column="0" Grid.Row="31" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <xctk:DoubleUpDown Grid.Row="31" Grid.Column="1" Name="doubleUpDownVolumeOfCargo" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N3" Value="{Binding VolumeOfCargo, Mode=TwoWay}"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" TextAlignment="Left"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text26CargoPort}" Grid.Column="0" Grid.Row="32" Grid.ColumnSpan="2"/>
-                <GroupBox Name="ladgGroupBox" Header="{x:Static p:Resources.textLadg}" Grid.Row="33" Grid.Column="0" Grid.ColumnSpan="2">
-                    <enictrl:ENIDataGrid x:Name="dataGridLADG" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                             AutoGenerateColumns="False" Margin="0,5,0,0">
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoHandlingType}" Binding="{Binding CargoHandlingTypeDisplay}" IsReadOnly="True" Width="0.15*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textLACodes}" Binding="{Binding CargoLACode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoCodeNST}" Binding="{Binding CargoCodeNST, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoCodeNST3}" Binding="{Binding CargoCodeNST_3, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoNumberOfItems}" IsReadOnly="False" Width="0.15*">
-                                <DataGridTextColumn.Binding>
-                                    <Binding Path="CargoNumberOfItems" Mode="TwoWay">
-                                        <Binding.ValidationRules>
-                                            <util:NumberValidationRule MaxValue="9999999" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoGrossQuantity}" IsReadOnly="False" Width="0.15*">
-                                <DataGridTextColumn.Binding>
-                                    <Binding Path="CargoGrossQuantity_TNE" Mode="TwoWay" StringFormat="N3">
-                                        <Binding.ValidationRules>
-                                            <util:NumberValidationRule MaxValue="1000000" MinValue="0" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoPortOfLoading}" Binding="{Binding PortOfLoading, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoPortOfDischarge}" Binding="{Binding PortOfDischarge, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
-                        </DataGrid.Columns>
-                    </enictrl:ENIDataGrid>
-                </GroupBox>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text27Waste}" Grid.Column="0" Grid.Row="34" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="35" Grid.Column="0" Content="{x:Static p:Resources.textLastPortWasteDischarge}" Name="label_WasteLastPortDischarged" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="36" Grid.Column="0" Content="{x:Static p:Resources.textWasteDateLastDisposal}" Name="label_DateOfLastDisposal" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="37" Grid.Column="0" Content="{x:Static p:Resources.textWasteDisposalServiceProviders}" Name="label_WasteDisposalServiceProviders" Margin="0,0,10,0"/>
-                <enictrl:LocodeControl Grid.Row="35" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
-                <DatePicker Grid.Row="36" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Mode=TwoWay}" DisplayDateStart="1/1/1800" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
-                    <DatePicker.BlackoutDates>
-                        <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
-                        <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
-                    </DatePicker.BlackoutDates>
-                </DatePicker>
-                <TextBox Grid.Row="37" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="1" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText, Converter={util:TrimStringConverter}}" Margin="2" />
-                <Label Grid.Row="38" Grid.Column="0" HorizontalContentAlignment="Right" Content="{x:Static p:Resources.textAgentTemplate}" Margin="0,0,10,0" />
-                <Grid Grid.Row="38" Grid.Column="1">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width=".25*" />
-                        <ColumnDefinition Width=".25*" />
-                        <ColumnDefinition Width=".25*" />
-                        <ColumnDefinition Width=".25*" />
+                        <ColumnDefinition Width="220"/>
+                        <ColumnDefinition Width=".65*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="120" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                     </Grid.RowDefinitions>
-                
-                <ComboBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Name="comboBox_WSDPTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="Remark" SelectionChanged="comboBox_WSDPTemplate_SelectionChanged" />
-                    <Grid Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Name="gridWasteTemplateControls" Visibility="Visible">
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text21ReferenceNumbers}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textVisitTransitId}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxDisplayId" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="1" IsReadOnly="True" Margin="2" VerticalContentAlignment="Center" />
+                    <Label HorizontalAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
+
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text22PortOperations}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
+                    <GroupBox Grid.Row="4" Grid.ColumnSpan="2" Name="groupBoxCallPurpose" Header="{x:Static p:Resources.textCallPurposes}" >
+                        <enictrl:ENIDataGrid x:Name="dataGridCallPurposes" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+     SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding CallPurposeCode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding CallPurposeDescription, Mode=TwoWay}" IsReadOnly="True" Width="0.9*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+                    </GroupBox>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textPortArea}" Name="label_INFOPortArea" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                    <Grid Grid.Row="5" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width=".7*" />
+                            <ColumnDefinition Width=".3*" />
+                        </Grid.ColumnDefinitions>
+                        <ComboBox Grid.Row="0" Grid.Column="0" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
+                        <Button Grid.Row="0" Grid.Column="1" x:Name="buttonSearchPortArea" Margin="2" Content="Lookup port area" Click="buttonSearchPortArea_Click" />
+                    </Grid>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textRequestedPositionInPortOfCall}" Name="label_INFORequestedBerth" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                    <TextBox Grid.Row="6" Grid.Column="1" Name="textRequestedPostionInPortOfCall" Margin="2" Text="{Binding RequestedPositionInPortOfCall, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                    <TextBox Grid.Row="7" Grid.Column="1" Grid.RowSpan="1" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                    <TextBox Grid.Row="8" Grid.Column="1" Grid.RowSpan="1" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <Label Content="{x:Static p:Resources.textPlannedOperations}" Grid.Column="0" Grid.Row="9" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <TextBox Text="{Binding PlannedOperations, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxPlannedOperations" Grid.Column="1" Grid.Row="9"  Margin="2,2,2,2" VerticalContentAlignment="Center" MaxLength="99"/>
+                    <Label Content="{x:Static p:Resources.textPlannedInspection}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <TextBox Text="{Binding PlannedWorks, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxPlannedWorks" Grid.Column="1" Grid.Row="10"  Margin="2,2,2,2" MaxLength="255" />
+                </Grid>
+            </TabItem>
+            <TabItem Header="{x:Static p:Resources.textTab22}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition Width=".65*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="140" />
+
+                    </Grid.RowDefinitions>
+                    
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text23Agency}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textAgentTemplate}" Name="labelAgentTemplate" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textCompanyName}" Name="label_AgentCompanyName" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textStreetNumber}" Name="label_AgentStreetAndNumber" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textPostalCode}" Name="label_AgentPostalCode" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textCity}" Name="label_AgentCity" Margin="0,0,10,0" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textCountry}" Name="label_AgentCountry" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" Name="label_AgentPhone"  Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textFax}" Name="label_AgentFax" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_AgentEMail" Margin="0,0,10,0" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" Name="label_AgentLastName" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" Name="label_AgentFirstName" Margin="0,0,10,0"/>
+
+                    <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBox_AgentTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="AgentTitle" SelectionChanged="comboBox_AgentTemplate_SelectionChanged" />
+                    <Grid Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="26" />
+                        </Grid.ColumnDefinitions>
+                        <Button Name="buttonSetTemplate" Margin="2"  Click="buttonSetTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Apply template" HorizontalContentAlignment="Right" IsEnabled="False">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="../Resources/check.png" Margin="0,0,0,0" Height="20" Width="20" />
+                            </StackPanel>
+                        </Button>
+                    </Grid>
+                    <Grid Grid.Row="2" Grid.Column="1" Name="gridTemplateControls" Visibility="Visible">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <!-- Name -->
@@ -277,130 +132,301 @@
                             <ColumnDefinition Width="52"/>
                             <!-- Undo button -->
                         </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0" Margin="2" Name="textBoxWasteTemplateTitle" VerticalContentAlignment="Center"/>
-                        <Button Name="buttonSaveWasteTemplate" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSaveWasteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Save template">
+                        <TextBox Grid.Column="0" Margin="2" Name="textBoxTemplateTitle" VerticalContentAlignment="Center"/>
+                        <Button Name="buttonSaveTemplate" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSaveTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Save template">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Resources/floppy_disk_blue.png" Margin="0,0,0,0" Height="20" Width="20" />
                             </StackPanel>
                         </Button>
-                        <Button Name="buttonDeleteWasteTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonDeleteWasteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
+                        <Button Name="buttonDeleteTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonDeleteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Resources/delete.png" Margin="0,0,0,0" Height="20" Width="20" />
                             </StackPanel>
                         </Button>
-                        <Button Name="buttonUndoWasteTemplate" Grid.Column="3" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoWasteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Undo last overwrite" IsEnabled="False">
+                        <Button Name="buttonUndoTemplate" Grid.Column="3" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Undo last overwrite" IsEnabled="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Resources/undo.png" Margin="0,0,0,0" Height="20" Width="20" />
                             </StackPanel>
                         </Button>
                     </Grid>
-                    <Button Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="1" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
-                    <Button Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" />
+
+                    <TextBox Grid.Row="3" Grid.Column="1" Name="textBox_AgentCompanyName" MaxLength="99" Margin="2" Text="{Binding AgentCompanyName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="4" Grid.Column="1" Name="textBox_AgentStreetAndNumber" MaxLength="99" Margin="2" Text="{Binding AgentStreetAndNumber, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="5" Grid.Column="1" Name="textBox_AgentPostalCode" MaxLength="99" Margin="2" Text="{Binding AgentPostalCode, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="6" Grid.Column="3" Name="textBox_AgentCity" MaxLength="99" Margin="2" Text="{Binding AgentCity, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="7" Grid.Column="1" Name="textBox_AgentCountry" MaxLength="99" Margin="2" Text="{Binding AgentCountry, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
+                    <TextBox Grid.Row="8" Grid.Column="1" Name="textBox_AgentPhone" MaxLength="99" Margin="2" Text="{Binding AgentPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="9" Grid.Column="3" Name="textBox_AgentFax" MaxLength="99" Margin="2" Text="{Binding AgentFax, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="10" Grid.Column="1" Name="textBox_AgentEMail" MaxLength="99" Margin="2" Text="{Binding AgentEMail, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="11" Grid.Column="1" Name="textBox_AgentLastName" MaxLength="99" Margin="2" Text="{Binding AgentLastName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="12" Grid.Column="3" Name="textBox_AgentFirstName" MaxLength="99" Margin="2" Text="{Binding AgentFirstName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text24Invoice}" Grid.Column="0" Grid.Row="13" Grid.ColumnSpan="2"/>
+                    <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="14" Grid.Column="0" Grid.ColumnSpan="2">
+                        <enictrl:ENIDataGrid x:Name="dataGridSERV" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+             AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textServiceName}" Binding="{Binding ServiceName, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textServiceBeneficiary}" Binding="{Binding ServiceBeneficiary, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textServiceInvoiceRecipient}" Binding="{Binding ServiceInvoiceRecipient, Mode=TwoWay}" IsReadOnly="True" Width="0.4*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+                    </GroupBox>
                 </Grid>
-                <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="39" Grid.ColumnSpan="2" CanUserAddRows="False">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding WasteDescription}" IsReadOnly="True" Width="0.15*" />
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteAmountToBeDisposed}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteDisposalAmount_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteMaxCapacity}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteCapacity_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteRetained}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteAmountRetained_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWastePortOfDelivery}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteDisposalPort}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.12*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteGeneratedUntilNextPort}" FontSize="9"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteAmountGeneratedTillNextPort_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
-                <Label HorizontalContentAlignment="Right" Grid.Row="40" Grid.Column="0" Content="{x:Static p:Resources.textNextWasteDisposalPort}" Name="label_NextWasteDisposalPort" Margin="0,0,10,0"/>
-                <enictrl:LocodeControl Grid.Row="40" Grid.Column="1" x:Name="locodeCtrlNextWastePort" LocodeValue="{Binding NextWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
+            </TabItem>
+            <TabItem Header="{x:Static p:Resources.textTab23}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="220"/>
+                        <ColumnDefinition Width=".65*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text28Store}" Grid.Column="0" Grid.Row="41" Grid.ColumnSpan="2"/>
-                <GroupBox Name="storeGroupBox" Header="{x:Static p:Resources.textStore}" Grid.Row="42" Grid.Column="0" Grid.ColumnSpan="2">
-                    <enictrl:ENIDataGrid x:Name="dataGridSTO" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="180" />
+
+                    </Grid.RowDefinitions>
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text25CargeOnBoard}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textGeneralCargoDescription}" Name="label_GeneralCargoDescription" Margin="0,0,10,0"/>
+                    <ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="1" Grid.Column="1" IsEditable="True" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2"  IsTextSearchEnabled="True"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textFumigatedBulkCargo}" Name="label_INFOFumigatedBulkCargo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                    <CheckBox Grid.Row="2" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2"/>
+                    <Label Content="{x:Static p:Resources.textTankerCondition}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxConditionCargoBallastTanks" Margin="2" SelectedIndex="{Binding ConditionCargoBallastTanks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
+                    <Label Content="{x:Static p:Resources.textTankerNatureOfCargo}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <TextBox Text="{Binding NatureOfCargo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxNatureOfCargo" Grid.Column="1" Grid.Row="4"  Margin="2,2,2,2"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" VerticalContentAlignment="Center" MaxLength="99" />
+                    <Label Content="{x:Static p:Resources.textTankerVolumeOfCargo}" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <xctk:DoubleUpDown Grid.Row="5" Grid.Column="1" Name="doubleUpDownVolumeOfCargo" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N3" Value="{Binding VolumeOfCargo, Mode=TwoWay}"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" TextAlignment="Left"/>
+
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text26CargoPort}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"/>
+                    <GroupBox Name="ladgGroupBox" Header="{x:Static p:Resources.textLadg}" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2">
+                        <enictrl:ENIDataGrid x:Name="dataGridLADG" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+             AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCargoHandlingType}" Binding="{Binding CargoHandlingTypeDisplay}" IsReadOnly="True" Width="0.15*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textLACodes}" Binding="{Binding CargoLACode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCargoCodeNST}" Binding="{Binding CargoCodeNST, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCargoCodeNST3}" Binding="{Binding CargoCodeNST_3, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
+
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCargoNumberOfItems}" IsReadOnly="False" Width="0.15*">
+                                    <DataGridTextColumn.Binding>
+                                        <Binding Path="CargoNumberOfItems" Mode="TwoWay">
+                                            <Binding.ValidationRules>
+                                                <util:NumberValidationRule MaxValue="9999999" />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </DataGridTextColumn.Binding>
+                                </DataGridTextColumn>
+
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCargoGrossQuantity}" IsReadOnly="False" Width="0.15*">
+                                    <DataGridTextColumn.Binding>
+                                        <Binding Path="CargoGrossQuantity_TNE" Mode="TwoWay" StringFormat="N3">
+                                            <Binding.ValidationRules>
+                                                <util:NumberValidationRule MaxValue="1000000" MinValue="0" />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </DataGridTextColumn.Binding>
+                                </DataGridTextColumn>
+
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCargoPortOfLoading}" Binding="{Binding PortOfLoading, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCargoPortOfDischarge}" Binding="{Binding PortOfDischarge, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+                    </GroupBox>
+
+                </Grid>
+            </TabItem>
+            <TabItem Header="{x:Static p:Resources.textTab24}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="320"/>
+                        <ColumnDefinition Width=".65*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="56" />
+                        <RowDefinition Height="56" />
+                        <RowDefinition Height="280" />
+                        <RowDefinition Height="28" />
+
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="140" />
+
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="140" />
+                    </Grid.RowDefinitions>
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text27Waste}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textLastPortWasteDischarge}" Name="label_WasteLastPortDischarged" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textWasteDateLastDisposal}" Name="label_DateOfLastDisposal" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textWasteDisposalServiceProviders}" Name="label_WasteDisposalServiceProviders" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl Grid.Row="1" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
+                    <DatePicker Grid.Row="2" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Mode=TwoWay}" DisplayDateStart="1/1/1800" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+                        <DatePicker.BlackoutDates>
+                            <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
+                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                        </DatePicker.BlackoutDates>
+                    </DatePicker>
+                    <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="1" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText, Converter={util:TrimStringConverter}}" Margin="2" />
+                    <Label Grid.Row="4" Grid.Column="0" HorizontalContentAlignment="Right" Content="{x:Static p:Resources.textAgentTemplate}" Margin="0,0,10,0" />
+                    <Grid Grid.Row="4" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width=".25*" />
+                            <ColumnDefinition Width=".25*" />
+                            <ColumnDefinition Width=".25*" />
+                            <ColumnDefinition Width=".25*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                        </Grid.RowDefinitions>
+
+                        <ComboBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Name="comboBox_WSDPTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="Remark" SelectionChanged="comboBox_WSDPTemplate_SelectionChanged" />
+                        <Grid Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Name="gridWasteTemplateControls" Visibility="Visible">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <!-- Name -->
+                                <ColumnDefinition Width="26"/>
+                                <!-- Save button -->
+                                <ColumnDefinition Width="26"/>
+                                <!-- Delete button -->
+                                <ColumnDefinition Width="52"/>
+                                <!-- Undo button -->
+                            </Grid.ColumnDefinitions>
+                            <TextBox Grid.Column="0" Margin="2" Name="textBoxWasteTemplateTitle" VerticalContentAlignment="Center"/>
+                            <Button Name="buttonSaveWasteTemplate" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSaveWasteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Save template">
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Source="../Resources/floppy_disk_blue.png" Margin="0,0,0,0" Height="20" Width="20" />
+                                </StackPanel>
+                            </Button>
+                            <Button Name="buttonDeleteWasteTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonDeleteWasteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Source="../Resources/delete.png" Margin="0,0,0,0" Height="20" Width="20" />
+                                </StackPanel>
+                            </Button>
+                            <Button Name="buttonUndoWasteTemplate" Grid.Column="3" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoWasteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Undo last overwrite" IsEnabled="False">
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Source="../Resources/undo.png" Margin="0,0,0,0" Height="20" Width="20" />
+                                </StackPanel>
+                            </Button>
+                        </Grid>
+                        <Button Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="1" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
+                        <Button Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" />
+                    </Grid>
+                    <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="5" Grid.ColumnSpan="2" CanUserAddRows="False">
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding Name}" IsReadOnly="True" Width="0.15*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" IsReadOnly="True" Width="0.1*">
-                                <DataGridTextColumn.Binding>
-                                    <Binding Path="Quantity" Mode="TwoWay" StringFormat="N3">
-                                        <Binding.ValidationRules>
-                                            <util:NumberValidationRule MaxValue="1000000" MinValue="0" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Header="{x:Static p:Resources.textQuantityUnit}" Binding="{Binding QuantityUnit, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textLocationOnBoard}" Binding="{Binding LocationOnBoard, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textOfficialUse}" Binding="{Binding OfficialUse, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding WasteDescription}" IsReadOnly="True" Width="0.15*" />
+                            <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                <DataGridTemplateColumn.HeaderTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteAmountToBeDisposed}" FontSize="10"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.HeaderTemplate>
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextAlignment="Center" Text="{Binding WasteDisposalAmount_MTQ, StringFormat={}{0:N3}}" />
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                            <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                <DataGridTemplateColumn.HeaderTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteMaxCapacity}" FontSize="10"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.HeaderTemplate>
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextAlignment="Center" Text="{Binding WasteCapacity_MTQ, StringFormat={}{0:N3}}" />
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                            <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                <DataGridTemplateColumn.HeaderTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteRetained}" FontSize="10"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.HeaderTemplate>
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextAlignment="Center" Text="{Binding WasteAmountRetained_MTQ, StringFormat={}{0:N3}}" />
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                            <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                <DataGridTemplateColumn.HeaderTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWastePortOfDelivery}" FontSize="10"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.HeaderTemplate>
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextAlignment="Center" Text="{Binding WasteDisposalPort}" />
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                            <DataGridTemplateColumn IsReadOnly="True" Width="0.12*">
+                                <DataGridTemplateColumn.HeaderTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteGeneratedUntilNextPort}" FontSize="9"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.HeaderTemplate>
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextAlignment="Center" Text="{Binding WasteAmountGeneratedTillNextPort_MTQ, StringFormat={}{0:N3}}" />
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
                         </DataGrid.Columns>
                     </enictrl:ENIDataGrid>
-                </GroupBox>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textNextWasteDisposalPort}" Name="label_NextWasteDisposalPort" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl Grid.Row="6" Grid.Column="1" x:Name="locodeCtrlNextWastePort" LocodeValue="{Binding NextWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
+                    <!--
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text28Store}" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2"/>
+                    <GroupBox Name="storeGroupBox" Header="{x:Static p:Resources.textStore}" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2">
+                        <enictrl:ENIDataGrid x:Name="dataGridSTO" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding Name}" IsReadOnly="True" Width="0.15*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" IsReadOnly="True" Width="0.1*">
+                                    <DataGridTextColumn.Binding>
+                                        <Binding Path="Quantity" Mode="TwoWay" StringFormat="N3">
+                                            <Binding.ValidationRules>
+                                                <util:NumberValidationRule MaxValue="1000000" MinValue="0" />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </DataGridTextColumn.Binding>
+                                </DataGridTextColumn>
+                                <DataGridTextColumn Header="{x:Static p:Resources.textQuantityUnit}" Binding="{Binding QuantityUnit, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textLocationOnBoard}" Binding="{Binding LocationOnBoard, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textOfficialUse}" Binding="{Binding OfficialUse, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+                    </GroupBox>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text29CrewEffects}" Grid.Column="0" Grid.Row="43" Grid.ColumnSpan="2"/>
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text29CrewEffects}" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="2"/>
 
-                <GroupBox Name="effectsGroupBox" Header="{x:Static p:Resources.textEffects}" Grid.Row="44" Grid.Column="0" Grid.ColumnSpan="2">
-                    <enictrl:ENIDataGrid x:Name="dataGridEffects" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textEffects}" Binding="{Binding Effects}" IsReadOnly="True" Width="0.15*" />
-                        </DataGrid.Columns>
-                    </enictrl:ENIDataGrid>
-                </GroupBox>
-
-            </Grid>
-        </ScrollViewer>
+                    <GroupBox Name="effectsGroupBox" Header="{x:Static p:Resources.textEffects}" Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="2">
+                        <enictrl:ENIDataGrid x:Name="dataGridEffects" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textEffects}" Binding="{Binding Effects}" IsReadOnly="True" Width="0.15*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+                    </GroupBox>
+                    -->
+                </Grid>
+            </TabItem>
+        </TabControl>
     </GroupBox>
 </src:DetailBaseControl>
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml.cs b/ENI2/SheetDisplayControls/PortControl.xaml.cs
index 000daf74..74ff3640 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/PortControl.xaml.cs
@@ -175,13 +175,13 @@ namespace ENI2.SheetDisplayControls
 
             if (_stoMessage != null)
             {
-                this.dataGridSTO.Initialize();
-                this.dataGridSTO.ItemsSource = _stoMessage.Elements;
+                // this.dataGridSTO.Initialize();
+                // this.dataGridSTO.ItemsSource = _stoMessage.Elements;
             }
-            // 2.9
 
-            this.dataGridEffects.Initialize();
-            this.dataGridEffects.ItemsSource = _crewMessage.Elements;
+            // 2.9
+            // this.dataGridEffects.Initialize();
+            // this.dataGridEffects.ItemsSource = _crewMessage.Elements;
 
         }
 
diff --git a/ENI2/SheetDisplayControls/ShipDataControl.xaml b/ENI2/SheetDisplayControls/ShipDataControl.xaml
index dbd61a7a..a46889eb 100644
--- a/ENI2/SheetDisplayControls/ShipDataControl.xaml
+++ b/ENI2/SheetDisplayControls/ShipDataControl.xaml
@@ -10,182 +10,199 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
              mc:Ignorable="d" 
-             d:DesignHeight="1450" d:DesignWidth="800">
+             d:DesignHeight="1050" d:DesignWidth="800">
     <GroupBox Name="shipDataGroupBox" Header="{x:Static p:Resources.text3PreArrival}">
-        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width=".35*"/>
-                    <ColumnDefinition Width=".65*" />
-                    <ColumnDefinition Width="25" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
+        <TabControl>
+            <TabItem Header="{x:Static p:Resources.textTab51}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="200"/>
+                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width="25" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+
+                        <RowDefinition Height="8" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+
+                        <RowDefinition Height="8" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+
+                        <RowDefinition Height="8" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+
+                        <RowDefinition Height="8" />
+                        <RowDefinition Height="28" />
+                    </Grid.RowDefinitions>
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text51General}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textVesselName}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxVesselName" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="1" Text="{Binding ShipName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textVesselType}" Margin="0,0,10,0" />
+                    <ComboBox Name="comboBoxVesselType" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="1" SelectedValue="{Binding ShipType}" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textIMO}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxIMO" Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Text="{Binding IMO, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" IsReadOnly="True" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textFlag}" Margin="0,0,10,0" />
+                    <ComboBox Name="comboBoxFlag" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="1" Margin="2" SelectedValue="{Binding Flag}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textPortOfRegistry}" Margin="0,0,10,0" />
+                    <enictrl:LocodeControl x:Name="locodePortOfRegistry" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="1" LocodeValue="{Binding PortOfRegistry, Mode=TwoWay}" LocodeSource="NO_PORT_FLAG" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textCallsign}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxCallsign" Grid.Column="1" Grid.Row="6" Text="{Binding CallSign, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="7"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textMMSI}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="7" Margin="2" Text="{Binding MMSINumber, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" MaxLength="10"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textLengthOverAll}" Margin="0,0,10,0" />
+                    <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Column="1" Grid.Row="9" Margin="2" Value="{Binding LengthOverall_MTR}" ShowButtonSpinner="False" TextAlignment="Left" ParsingNumberStyle="Any" FormatString="N2" />
+                    <Label Content="m" Grid.Column="2" Grid.Row="9" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textBeamOverAll}" Margin="0,0,10,0" />
+                    <xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="1" Grid.Row="10" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" TextAlignment="Left"  ParsingNumberStyle="Any" FormatString="N2" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textGrossTonnage}" Margin="0,0,10,0" />
+                    <xctk:IntegerUpDown Name="integerUpDownGrossTonnage" Grid.Column="1" Grid.Row="11" Margin="2" Value="{Binding GrossTonnage}" ShowButtonSpinner="False" TextAlignment="Left"/>
+                    <Label Content="t" Grid.Column="2" Grid.Row="11" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textNetTonnage}" Margin="0,0,10,0" />
+                    <xctk:IntegerUpDown Name="integerUpDownNetTonnage" Grid.Column="1" Grid.Row="12" Margin="2" Value="{Binding NetTonnage}" ShowButtonSpinner="False" TextAlignment="Left"/>
+                    <Label Content="t" Grid.Column="2" Grid.Row="12" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textDeplacementSummerDraught}" Name="label_INFODeplacementSummerDraught" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                    <xctk:DoubleUpDown Grid.Row="13" Grid.Column="1" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1" TextAlignment="Left"/>
+                    <Label Content="t" Grid.Column="2" Grid.Row="13" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textRegistryDate}" Margin="0,0,10,0" />
+                    <DatePicker Name="datePickerRegistryDateOfIssue" Grid.Row="15" Grid.Column="1" SelectedDate="{Binding RegistryDate, Mode=TwoWay}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+                        <DatePicker.BlackoutDates>
+                            <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
+                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                        </DatePicker.BlackoutDates>
+                    </DatePicker>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textCertificateOfRegistryNumber}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxCertificateRegistry" Grid.Column="1" Grid.Row="16" Margin="2" Text="{Binding CertificateOfRegistryNumber, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" MaxLength="35"/>
+                    <Label Content="{x:Static p:Resources.textLastExpandedInspection  }" Grid.Column="0" Grid.Row="17" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <DatePicker Grid.Column="1" Grid.Row="17" Name="datePickerLastExpandedInspection" VerticalAlignment="Center" SelectedDate="{Binding DateOfLastExpandedInspection, Mode=TwoWay}"  Margin="2,2,2,2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+                        <DatePicker.BlackoutDates>
+                            <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
+                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                        </DatePicker.BlackoutDates>
+                    </DatePicker>
+                    <Label Content="{x:Static p:Resources.textIsDueToInspection  }" Grid.Column="0" Grid.Row="18" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxIsDueToInspection" IsChecked="{Binding IsDueToInspection}" Grid.Row="18" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label Content="{x:Static p:Resources.textPossibleAnchorage  }" Grid.Column="0" Grid.Row="19" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxPossibleAnchorage" IsChecked="{Binding IsDueToInspection}" Grid.Row="19" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="21" Grid.Column="0" Content="{x:Static p:Resources.textCompanyName}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxCompanyName" Grid.Row="21" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyName, Converter={util:TrimStringConverter}}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="22" Grid.Column="0" Content="{x:Static p:Resources.textCompanyId}" Margin="0,0,10,0" />
+                    <TextBox Name="textBoxCompanyId" Grid.Row="22" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyId, Converter={util:TrimStringConverter}}" MaxLength="7" VerticalContentAlignment="Center"/>
+                    <Label Grid.Row="24" Grid.Column="0" HorizontalAlignment="Right" Margin="10,0,0,0" Content="{x:Static p:Resources.textShipEmail}" VerticalContentAlignment="Center" />
+                    <xctk:AutoSelectTextBox Grid.Row="24" Grid.Column="1" Margin="2" x:Name="shipEMailLabel" Text="{Binding HerbergEmailContactReportingVessel}" VerticalContentAlignment="Center" FontWeight="Normal" IsReadOnly="True" AutoSelectBehavior="OnFocus" />
+                </Grid>
+            </TabItem>
+            <TabItem Header="{x:Static p:Resources.textTab52}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="290"/>
+                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width="25" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                    </Grid.RowDefinitions>
                     
-                    <RowDefinition Height="8" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    
-                    <RowDefinition Height="8" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text52SSCEC}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textSanitaryControlExemption}" Name="label_SanitaryControlExemption" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxSanitaryControlExemption" IsChecked="{Binding ValidSanitaryControlExemptionOrCertificateOnBoard}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textPlaceOfIssue}" Name="label_PlaceOfIssue" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxPlaceOfIssue" Grid.Row="2" Grid.Column="1" MaxLength="100" Text="{Binding PlaceOfIssue, Converter={util:TrimStringConverter}}" Margin="2" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0"  Content="{x:Static p:Resources.textDateOfIssue}" Name="label_DateOfIssue" Margin="0,0,10,0"/>
+                    <DatePicker Name="datePickerDateOfIssue" Grid.Row="3" Grid.Column="1" SelectedDate="{Binding DateOfIssue, Mode=TwoWay}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+                        <DatePicker.BlackoutDates>
+                            <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
+                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                        </DatePicker.BlackoutDates>
+                    </DatePicker>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textReinspectionSanitaryControl}" Name="label_ReinspectionSanitaryControl" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxReinspectionSanitary" IsChecked="{Binding SanitaryControlReinspectionRequired}" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center"/>
 
-                    <RowDefinition Height="8" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="8" />
-                    <RowDefinition Height="28" />
-                    
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-
-                    
-
-                </Grid.RowDefinitions>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text51General}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
-
-                <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textVesselName}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxVesselName" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="1" Text="{Binding ShipName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textVesselType}" Margin="0,0,10,0" />
-                <ComboBox Name="comboBoxVesselType" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="1" SelectedValue="{Binding ShipType}" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textIMO}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxIMO" Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Text="{Binding IMO, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" IsReadOnly="True" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textFlag}" Margin="0,0,10,0" />
-                <ComboBox Name="comboBoxFlag" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="1" Margin="2" SelectedValue="{Binding Flag}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textPortOfRegistry}" Margin="0,0,10,0" />
-                <enictrl:LocodeControl x:Name="locodePortOfRegistry" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="1" LocodeValue="{Binding PortOfRegistry, Mode=TwoWay}" LocodeSource="NO_PORT_FLAG" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textCallsign}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxCallsign" Grid.Column="1" Grid.Row="6" Text="{Binding CallSign, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="7"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textMMSI}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="7" Margin="2" Text="{Binding MMSINumber, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" MaxLength="10"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textLengthOverAll}" Margin="0,0,10,0" />
-                <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Column="1" Grid.Row="9" Margin="2" Value="{Binding LengthOverall_MTR}" ShowButtonSpinner="False" TextAlignment="Left" ParsingNumberStyle="Any" FormatString="N2" />
-                <Label Content="m" Grid.Column="2" Grid.Row="9" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textBeamOverAll}" Margin="0,0,10,0" />
-                <xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="1" Grid.Row="10" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" TextAlignment="Left"  ParsingNumberStyle="Any" FormatString="N2" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textGrossTonnage}" Margin="0,0,10,0" />
-                <xctk:IntegerUpDown Name="integerUpDownGrossTonnage" Grid.Column="1" Grid.Row="11" Margin="2" Value="{Binding GrossTonnage}" ShowButtonSpinner="False" TextAlignment="Left"/>
-                <Label Content="t" Grid.Column="2" Grid.Row="11" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textNetTonnage}" Margin="0,0,10,0" />
-                <xctk:IntegerUpDown Name="integerUpDownNetTonnage" Grid.Column="1" Grid.Row="12" Margin="2" Value="{Binding NetTonnage}" ShowButtonSpinner="False" TextAlignment="Left"/>
-                <Label Content="t" Grid.Column="2" Grid.Row="12" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textDeplacementSummerDraught}" Name="label_INFODeplacementSummerDraught" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                <xctk:DoubleUpDown Grid.Row="13" Grid.Column="1" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1" TextAlignment="Left"/>
-                <Label Content="t" Grid.Column="2" Grid.Row="13" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textRegistryDate}" Margin="0,0,10,0" />
-                <DatePicker Name="datePickerRegistryDateOfIssue" Grid.Row="15" Grid.Column="1" SelectedDate="{Binding RegistryDate, Mode=TwoWay}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
-                    <DatePicker.BlackoutDates>
-                        <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
-                        <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
-                    </DatePicker.BlackoutDates>
-                </DatePicker>
-                <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textCertificateOfRegistryNumber}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxCertificateRegistry" Grid.Column="1" Grid.Row="16" Margin="2" Text="{Binding CertificateOfRegistryNumber, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" MaxLength="35"/>
-                <Label Content="{x:Static p:Resources.textLastExpandedInspection  }" Grid.Column="0" Grid.Row="17" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <DatePicker Grid.Column="1" Grid.Row="17" Name="datePickerLastExpandedInspection" VerticalAlignment="Center" SelectedDate="{Binding DateOfLastExpandedInspection, Mode=TwoWay}"  Margin="2,2,2,2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
-                    <DatePicker.BlackoutDates>
-                        <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
-                        <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
-                    </DatePicker.BlackoutDates>
-                </DatePicker>
-                <Label Content="{x:Static p:Resources.textIsDueToInspection  }" Grid.Column="0" Grid.Row="18" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxIsDueToInspection" IsChecked="{Binding IsDueToInspection}" Grid.Row="18" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label Content="{x:Static p:Resources.textPossibleAnchorage  }" Grid.Column="0" Grid.Row="19" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxPossibleAnchorage" IsChecked="{Binding IsDueToInspection}" Grid.Row="19" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="21" Grid.Column="0" Content="{x:Static p:Resources.textCompanyName}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxCompanyName" Grid.Row="21" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyName, Converter={util:TrimStringConverter}}" MaxLength="100" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="22" Grid.Column="0" Content="{x:Static p:Resources.textCompanyId}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxCompanyId" Grid.Row="22" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyId, Converter={util:TrimStringConverter}}" MaxLength="7" VerticalContentAlignment="Center"/>
-                <Label Grid.Row="24" Grid.Column="0" HorizontalAlignment="Right" Margin="10,0,0,0" Content="{x:Static p:Resources.textShipEmail}" VerticalContentAlignment="Center" />
-                <xctk:AutoSelectTextBox Grid.Row="24" Grid.Column="1" Margin="2" x:Name="shipEMailLabel" Text="{Binding HerbergEmailContactReportingVessel}" VerticalContentAlignment="Center" FontWeight="Normal" IsReadOnly="True" AutoSelectBehavior="OnFocus" />
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text52SSCEC}" Grid.Column="0" Grid.Row="25" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="26" Grid.Column="0" Content="{x:Static p:Resources.textSanitaryControlExemption}" Name="label_SanitaryControlExemption" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxSanitaryControlExemption" IsChecked="{Binding ValidSanitaryControlExemptionOrCertificateOnBoard}" Grid.Row="26" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="27" Grid.Column="0" Content="{x:Static p:Resources.textPlaceOfIssue}" Name="label_PlaceOfIssue" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxPlaceOfIssue" Grid.Row="27" Grid.Column="1" MaxLength="100" Text="{Binding PlaceOfIssue, Converter={util:TrimStringConverter}}" Margin="2" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="28" Grid.Column="0"  Content="{x:Static p:Resources.textDateOfIssue}" Name="label_DateOfIssue" Margin="0,0,10,0"/>
-                <DatePicker Name="datePickerDateOfIssue" Grid.Row="28" Grid.Column="1" SelectedDate="{Binding DateOfIssue, Mode=TwoWay}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
-                    <DatePicker.BlackoutDates>
-                        <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
-                        <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
-                    </DatePicker.BlackoutDates>
-                </DatePicker>
-                <Label HorizontalContentAlignment="Right" Grid.Row="29" Grid.Column="0" Content="{x:Static p:Resources.textReinspectionSanitaryControl}" Name="label_ReinspectionSanitaryControl" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxReinspectionSanitary" IsChecked="{Binding SanitaryControlReinspectionRequired}" Grid.Row="29" Grid.Column="1" VerticalAlignment="Center"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text53ISPS}" Grid.Column="0" Grid.Row="30" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" VerticalContentAlignment="Bottom" Grid.Row="31" Grid.Column="0" Content="{x:Static p:Resources.textChiefSecurityOfficer}" Name="label_ChiefSecurityOfficer" Margin="0,0,10,0"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="32" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" Name="label_LastName" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxCSOLastName" Grid.Row="32" Grid.Column="1" MaxLength="100" Text="{Binding CSOLastName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="33" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" Name="label_FirstName" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxCSOFirstName" Grid.Row="33" Grid.Column="1" MaxLength="100" Text="{Binding CSOFirstName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="34" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" Name="label_Phone" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxCSOPhoneName" Grid.Row="34" Grid.Column="1" MaxLength="100" Text="{Binding CSOPhone, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="35" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_EMail" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxCSOEMailName" Grid.Row="35" Grid.Column="1" MaxLength="100" Text="{Binding CSOEMail, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="36" Grid.Column="0" Content="{x:Static p:Resources.textFax}" Name="label_Fax" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxCSOFaxName" Grid.Row="36" Grid.Column="1" MaxLength="100" Text="{Binding CSOFax, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="37" Grid.Column="0" Content="{x:Static p:Resources.textValidISSCOnBoard}" Name="label_ValidISSCOnBoard" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxValidISSCOnBoard" IsChecked="{Binding ValidISSCOnBoard}" Grid.Row="37" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="38" Grid.Column="0" Content="{x:Static p:Resources.textReasonForInvalidISSC}" Name="label_ReasonForInvalidISSC" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxReasonsForNoValidISSC" Grid.Row="38" Grid.Column="1" MaxLength="255" Text="{Binding ReasonsForNoValidISSC, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="39" Grid.Column="0" Content="{x:Static p:Resources.textISSCType}" Name="label_ISSCType" Margin="0,0,10,0"/>
-                <ComboBox Name="comboBoxISSCType" Grid.Row="39" Grid.Column="1" SelectedIndex="{Binding ISSCType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="40" Grid.Column="0" Content="{x:Static p:Resources.textISSCExpirationDate}" Name="label_ISSCExpirationDate" Margin="0,0,10,0"/>
-                <DatePicker Name="datePickerISSCDateOfExpiration" Grid.Row="40" Grid.Column="1" SelectedDate="{Binding ISSCDateOfExpiration}" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
-                    <DatePicker.BlackoutDates>
-                        <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
-                        <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
-                    </DatePicker.BlackoutDates>
-                </DatePicker>
-                <Label HorizontalContentAlignment="Right" Grid.Row="41" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerType}" Name="label_ISSCIssuerType" Margin="0,0,10,0"/>
-                <ComboBox Name="comboBoxISSCIssuerType" Grid.Row="41" Grid.Column="1" SelectedIndex="{Binding ISSCIssuerType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="42" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerName}" Name="label_ISSCIssuerName" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxISSCIssuerName" Grid.Row="42" Grid.Column="1" MaxLength="100" Text="{Binding ISSCIssuerName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="43" Grid.Column="0" Content="{x:Static p:Resources.textApprovedSecPlan}" Name="label_ApprovedSecPlan" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxApprovedSecurityPlanOnBoard" IsChecked="{Binding ApprovedSecurityPlanOnBoard}" Grid.Row="43" Grid.Column="1" VerticalAlignment="Center"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text54TankerDetails}" Grid.Column="0" Grid.Row="44" Grid.ColumnSpan="2"/>
-                <Label Content="{x:Static p:Resources.textTankerHullConfig}" Grid.Column="0" Grid.Row="45" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <ComboBox Grid.Row="45" Grid.Column="1" Name="comboBoxTankerHullConfig" Margin="2" SelectedIndex="{Binding TankerHullConfiguration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
-
-            </Grid>
-        </ScrollViewer>
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text53ISPS}" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2"/>
+                    <Label HorizontalContentAlignment="Right" VerticalContentAlignment="Bottom" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textChiefSecurityOfficer}" Name="label_ChiefSecurityOfficer" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" Name="label_LastName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOLastName" Grid.Row="7" Grid.Column="1" MaxLength="100" Text="{Binding CSOLastName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" Name="label_FirstName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOFirstName" Grid.Row="8" Grid.Column="1" MaxLength="100" Text="{Binding CSOFirstName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" Name="label_Phone" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOPhoneName" Grid.Row="9" Grid.Column="1" MaxLength="100" Text="{Binding CSOPhone, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_EMail" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOEMailName" Grid.Row="10" Grid.Column="1" MaxLength="100" Text="{Binding CSOEMail, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textFax}" Name="label_Fax" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOFaxName" Grid.Row="11" Grid.Column="1" MaxLength="100" Text="{Binding CSOFax, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textValidISSCOnBoard}" Name="label_ValidISSCOnBoard" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxValidISSCOnBoard" IsChecked="{Binding ValidISSCOnBoard}" Grid.Row="12" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textReasonForInvalidISSC}" Name="label_ReasonForInvalidISSC" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxReasonsForNoValidISSC" Grid.Row="13" Grid.Column="1" MaxLength="255" Text="{Binding ReasonsForNoValidISSC, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="14" Grid.Column="0" Content="{x:Static p:Resources.textISSCType}" Name="label_ISSCType" Margin="0,0,10,0"/>
+                    <ComboBox Name="comboBoxISSCType" Grid.Row="14" Grid.Column="1" SelectedIndex="{Binding ISSCType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textISSCExpirationDate}" Name="label_ISSCExpirationDate" Margin="0,0,10,0"/>
+                    <DatePicker Name="datePickerISSCDateOfExpiration" Grid.Row="15" Grid.Column="1" SelectedDate="{Binding ISSCDateOfExpiration}" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+                        <DatePicker.BlackoutDates>
+                            <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
+                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                        </DatePicker.BlackoutDates>
+                    </DatePicker>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerType}" Name="label_ISSCIssuerType" Margin="0,0,10,0"/>
+                    <ComboBox Name="comboBoxISSCIssuerType" Grid.Row="16" Grid.Column="1" SelectedIndex="{Binding ISSCIssuerType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="17" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerName}" Name="label_ISSCIssuerName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxISSCIssuerName" Grid.Row="17" Grid.Column="1" MaxLength="100" Text="{Binding ISSCIssuerName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="0" Content="{x:Static p:Resources.textApprovedSecPlan}" Name="label_ApprovedSecPlan" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxApprovedSecurityPlanOnBoard" IsChecked="{Binding ApprovedSecurityPlanOnBoard}" Grid.Row="18" Grid.Column="1" VerticalAlignment="Center"/>
+                </Grid>
+            </TabItem>
+            <TabItem Header="{x:Static p:Resources.textTab53}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="200"/>
+                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width="25" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                    </Grid.RowDefinitions>
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text54TankerDetails}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                    <Label Content="{x:Static p:Resources.textTankerHullConfig}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxTankerHullConfig" Margin="2" SelectedIndex="{Binding TankerHullConfiguration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
+                </Grid>
+            </TabItem>
+        </TabControl>
     </GroupBox>
 </src:DetailBaseControl>
diff --git a/ENI2/SheetDisplayControls/VoyageControl.xaml b/ENI2/SheetDisplayControls/VoyageControl.xaml
index e59e7eae..4f57b382 100644
--- a/ENI2/SheetDisplayControls/VoyageControl.xaml
+++ b/ENI2/SheetDisplayControls/VoyageControl.xaml
@@ -10,277 +10,313 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
              mc:Ignorable="d" 
-             d:DesignHeight="2450" d:DesignWidth="800">
+             d:DesignHeight="1150" d:DesignWidth="800">
 
     <GroupBox Name="voyageGroupBox" Header="{x:Static p:Resources.textVoyage}">
-        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width=".35*"/>
-                    <ColumnDefinition Width=".65*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="300" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="120" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="300" />
-
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="56" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="36" />
-
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="120" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    
-                    <RowDefinition Height="120" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="300" />
-
-                </Grid.RowDefinitions>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text11PreviousPort}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textLastPort}" Name="label_LastPort" Margin="0,0,10,0"/>
-                <enictrl:LocodeControl Grid.Column="1" Grid.Row="1" Width="Auto" x:Name="locodeControl_LastPort" LocodeValue="{Binding LastPort, Mode=TwoWay}" LocodeSource="SSN" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDLastPort}" Name="label_ETDFromLastport"  Margin="0,0,10,0"/>
-                <xctk:DateTimePicker Grid.Column="1" Grid.Row="2" Value="{Binding ETDFromLastPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromLastPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
-                
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text12IncomingVoyage}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textKielPassagePlanned}" Name="label_KielPassagePlanned" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxKielCanalPassagePlanned" IsChecked="{Binding KielCanalPassagePlanned}" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Checked="checkBoxKielCanalPassagePlanned_Checked" Unchecked="checkBoxKielCanalPassagePlanned_Checked"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textIncomingETANOK}" Name="label_IncomingETANOK" Margin="0,0,10,0"/>
-                <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedIncomming" Grid.Row="5" Grid.Column="1" Value="{Binding KielCanalPassagePlannedIncomming, Converter={util:UtcToLocalDateTimeConverter}}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" AllowTextInput="True" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text13RelevantPortcall}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textPortCall}" Margin="0,0,10,0"/>
-                <enictrl:LocodeControl Grid.Column="1" Grid.Row="7" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" IsEnabled="False" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textETAPortOfCall}" Margin="0,0,10,0" />
-                <xctk:DateTimePicker Grid.Column="1" Grid.Row="8" Value="{Binding ETAToPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textETDPortOfCall}" Margin="0,0,10,0" />
-                <xctk:DateTimePicker Grid.Column="1" Grid.Row="9" Value="{Binding ETDFromPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
-                <Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <xctk:DoubleUpDown Grid.Row="10" Grid.Column="1" Name="doubleUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" FormatString="N2" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text14OutgoingVoyage}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textKielPassagePlanned}" Name="label_KielPassagePlanned_Outgoing" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxKielCanalPassagePlannedOutgoing" IsChecked="{Binding KielCanalPassagePlanned}" Grid.Row="12" Grid.Column="1" VerticalAlignment="Center" Checked="checkBoxKielCanalPassagePlanned_Checked" Unchecked="checkBoxKielCanalPassagePlanned_Checked"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textOutgoingETANOK}" Name="label_OutgoingETANOK" Margin="0,0,10,0"/>
-                <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedOutgoing" Grid.Row="13" Grid.Column="1" Value="{Binding KielCanalPassagePlannedOutgoing, Converter={util:UtcToLocalDateTimeConverter}}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" AllowTextInput="True" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text15NextPort}" Grid.Column="0" Grid.Row="14" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textNextPort}" Name="label_NextPort" Margin="0,0,10,0"/>
-                <enictrl:LocodeControl Grid.Column="1" Grid.Row="15" Width="Auto" x:Name="locodeControl_NextPort" LocodeValue="{Binding NextPort, Mode=TwoWay}" LocodeSource="SSN" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textETANextPort}" Name="label_ETAToNextPort" Margin="0,0,10,0" />
-                <xctk:DateTimePicker Grid.Column="1" Grid.Row="16" Value="{Binding ETAToNextPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToNextPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text16Voyage}" Grid.Column="0" Grid.Row="17" Grid.ColumnSpan="2"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="0" Content="{x:Static p:Resources.textShippingArea}" Name="label_INFOShippingArea" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                <ComboBox Grid.Row="18" Grid.Column="1" x:Name="comboBoxShippingArea" Margin="2" SelectedIndex="{Binding ShippingArea, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
-                <Label HorizontalContentAlignment="Right" Grid.Row="19" Grid.Column="0" Content="{x:Static p:Resources.textTransportMode}" Margin="0,0,10,0" />
-                <ComboBox Name="comboBoxTransportMode" Grid.Column="1" Grid.Row="19" Margin="2" SelectedValue="{Binding TransportMode}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text17Last10PortFacilitiesCalled}" Grid.Column="0" Grid.Row="20" Grid.ColumnSpan="2"/>
-                <StackPanel Grid.Row="21" Orientation="Horizontal" Grid.ColumnSpan="2">
-                    <Button Name="buttonImportExcelLast10PortFacilities" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelLast10PortFacilities_Click" />
-                    <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumL10PEntries" FontWeight="Bold" Text="{Binding LastTenPortFacilitesCalled.Count}" VerticalAlignment="Center"/>
-                    <Label Name="labelL10PEntryCount" Content="{x:Static p:Resources.textEntries}" />
-                </StackPanel>
-                <enictrl:ENIDataGrid Grid.Row="22" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridLast10PortFacilities" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                                             AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortFacilityPortName, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortLocode}" Binding="{Binding PortFacilityPortLoCode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortCountry}" Binding="{Binding PortFacilityPortCountry}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="ATA" Binding="{Binding PortFacilityDateOfArrival, StringFormat=d}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="ATD" Binding="{Binding PortFacilityDateOfDeparture, StringFormat=d}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textGISISCode}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding PortFacilityGISISCode}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textGISISCodeLocode}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding PortFacilityGISISCodeLocode}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textShipSecLevel}" Binding="{Binding PortFacilityShipSecurityLevel, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textSecurityMatters}" Binding="{Binding PortFacilitySecurityMattersToReport}" IsReadOnly="True" Width="0.2*" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
+        <TabControl>
+            <TabItem Header="{x:Static p:Resources.textTab11}">
+                <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="280"/>
+                            <ColumnDefinition Width=".65*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
 
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text18ShipToShip}" Grid.Column="0" Grid.Row="23" Grid.ColumnSpan="2"/>
-                <StackPanel Grid.Row="24" Orientation="Horizontal" Grid.ColumnSpan="2">
-                    <Button Name="buttonImportFromL10P" Margin="2" Content="{x:Static p:Resources.textCopyFromL10P}" Width="220" VerticalAlignment="Center" Click="buttonImportFromL10P_Click" Background="Transparent" />
-                    <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumS2SEntries" FontWeight="Bold" Text="{Binding ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Count}" VerticalAlignment="Center"/>
-                    <Label Name="labelS2SEntryCount" Content="{x:Static p:Resources.textEntries}" />
-                </StackPanel>
-                <enictrl:ENIDataGrid Grid.Row="25" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridShip2ShipActivities" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+
+
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text11PreviousPort}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textLastPort}" Name="label_LastPort" Margin="0,0,10,0"/>
+                        <enictrl:LocodeControl Grid.Column="1" Grid.Row="1" Width="Auto" x:Name="locodeControl_LastPort" LocodeValue="{Binding LastPort, Mode=TwoWay}" LocodeSource="SSN" />
+                        <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDLastPort}" Name="label_ETDFromLastport"  Margin="0,0,10,0"/>
+                        <xctk:DateTimePicker Grid.Column="1" Grid.Row="2" Value="{Binding ETDFromLastPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromLastPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
+
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text12IncomingVoyage}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textKielPassagePlanned}" Name="label_KielPassagePlanned" Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxKielCanalPassagePlanned" IsChecked="{Binding KielCanalPassagePlanned}" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Checked="checkBoxKielCanalPassagePlanned_Checked" Unchecked="checkBoxKielCanalPassagePlanned_Checked"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textIncomingETANOK}" Name="label_IncomingETANOK" Margin="0,0,10,0"/>
+                        <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedIncomming" Grid.Row="5" Grid.Column="1" Value="{Binding KielCanalPassagePlannedIncomming, Converter={util:UtcToLocalDateTimeConverter}}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" AllowTextInput="True" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
+
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text13RelevantPortcall}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textPortCall}" Margin="0,0,10,0"/>
+                        <enictrl:LocodeControl Grid.Column="1" Grid.Row="7" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" IsEnabled="False" />
+                        <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textETAPortOfCall}" Margin="0,0,10,0" />
+                        <xctk:DateTimePicker Grid.Column="1" Grid.Row="8" Value="{Binding ETAToPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" />
+                        <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textETDPortOfCall}" Margin="0,0,10,0" />
+                        <xctk:DateTimePicker Grid.Column="1" Grid.Row="9" Value="{Binding ETDFromPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
+                        <Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                        <xctk:DoubleUpDown Grid.Row="10" Grid.Column="1" Name="doubleUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" FormatString="N2" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
+
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text14OutgoingVoyage}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="2"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textKielPassagePlanned}" Name="label_KielPassagePlanned_Outgoing" Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxKielCanalPassagePlannedOutgoing" IsChecked="{Binding KielCanalPassagePlanned}" Grid.Row="12" Grid.Column="1" VerticalAlignment="Center" Checked="checkBoxKielCanalPassagePlanned_Checked" Unchecked="checkBoxKielCanalPassagePlanned_Checked"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textOutgoingETANOK}" Name="label_OutgoingETANOK" Margin="0,0,10,0"/>
+                        <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedOutgoing" Grid.Row="13" Grid.Column="1" Value="{Binding KielCanalPassagePlannedOutgoing, Converter={util:UtcToLocalDateTimeConverter}}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" AllowTextInput="True" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
+
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text15NextPort}" Grid.Column="0" Grid.Row="14" Grid.ColumnSpan="2"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textNextPort}" Name="label_NextPort" Margin="0,0,10,0"/>
+                        <enictrl:LocodeControl Grid.Column="1" Grid.Row="15" Width="Auto" x:Name="locodeControl_NextPort" LocodeValue="{Binding NextPort, Mode=TwoWay}" LocodeSource="SSN" />
+                        <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textETANextPort}" Name="label_ETAToNextPort" Margin="0,0,10,0" />
+                        <xctk:DateTimePicker Grid.Column="1" Grid.Row="16" Value="{Binding ETAToNextPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToNextPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
+
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text16Voyage}" Grid.Column="0" Grid.Row="17" Grid.ColumnSpan="2"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="0" Content="{x:Static p:Resources.textShippingArea}" Name="label_INFOShippingArea" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                        <ComboBox Grid.Row="18" Grid.Column="1" x:Name="comboBoxShippingArea" Margin="2" SelectedIndex="{Binding ShippingArea, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
+                        <Label HorizontalContentAlignment="Right" Grid.Row="19" Grid.Column="0" Content="{x:Static p:Resources.textTransportMode}" Margin="0,0,10,0" />
+                        <ComboBox Name="comboBoxTransportMode" Grid.Column="1" Grid.Row="19" Margin="2" SelectedValue="{Binding TransportMode}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
+
+
+                    </Grid>
+                </ScrollViewer>
+
+            </TabItem>
+            <TabItem Header="{x:Static p:Resources.textTab12}">
+                <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="280"/>
+                            <ColumnDefinition Width=".65*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="300" />
+
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="120" />
+
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="300" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text17Last10PortFacilitiesCalled}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.ColumnSpan="2">
+                            <Button Name="buttonImportExcelLast10PortFacilities" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelLast10PortFacilities_Click" />
+                            <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumL10PEntries" FontWeight="Bold" Text="{Binding LastTenPortFacilitesCalled.Count}" VerticalAlignment="Center"/>
+                            <Label Name="labelL10PEntryCount" Content="{x:Static p:Resources.textEntries}" />
+                        </StackPanel>
+                        <enictrl:ENIDataGrid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridLast10PortFacilities" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                              AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textLocationName}" Binding="{Binding ShipToShipActivityLocationName, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textLocationLocode}" Binding="{Binding ShipToShipActivityLocationLoCode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textDateFrom}" Binding="{Binding ShipToShipActivityDateFrom, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textDateTo}" Binding="{Binding ShipToShipActivityDateTo, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textActivityType}" Binding="{Binding ShipToShipActivityTypeDisplay}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textSecurityMatters}" Binding="{Binding ShipToShipActivitySecurityMattersToReport, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textLatitudeDecimal}" Binding="{Binding ShipToShipActivityLocationCoordinatesLatitude, StringFormat={}{0:N0}}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textLongitudeDecimal}" Binding="{Binding ShipToShipActivityLocationCoordinatesLongitude, StringFormat={}{0:N0}}" IsReadOnly="True" Width="0.1*" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortFacilityPortName, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textPortLocode}" Binding="{Binding PortFacilityPortLoCode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textPortCountry}" Binding="{Binding PortFacilityPortCountry}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="ATA" Binding="{Binding PortFacilityDateOfArrival, StringFormat=d}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="ATD" Binding="{Binding PortFacilityDateOfDeparture, StringFormat=d}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textGISISCode}" FontSize="10"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextAlignment="Center" Text="{Binding PortFacilityGISISCode}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textGISISCodeLocode}" FontSize="10"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextAlignment="Center" Text="{Binding PortFacilityGISISCodeLocode}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTextColumn Header="{x:Static p:Resources.textShipSecLevel}" Binding="{Binding PortFacilityShipSecurityLevel, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textSecurityMatters}" Binding="{Binding PortFacilitySecurityMattersToReport}" IsReadOnly="True" Width="0.2*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text19PortsCalled30days}" Grid.Column="0" Grid.Row="26" Grid.ColumnSpan="2"/>
-                <StackPanel Grid.Row="27" Orientation="Horizontal" Grid.ColumnSpan="2">
-                    <Button Name="buttonImportFromSEC" Margin="2" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportFromSEC_Click" Background="Transparent" />
-                    <Button Name="buttonImportLast30DaysFromExcel" Margin="2" Content="{x:Static p:Resources.textImportFromExcel}" Width="120" VerticalAlignment="Center" Click="buttonImportLast30DaysFromExcel_Click" Background="Transparent" />
-                    <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumPoCEntries" FontWeight="Bold" Text="{Binding PortOfCallLast30Days.Count}" VerticalAlignment="Center"/>
-                    <Label Name="labelPoCEntryCount" Content="{x:Static p:Resources.textEntries}" />
-                </StackPanel>
-                <enictrl:ENIDataGrid Grid.Row="28" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPortOfCallLast30Days" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                             SelectionMode="Extended" AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortCall}" Binding="{Binding PortOfCallLast30DaysLocode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textATDPortOfCall}" Binding="{Binding PortOfCallLast30DaysDateOfDeparture, StringFormat=d}" IsReadOnly="True" Width="0.1*" />
 
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textCrewMemberJoinTheShip}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <CheckBox IsChecked="{Binding PortOfCallLast30DaysCrewMembersJoined}" IsEnabled="False" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCrewMembersJoinedGrid}" Binding="{Binding CrewMembersJoinedText, Mode=TwoWay}" IsReadOnly="True" Width="0.4*" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text18ShipToShip}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
+                        <StackPanel Grid.Row="4" Orientation="Horizontal" Grid.ColumnSpan="2">
+                            <Button Name="buttonImportFromL10P" Margin="2" Content="{x:Static p:Resources.textCopyFromL10P}" Width="220" VerticalAlignment="Center" Click="buttonImportFromL10P_Click" Background="Transparent" />
+                            <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumS2SEntries" FontWeight="Bold" Text="{Binding ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Count}" VerticalAlignment="Center"/>
+                            <Label Name="labelS2SEntryCount" Content="{x:Static p:Resources.textEntries}" />
+                        </StackPanel>
+                        <enictrl:ENIDataGrid Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridShip2ShipActivities" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+             AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textLocationName}" Binding="{Binding ShipToShipActivityLocationName, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textLocationLocode}" Binding="{Binding ShipToShipActivityLocationLoCode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textDateFrom}" Binding="{Binding ShipToShipActivityDateFrom, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textDateTo}" Binding="{Binding ShipToShipActivityDateTo, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textActivityType}" Binding="{Binding ShipToShipActivityTypeDisplay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textSecurityMatters}" Binding="{Binding ShipToShipActivitySecurityMattersToReport, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textLatitudeDecimal}" Binding="{Binding ShipToShipActivityLocationCoordinatesLatitude, StringFormat={}{0:N0}}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textLongitudeDecimal}" Binding="{Binding ShipToShipActivityLocationCoordinatesLongitude, StringFormat={}{0:N0}}" IsReadOnly="True" Width="0.1*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text110MaritimeHealthData}" Grid.Column="0" Grid.Row="29" Grid.ColumnSpan="2"/>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text19PortsCalled30days}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"/>
+                        <StackPanel Grid.Row="7" Orientation="Horizontal" Grid.ColumnSpan="2">
+                            <Button Name="buttonImportFromSEC" Margin="2" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportFromSEC_Click" Background="Transparent" />
+                            <Button Name="buttonImportLast30DaysFromExcel" Margin="2" Content="{x:Static p:Resources.textImportFromExcel}" Width="120" VerticalAlignment="Center" Click="buttonImportLast30DaysFromExcel_Click" Background="Transparent" />
+                            <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumPoCEntries" FontWeight="Bold" Text="{Binding PortOfCallLast30Days.Count}" VerticalAlignment="Center"/>
+                            <Label Name="labelPoCEntryCount" Content="{x:Static p:Resources.textEntries}" />
+                        </StackPanel>
+                        <enictrl:ENIDataGrid Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPortOfCallLast30Days" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+             SelectionMode="Extended" AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textPortCall}" Binding="{Binding PortOfCallLast30DaysLocode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textATDPortOfCall}" Binding="{Binding PortOfCallLast30DaysDateOfDeparture, StringFormat=d}" IsReadOnly="True" Width="0.1*" />
 
-                <TextBlock Grid.Row="30" Grid.RowSpan="2" Text="{x:Static p:Resources.textPersonDiedOnBoard}" Name="textBlock_PersonsDiedOnBoard" Margin="0,0,10,0" TextWrapping="Wrap" VerticalAlignment="Top"/>
-                <CheckBox Name="checkBoxHavePersonsDied" IsChecked="{Binding NonAccidentalDeathsDuringVoyage}" Grid.Row="30" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="31" Grid.Column="0"  Content="{x:Static p:Resources.textNumberOfDeaths}" Name="label_NumberOfDeaths" Margin="0,0,10,0"/>
-                <xctk:IntegerUpDown Name="integerUpDownNumberOfDeaths" Grid.Row="31" Grid.Column="1" Value="{Binding NonAccidentalDeathsDuringVoyageCount}" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
-                <TextBlock Grid.Row="32" Grid.Column="0" Text="{x:Static p:Resources.textDiseaseInfectiousNature}" Name="textBlock_diseaseInfectious"  TextWrapping="Wrap"  Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxIsSuspectedInfectious" IsChecked="{Binding SuspisionInfectiousNature}" Grid.Row="32" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="33" Grid.Column="0" Content="{x:Static p:Resources.textTotalNumberIllHigherThanExpected}" Name="label_TotalNumberHigher" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxTotalNumberSickHigherThan" IsChecked="{Binding NumberOfIllPersonsHigherThanExpected}" Grid.Row="33" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="34" Grid.Column="0"  Content="{x:Static p:Resources.textNumberOfIl}" Name="label_NumberOfIllPersons" Margin="0,0,10,0"/>
-                <xctk:IntegerUpDown Name="integerUpDownNumberOfIllPersons" Grid.Row="34" Grid.Column="1" Value="{Binding NumberOfIllPersons}" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="35" Grid.Column="0" Content="{x:Static p:Resources.textSickPersonsOnBoard}" Name="label_SickPersonsOnBoard" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxSickPersonsOnBoard" IsChecked="{Binding SickPersonsOnBoard}" Grid.Row="35" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="36" Grid.Column="0"  Content="{x:Static p:Resources.textMedicalPractitionerConsulted}" Name="label_WasMedical" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxWasMedicalConsulted" IsChecked="{Binding MedicalConsulted}" Grid.Row="36" Grid.Column="1" VerticalAlignment="Center"/>
-                <TextBlock Grid.Row="37" Grid.Column="0" Text="{x:Static p:Resources.textAwareofConditionInfectious}" Name="label_AwareOfCondition" Margin="0,0,10,0" TextWrapping="Wrap"/>
-                <CheckBox Name="checkBoxAwareOfConditions" IsChecked="{Binding AwareOfFurtherInfections}" Grid.Row="37" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="38" Grid.Column="0"  Content="{x:Static p:Resources.textAnySanitaryMeasures}" Name="labelSanitaryMeasuresApplied" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxSanitaryMeasuresApplied" IsChecked="{Binding SanitaryMeasuresApplied}" Grid.Row="38" Grid.Column="1" VerticalAlignment="Center" Margin="6,0,0,0 "/>
-                <enictrl:ENIDataGrid Grid.Row="39" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridSanitaryMeasures" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                             SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textSanitaryMeasureKind}" Binding="{Binding SanitaryMeasuresType, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textSanitaryMeasurePlace}" Binding="{Binding SanitaryMeasuresLocation, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textSanitaryMeasureDate}" Binding="{Binding SanitaryMeasuresDate, Mode=TwoWay, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.3*" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
-                <Label HorizontalContentAlignment="Right" Grid.Row="40" Grid.Column="0" Content="{x:Static p:Resources.textStowaways}" Name="label_StowawaysOnBoard" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxStowawaysOnBoard" IsChecked="{Binding StowawaysDetected}" Grid.Row="40" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="41" Grid.Column="0"  Content="{x:Static p:Resources.textJoiningLocation}" Name="label_JoiningLocation" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxStowawaysJoiningLocation" Grid.Row="41" Grid.RowSpan="1" Grid.Column="1" MaxLength="100" Text="{Binding StowawaysJoiningLocationText}" Margin="2" VerticalContentAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="42" Grid.Column="0" Content="{x:Static p:Resources.textSickAnimalsOrPets}" Name="label_SickAnimalsOrPets" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxSickAnimalsOrPets" IsChecked="{Binding SickAnimalOrPetOnBoard}" Grid.Row="42" Grid.Column="1" VerticalAlignment="Center"/>
-                <Label HorizontalContentAlignment="Right" Grid.Row="43" Grid.Column="0"  Content="{x:Static p:Resources.textShipVisitedInfectedArea}" Name="labelHasShipVisited" Margin="0,0,10,0" />
-                <CheckBox Name="checkBoxHasShipVisited" IsChecked="{Binding InfectedAreaVisited}" Grid.Row="43" Grid.Column="1" VerticalAlignment="Center" />
-                <enictrl:ENIDataGrid Grid.Row="44" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridInfectedAreas" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                             SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textInfectedAreaPort}" Binding="{Binding InfectedAreaPort, Mode=TwoWay}" IsReadOnly="True" Width="0.5*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textInfectedAreaDate}" Binding="{Binding InfectedAreaDate, Mode=TwoWay, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.5*" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textCrewMemberJoinTheShip}" FontSize="10"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <CheckBox IsChecked="{Binding PortOfCallLast30DaysCrewMembersJoined}" IsEnabled="False" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCrewMembersJoinedGrid}" Binding="{Binding CrewMembersJoinedText, Mode=TwoWay}" IsReadOnly="True" Width="0.4*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
+            <TabItem Header="{x:Static p:Resources.textTab13}">
+                <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="280"/>
+                            <ColumnDefinition Width=".65*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="36" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="56" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="36" />
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text111PortOfItinerary}" Grid.Column="0" Grid.Row="45" Grid.ColumnSpan="2"  />
-                <Label Content="{x:Static p:Resources.textCruiseShip}" Grid.Column="0" Grid.Row="46" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxCruiseShip" IsChecked="{Binding CruiseShip}" Grid.Row="46" Grid.Column="1" VerticalAlignment="Center"/>
-                <Button Name="buttonImportPortOfItineraryFromSEC" Grid.Column="0" Grid.Row="47" Margin="2" HorizontalAlignment="Left" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportPortOfItineraryFromSEC_Click" Background="Transparent" />
-                <enictrl:ENIDataGrid Grid.Row="48" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPortOfItinerary" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                         AutoGenerateColumns="False" Margin="0,5,0,0">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortOfItineraryName, Mode=TwoWay}" IsReadOnly="True" Width="0.5*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textETA}" Binding="{Binding PortOfItineraryETA, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}, StringFormat=\{0:dd.MM.yy HH:mm\}}" IsReadOnly="True" Width="0.5*" />
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
-            </Grid>
-        </ScrollViewer>
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="120" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+
+                            <RowDefinition Height="120" />
+                        </Grid.RowDefinitions>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text110MaritimeHealthData}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+
+                        <TextBlock Grid.Row="1" Grid.RowSpan="2" Text="{x:Static p:Resources.textPersonDiedOnBoard}" Name="textBlock_PersonsDiedOnBoard" Margin="0,0,10,0" TextWrapping="Wrap" VerticalAlignment="Top"/>
+                        <CheckBox Name="checkBoxHavePersonsDied" IsChecked="{Binding NonAccidentalDeathsDuringVoyage}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0"  Content="{x:Static p:Resources.textNumberOfDeaths}" Name="label_NumberOfDeaths" Margin="0,0,10,0"/>
+                        <xctk:IntegerUpDown Name="integerUpDownNumberOfDeaths" Grid.Row="2" Grid.Column="1" Value="{Binding NonAccidentalDeathsDuringVoyageCount}" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
+                        <TextBlock Grid.Row="3" Grid.Column="0" Text="{x:Static p:Resources.textDiseaseInfectiousNature}" Name="textBlock_diseaseInfectious"  TextWrapping="Wrap"  Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxIsSuspectedInfectious" IsChecked="{Binding SuspisionInfectiousNature}" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textTotalNumberIllHigherThanExpected}" Name="label_TotalNumberHigher" Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxTotalNumberSickHigherThan" IsChecked="{Binding NumberOfIllPersonsHigherThanExpected}" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0"  Content="{x:Static p:Resources.textNumberOfIl}" Name="label_NumberOfIllPersons" Margin="0,0,10,0"/>
+                        <xctk:IntegerUpDown Name="integerUpDownNumberOfIllPersons" Grid.Row="5" Grid.Column="1" Value="{Binding NumberOfIllPersons}" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textSickPersonsOnBoard}" Name="label_SickPersonsOnBoard" Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxSickPersonsOnBoard" IsChecked="{Binding SickPersonsOnBoard}" Grid.Row="6" Grid.Column="1" VerticalAlignment="Center"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0"  Content="{x:Static p:Resources.textMedicalPractitionerConsulted}" Name="label_WasMedical" Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxWasMedicalConsulted" IsChecked="{Binding MedicalConsulted}" Grid.Row="7" Grid.Column="1" VerticalAlignment="Center"/>
+                        <TextBlock Grid.Row="8" Grid.Column="0" Text="{x:Static p:Resources.textAwareofConditionInfectious}" Name="label_AwareOfCondition" Margin="0,0,10,0" TextWrapping="Wrap"/>
+                        <CheckBox Name="checkBoxAwareOfConditions" IsChecked="{Binding AwareOfFurtherInfections}" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0"  Content="{x:Static p:Resources.textAnySanitaryMeasures}" Name="labelSanitaryMeasuresApplied" Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxSanitaryMeasuresApplied" IsChecked="{Binding SanitaryMeasuresApplied}" Grid.Row="9" Grid.Column="1" VerticalAlignment="Center" Margin="6,0,0,0 "/>
+                        <enictrl:ENIDataGrid Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridSanitaryMeasures" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+             SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textSanitaryMeasureKind}" Binding="{Binding SanitaryMeasuresType, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textSanitaryMeasurePlace}" Binding="{Binding SanitaryMeasuresLocation, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textSanitaryMeasureDate}" Binding="{Binding SanitaryMeasuresDate, Mode=TwoWay, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.3*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textStowaways}" Name="label_StowawaysOnBoard" Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxStowawaysOnBoard" IsChecked="{Binding StowawaysDetected}" Grid.Row="11" Grid.Column="1" VerticalAlignment="Center"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0"  Content="{x:Static p:Resources.textJoiningLocation}" Name="label_JoiningLocation" Margin="0,0,10,0"/>
+                        <TextBox Name="textBoxStowawaysJoiningLocation" Grid.Row="12" Grid.RowSpan="1" Grid.Column="1" MaxLength="100" Text="{Binding StowawaysJoiningLocationText}" Margin="2" VerticalContentAlignment="Center"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textSickAnimalsOrPets}" Name="label_SickAnimalsOrPets" Margin="0,0,10,0"/>
+                        <CheckBox Name="checkBoxSickAnimalsOrPets" IsChecked="{Binding SickAnimalOrPetOnBoard}" Grid.Row="13" Grid.Column="1" VerticalAlignment="Center"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="14" Grid.Column="0"  Content="{x:Static p:Resources.textShipVisitedInfectedArea}" Name="labelHasShipVisited" Margin="0,0,10,0" />
+                        <CheckBox Name="checkBoxHasShipVisited" IsChecked="{Binding InfectedAreaVisited}" Grid.Row="14" Grid.Column="1" VerticalAlignment="Center" />
+                        <enictrl:ENIDataGrid Grid.Row="15" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridInfectedAreas" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+             SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textInfectedAreaPort}" Binding="{Binding InfectedAreaPort, Mode=TwoWay}" IsReadOnly="True" Width="0.5*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textInfectedAreaDate}" Binding="{Binding InfectedAreaDate, Mode=TwoWay, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.5*" />
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
+            <TabItem Header="{x:Static p:Resources.textTab14}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="280"/>
+                        <ColumnDefinition Width=".65*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="300" />
+                    </Grid.RowDefinitions>
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text111PortOfItinerary}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"  />
+                    <Label Content="{x:Static p:Resources.textCruiseShip}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxCruiseShip" IsChecked="{Binding CruiseShip}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Button Name="buttonImportPortOfItineraryFromSEC" Grid.Column="0" Grid.Row="2" Margin="2" HorizontalAlignment="Left" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportPortOfItineraryFromSEC_Click" Background="Transparent" />
+                    <enictrl:ENIDataGrid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPortOfItinerary" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+        AutoGenerateColumns="False" Margin="0,5,0,0">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortOfItineraryName, Mode=TwoWay}" IsReadOnly="True" Width="0.5*" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textETA}" Binding="{Binding PortOfItineraryETA, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}, StringFormat=\{0:dd.MM.yy HH:mm\}}" IsReadOnly="True" Width="0.5*" />
+                        </DataGrid.Columns>
+                    </enictrl:ENIDataGrid>
+                </Grid>
+            </TabItem>
+        </TabControl>
     </GroupBox>
 </src:DetailBaseControl>
diff --git a/bsmd.database/DatabaseEntity.cs b/bsmd.database/DatabaseEntity.cs
index e038eecd..9ab8a91a 100644
--- a/bsmd.database/DatabaseEntity.cs
+++ b/bsmd.database/DatabaseEntity.cs
@@ -244,7 +244,7 @@ namespace bsmd.database
 
             // das sieht riskanter aus als es ist, diese Funktion wird aber nur für Elemente angewendet, die
             // ISublistElement implementieren
-            foreach(ISublistElement element in sublist)
+            foreach(ISublistElement element in sublist.Cast<ISublistElement>())
             {
                 if (element.Identifier.IsNullOrEmpty()) continue;
                 int elementIdent;
@@ -287,7 +287,7 @@ namespace bsmd.database
         {
             List<DatabaseEntity> tmpList = new List<DatabaseEntity>(sublist);
             sublist.Clear();
-            foreach(ISublistElement element in tmpList)
+            foreach(ISublistElement element in tmpList.Cast<ISublistElement>())
             {
                 element.Identifier = DatabaseEntity.GetNewIdentifier(sublist);
                 sublist.Add(element as DatabaseEntity);