diff --git a/ENI2/DetailBaseControl.cs b/ENI2/DetailBaseControl.cs
index 13681b01..f8142630 100644
--- a/ENI2/DetailBaseControl.cs
+++ b/ENI2/DetailBaseControl.cs
@@ -185,6 +185,13 @@ namespace ENI2
             this.ResetControlCache?.Invoke(messageGroupName);
         }
 
+        protected virtual void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
         #region event handling for control content changes (signal dirty etc)
 
         protected void RegisterTextboxChange(TextBox textBox, Message.NotificationClass notificationClass)
diff --git a/ENI2/DetailRootControl.xaml b/ENI2/DetailRootControl.xaml
index 17abedfa..d5e5dffe 100644
--- a/ENI2/DetailRootControl.xaml
+++ b/ENI2/DetailRootControl.xaml
@@ -28,7 +28,7 @@
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="0" >
                 <xctk:AutoSelectTextBox x:Name="displayIdLabel" Width="Auto" VerticalContentAlignment="Center" FontWeight="Bold" IsReadOnly="True" BorderThickness="0" AutoSelectBehavior="OnFocus" />
-                <Label Margin="10,0,0,0" Content="Ship e-mail:" VerticalContentAlignment="Center" />
+                <Label Margin="10,0,0,0" Content="{x:Static p:Resources.textShipEmail}" VerticalContentAlignment="Center" />
                 <xctk:AutoSelectTextBox Width="400" x:Name="shipEMailLabel" VerticalContentAlignment="Center" FontWeight="Normal" IsReadOnly="True" BorderThickness="0" AutoSelectBehavior="OnFocus" />
             </StackPanel>
             <Button Name="buttonSave" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSave_Click" BorderThickness="0" Background="Transparent" Visibility="Hidden">
diff --git a/ENI2/DetailRootControl.xaml.cs b/ENI2/DetailRootControl.xaml.cs
index 82642aef..15bfccc8 100644
--- a/ENI2/DetailRootControl.xaml.cs
+++ b/ENI2/DetailRootControl.xaml.cs
@@ -180,6 +180,7 @@ namespace ENI2
                 this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text2PortCall, MessageGroupControlType = typeof(PortControl), ImagePath = "Resources/anchor.png" });
                 this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text3PreArrival, MessageGroupControlType = typeof(PreArrivalControl), ImagePath = "Resources/arrow_down_right_red.png" });
                 this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text4PreDeparture, MessageGroupControlType = typeof(PreDepartureControl), ImagePath = "Resources/arrow_up_right_green.png" });
+                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text5ShipData, MessageGroupControlType = typeof(ShipDataControl), ImagePath = "Resources/containership.png" });
             }
 
             this.listBoxMessages.ItemsSource = this._listBoxList;
diff --git a/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs b/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs
index 85f6004a..ca42390e 100644
--- a/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs
@@ -288,18 +288,7 @@ namespace ENI2.DetailViewControls
             if (this._tiefaMessage.HasViolations) this.tiefaGroupBox.BorderBrush = Brushes.Yellow;
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
         #region special datetimepicker validation popup (OMG)
 
diff --git a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
index a65f09af..7afc4d30 100644
--- a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
@@ -1388,18 +1388,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.groupBoxPassengerList, HighlightService.HighlightStyle.VIOLATION, this._pasMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
         #region Schengen/PAX checkboxes changed event handler    
 
diff --git a/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs b/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs
index feee54ac..c139a318 100644
--- a/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs
@@ -298,18 +298,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.bkrdGroupBox, HighlightService.HighlightStyle.VIOLATION, this._bkrdMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
        
         #region special datetimepicker validation popup (OMG)
 
diff --git a/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs b/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs
index 52e3e405..71634ab1 100644
--- a/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs
@@ -601,18 +601,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.mdhGroupBox, HighlightService.HighlightStyle.VIOLATION, this._mdhMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
         
     }
 }
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index 33d35f5a..02bbea37 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -808,18 +808,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
         
     }
 }
diff --git a/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs b/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
index 937e37ad..8e9633c1 100644
--- a/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
@@ -116,18 +116,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.groupBoxPre72H, HighlightService.HighlightStyle.VIOLATION, this._pre72hMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
     }
 
diff --git a/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs b/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
index b00b922b..a0f18f0a 100644
--- a/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
@@ -240,18 +240,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
         #region AGNT templates combo
 
diff --git a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
index 50e82680..32b4eb4a 100644
--- a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
@@ -363,18 +363,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.ladgGroupBox, HighlightService.HighlightStyle.VIOLATION, this._ladgMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
         #region Spezialbalkon für die Gruppenauswahl im Core (Maersk BHV / Seago usw.)
 
diff --git a/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs b/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
index 460ac63e..ca76db9c 100644
--- a/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
@@ -502,18 +502,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.secGroupBox, HighlightService.HighlightStyle.VIOLATION, this._secMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
         
     }
 }
diff --git a/ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs b/ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs
index d9d893ef..c9faa555 100644
--- a/ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs
@@ -5,10 +5,8 @@
 using System.Windows;
 
 using bsmd.database;
-using ENI2.EditControls;
-using System.Windows.Media;
 using ENI2.Util;
-using System.Windows.Controls;
+
 
 namespace ENI2.DetailViewControls
 {
@@ -104,18 +102,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.shipDataGroupBox, HighlightService.HighlightStyle.VIOLATION, this._statMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
     }
 }
diff --git a/ENI2/DetailViewControls/TowageDetailControl.xaml.cs b/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
index ac889ba6..626bc81d 100644
--- a/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
@@ -308,18 +308,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.groupBoxTowageOnDeparture, HighlightService.HighlightStyle.VIOLATION, this._towdMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
     }
 }
diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 871b5212..046108a0 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -477,18 +477,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.wasGroupBox, HighlightService.HighlightStyle.VIOLATION, this._wasMessage);
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
         #region Excel file import
 
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 036e6652..f8c8c9a1 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -502,6 +502,9 @@
     <Compile Include="SheetDisplayControls\PreDepartureControl.xaml.cs">
       <DependentUpon>PreDepartureControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SheetDisplayControls\ShipDataControl.xaml.cs">
+      <DependentUpon>ShipDataControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SheetDisplayControls\VoyageControl.xaml.cs">
       <DependentUpon>VoyageControl.xaml</DependentUpon>
     </Compile>
@@ -826,6 +829,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SheetDisplayControls\ShipDataControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SheetDisplayControls\VoyageControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index 0982619a..3629bc01 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -1136,6 +1136,51 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 5.1 General.
+        /// </summary>
+        public static string text51General {
+            get {
+                return ResourceManager.GetString("text51General", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 5.2 SSCEC.
+        /// </summary>
+        public static string text52SSCEC {
+            get {
+                return ResourceManager.GetString("text52SSCEC", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 5.3 ISPS.
+        /// </summary>
+        public static string text53ISPS {
+            get {
+                return ResourceManager.GetString("text53ISPS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 5.4 Tanker details.
+        /// </summary>
+        public static string text54TankerDetails {
+            get {
+                return ResourceManager.GetString("text54TankerDetails", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 5. Ship data.
+        /// </summary>
+        public static string text5ShipData {
+            get {
+                return ResourceManager.GetString("text5ShipData", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to About ENI-2.
         /// </summary>
@@ -1613,6 +1658,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Certificate of registry number.
+        /// </summary>
+        public static string textCertificateOfRegistryNumber {
+            get {
+                return ResourceManager.GetString("textCertificateOfRegistryNumber", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Changed.
         /// </summary>
@@ -3224,6 +3278,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Is due to inspection?.
+        /// </summary>
+        public static string textIsDueToInspection {
+            get {
+                return ResourceManager.GetString("textIsDueToInspection", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to ISM company.
         /// </summary>
@@ -3800,6 +3863,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Net tonnage.
+        /// </summary>
+        public static string textNetTonnage {
+            get {
+                return ResourceManager.GetString("textNetTonnage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to New condition.
         /// </summary>
@@ -4439,6 +4511,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Possible anchorage?.
+        /// </summary>
+        public static string textPossibleAnchorage {
+            get {
+                return ResourceManager.GetString("textPossibleAnchorage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Postalcode.
         /// </summary>
@@ -4592,6 +4673,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Registry date.
+        /// </summary>
+        public static string textRegistryDate {
+            get {
+                return ResourceManager.GetString("textRegistryDate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Reinspection sanitary control required?.
         /// </summary>
@@ -4952,6 +5042,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Ship e-mail.
+        /// </summary>
+        public static string textShipEmail {
+            get {
+                return ResourceManager.GetString("textShipEmail", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Shipping area.
         /// </summary>
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index 15929ee0..07a44236 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -2044,4 +2044,37 @@
   <data name="text41General" xml:space="preserve">
     <value>4.1 General</value>
   </data>
+  <data name="text5ShipData" xml:space="preserve">
+    <value>5. Ship data</value>
+  </data>
+  <data name="text51General" xml:space="preserve">
+    <value>5.1 General</value>
+  </data>
+  <data name="text52SSCEC" xml:space="preserve">
+    <value>5.2 SSCEC</value>
+  </data>
+  <data name="text53ISPS" xml:space="preserve">
+    <value>5.3 ISPS</value>
+  </data>
+  <data name="text54TankerDetails" xml:space="preserve">
+    <value>5.4 Tanker details</value>
+  </data>
+  <data name="textNetTonnage" xml:space="preserve">
+    <value>Net tonnage</value>
+  </data>
+  <data name="textRegistryDate" xml:space="preserve">
+    <value>Registry date</value>
+  </data>
+  <data name="textCertificateOfRegistryNumber" xml:space="preserve">
+    <value>Certificate of registry number</value>
+  </data>
+  <data name="textIsDueToInspection" xml:space="preserve">
+    <value>Is due to inspection?</value>
+  </data>
+  <data name="textPossibleAnchorage" xml:space="preserve">
+    <value>Possible anchorage?</value>
+  </data>
+  <data name="textShipEmail" xml:space="preserve">
+    <value>Ship e-mail</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml.cs b/ENI2/SheetDisplayControls/PortControl.xaml.cs
index e3a0b57a..dbaf74f5 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/PortControl.xaml.cs
@@ -948,18 +948,7 @@ namespace ENI2.SheetDisplayControls
             this.DataGridWaste_CreateRequested();
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
     }
 }
diff --git a/ENI2/SheetDisplayControls/PreArrivalControl.xaml.cs b/ENI2/SheetDisplayControls/PreArrivalControl.xaml.cs
index 22321246..31c44567 100644
--- a/ENI2/SheetDisplayControls/PreArrivalControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/PreArrivalControl.xaml.cs
@@ -354,18 +354,6 @@ namespace ENI2.SheetDisplayControls
         }
 
         #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
-
-
+        
     }
 }
diff --git a/ENI2/SheetDisplayControls/PreDepartureControl.xaml.cs b/ENI2/SheetDisplayControls/PreDepartureControl.xaml.cs
index 8d30ae82..5b336776 100644
--- a/ENI2/SheetDisplayControls/PreDepartureControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/PreDepartureControl.xaml.cs
@@ -339,18 +339,7 @@ namespace ENI2.SheetDisplayControls
             this.DataGridTowageOnDeparture_CreateRequested();
         }
 
-        #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
+        #endregion        
 
     }
 }
diff --git a/ENI2/SheetDisplayControls/ShipDataControl.xaml b/ENI2/SheetDisplayControls/ShipDataControl.xaml
new file mode 100644
index 00000000..ff561b66
--- /dev/null
+++ b/ENI2/SheetDisplayControls/ShipDataControl.xaml
@@ -0,0 +1,191 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2" 
+             x:Class="ENI2.SheetDisplayControls.ShipDataControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"             
+             xmlns:p="clr-namespace:ENI2.Properties"
+             xmlns:enictrl="clr-namespace:ENI2.Controls"
+             xmlns:util="clr-namespace:ENI2.Util"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="1450" d:DesignWidth="800">
+    <GroupBox Name="portCallGroupBox" 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" />
+                    
+                    <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" />
+                    
+                    <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>
+    </GroupBox>
+</src:DetailBaseControl>
diff --git a/ENI2/SheetDisplayControls/ShipDataControl.xaml.cs b/ENI2/SheetDisplayControls/ShipDataControl.xaml.cs
new file mode 100644
index 00000000..f27e89f1
--- /dev/null
+++ b/ENI2/SheetDisplayControls/ShipDataControl.xaml.cs
@@ -0,0 +1,173 @@
+// Copyright (c) 2025- schick Informatik
+// Description: Display control of formsheet Tab 5. Ship data
+//
+
+using bsmd.database;
+using System.Windows;
+
+namespace ENI2.SheetDisplayControls
+{
+    /// <summary>
+    /// Interaction logic for ShipDataControl.xaml
+    /// </summary>
+    public partial class ShipDataControl : DetailBaseControl
+    {
+        #region Fields
+
+        private INFO _info;
+        private PRE72H _pre72H;        
+        private SEC _sec;
+        private MDH _mdh;
+        private STAT _stat;
+
+        private static readonly string[] isscTypes = { "Final", "Preliminary" };
+
+        private static readonly string[] isscIssuerTypes = { "Authority", "RSO (Recognized security org.)" };
+
+        private static readonly string[] hullConfiguration = {
+            Properties.Resources.textSingleHull,
+            Properties.Resources.textSingleHullBallast,
+            Properties.Resources.textDoubleHull
+        };
+
+        #endregion
+
+        #region Construction
+
+        public ShipDataControl()
+        {
+            InitializeComponent();
+            Loaded += ShipDataControl_Loaded;
+        }
+
+        #endregion
+
+        #region public override
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            foreach (Message aMessage in this.Messages)
+            {
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.STAT) { this._stat = aMessage.Elements[0] as STAT; this.ControlMessages.Add(aMessage); }
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.SEC) { this._sec = aMessage.Elements[0] as SEC; this.ControlMessages.Add(aMessage); }
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.INFO) { this._info = aMessage.Elements[0] as INFO; this.ControlMessages.Add(aMessage); }
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.PRE72H) { this._pre72H = aMessage.Elements[0] as PRE72H; this.ControlMessages.Add(aMessage); }
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.MDH) { this._mdh = aMessage.Elements[0] as MDH; this.ControlMessages.Add(aMessage); }
+            }
+
+            // 5.1
+            this.textBoxVesselName.DataContext = _stat;
+            this.textBoxIMO.DataContext = this.Core;
+            this.comboBoxVesselType.ItemsSource = STAT.VesselTypeDict;
+            this.comboBoxVesselType.DataContext = _stat;
+            this.comboBoxFlag.ItemsSource = CREW.NationalityDict;
+            this.comboBoxFlag.DataContext = _stat;
+            this.locodePortOfRegistry.DataContext = _stat;
+            this.textBoxCallsign.DataContext = _stat;
+            this.textBoxMMSI.DataContext = _stat;
+
+            this.doubleUpDownLength.DataContext = _stat;
+            this.doubleUpDownBeam.DataContext = _stat;
+            this.integerUpDownGrossTonnage.DataContext = _stat;
+            this.integerUpDownNetTonnage.DataContext = _stat;
+            this.doubleUpDownDisplacementSummerDraught.DataContext = _info;
+
+            this.datePickerRegistryDateOfIssue.DataContext = _stat;
+            this.textBoxCertificateRegistry.DataContext = _stat;
+            this.datePickerLastExpandedInspection.DataContext = _pre72H;
+            this.checkBoxIsDueToInspection.DataContext = _pre72H;
+            this.checkBoxPossibleAnchorage.DataContext = _pre72H;
+
+            this.textBoxCompanyName.DataContext = _stat;
+            this.textBoxCompanyId.DataContext = _stat;
+            this.shipEMailLabel.DataContext = this.Core;
+
+            // 5.2
+            this.checkBoxSanitaryControlExemption.DataContext = _mdh;
+            this.textBoxPlaceOfIssue.DataContext = _mdh;
+            this.datePickerDateOfIssue.DataContext = _mdh;
+            this.checkBoxReinspectionSanitary.DataContext = _mdh;
+
+            // 5.3
+            this.textBoxCSOLastName.DataContext = _sec;
+            this.textBoxCSOFirstName.DataContext = _sec;
+            this.textBoxCSOPhoneName.DataContext = _sec;
+            this.textBoxCSOEMailName.DataContext = _sec;
+            this.textBoxCSOFaxName.DataContext = _sec;
+            this.checkBoxValidISSCOnBoard.DataContext = _sec;
+            this.textBoxReasonsForNoValidISSC.DataContext = _sec;
+            this.comboBoxISSCType.ItemsSource = isscTypes;
+            this.comboBoxISSCType.DataContext = _sec;
+            this.datePickerISSCDateOfExpiration.DataContext = _sec;
+            this.comboBoxISSCIssuerType.ItemsSource = isscIssuerTypes;
+            this.comboBoxISSCIssuerType.DataContext = _sec;
+            this.textBoxISSCIssuerName.DataContext = _sec;
+            this.checkBoxApprovedSecurityPlanOnBoard.DataContext = _sec;
+
+            // 5.4
+            this.comboBoxTankerHullConfig.ItemsSource = hullConfiguration;
+            this.comboBoxTankerHullConfig.DataContext = _pre72H;
+
+        }
+
+        #endregion
+
+        #region event handler
+
+        private void ShipDataControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            // 5.1
+            this.RegisterTextboxChange(this.textBoxVesselName, Message.NotificationClass.STAT);
+            this.RegisterComboboxValueChange(this.comboBoxVesselType, Message.NotificationClass.STAT);
+            this.RegisterComboboxValueChange(this.comboBoxFlag, Message.NotificationClass.STAT);
+            this.RegisterLocodeChange(this.locodePortOfRegistry, Message.NotificationClass.STAT);
+            this.RegisterLocodeChange(this.locodePortOfRegistry, Message.NotificationClass.STAT);
+            this.RegisterTextboxChange(this.textBoxCallsign, Message.NotificationClass.STAT);
+            this.RegisterTextboxChange(this.textBoxMMSI, Message.NotificationClass.STAT);
+
+            this.RegisterDoubleUpDownChange(this.doubleUpDownLength, Message.NotificationClass.STAT);
+            this.RegisterDoubleUpDownChange(this.doubleUpDownBeam, Message.NotificationClass.STAT);
+            this.RegisterIntegerUpDownChange(this.integerUpDownGrossTonnage, Message.NotificationClass.STAT);
+            this.RegisterIntegerUpDownChange(this.integerUpDownNetTonnage, Message.NotificationClass.STAT);
+            this.RegisterDoubleUpDownChange(this.doubleUpDownDisplacementSummerDraught, Message.NotificationClass.INFO);
+
+            this.RegisterDatePickerChange(this.datePickerRegistryDateOfIssue, Message.NotificationClass.STAT);
+            this.RegisterTextboxChange(this.textBoxCertificateRegistry, Message.NotificationClass.STAT);
+            this.RegisterDatePickerChange(this.datePickerLastExpandedInspection, Message.NotificationClass.PRE72H);
+            this.RegisterCheckboxChange(this.checkBoxIsDueToInspection, Message.NotificationClass.PRE72H);
+            this.RegisterCheckboxChange(this.checkBoxPossibleAnchorage, Message.NotificationClass.PRE72H);
+
+            this.RegisterTextboxChange(this.textBoxCompanyName, Message.NotificationClass.STAT);
+            this.RegisterTextboxChange(this.textBoxCompanyId, Message.NotificationClass.STAT);
+
+            // 5.2
+            this.RegisterCheckboxChange(this.checkBoxSanitaryControlExemption, Message.NotificationClass.MDH);
+            this.RegisterTextboxChange(this.textBoxPlaceOfIssue, Message.NotificationClass.MDH);
+            this.RegisterDatePickerChange(this.datePickerDateOfIssue, Message.NotificationClass.MDH);
+            this.RegisterCheckboxChange(this.checkBoxReinspectionSanitary, Message.NotificationClass.MDH);
+
+            // 5.3
+            this.RegisterTextboxChange(this.textBoxCSOLastName, Message.NotificationClass.SEC);
+            this.RegisterTextboxChange(this.textBoxCSOFirstName, Message.NotificationClass.SEC);
+            this.RegisterTextboxChange(this.textBoxCSOPhoneName, Message.NotificationClass.SEC);
+            this.RegisterTextboxChange(this.textBoxCSOFaxName, Message.NotificationClass.SEC);
+            this.RegisterTextboxChange(this.textBoxCSOEMailName, Message.NotificationClass.SEC);
+            this.RegisterCheckboxChange(this.checkBoxValidISSCOnBoard, Message.NotificationClass.SEC);
+            this.RegisterTextboxChange(this.textBoxReasonsForNoValidISSC, Message.NotificationClass.SEC);
+            this.RegisterComboboxIndexChange(this.comboBoxISSCType, Message.NotificationClass.SEC);
+            this.RegisterDatePickerChange(this.datePickerISSCDateOfExpiration, Message.NotificationClass.SEC);
+            this.RegisterComboboxIndexChange(this.comboBoxISSCIssuerType, Message.NotificationClass.SEC);
+            this.RegisterTextboxChange(this.textBoxISSCIssuerName, Message.NotificationClass.SEC);
+            this.RegisterCheckboxChange(this.checkBoxApprovedSecurityPlanOnBoard, Message.NotificationClass.SEC);
+
+            // 5.4
+            this.RegisterComboboxIndexChange(this.comboBoxTankerHullConfig, Message.NotificationClass.PRE72H);
+
+        }
+
+        #endregion
+
+    }
+}
diff --git a/ENI2/SheetDisplayControls/VoyageControl.xaml.cs b/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
index fc124b36..10febc3b 100644
--- a/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
@@ -1021,18 +1021,6 @@ namespace ENI2.SheetDisplayControls
         }
 
         #endregion
-
-        #region mouse wheel
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        #endregion
-
-        
+                
     }
 }