diff --git a/ENI2/SheetDisplayControls/DangerousCargoControl.xaml b/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
index fa90e549..a855a8c8 100644
--- a/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
+++ b/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
@@ -42,7 +42,7 @@
                 <TextBox Grid.Row="2" Grid.Column="1" Name="textBoxDGManifestContactFamilyName" MaxLength="99" Margin="2" Text="{Binding DPGContactFamilyName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
                 <TextBox Grid.Row="3" Grid.Column="1" Name="textBoxDGManifestContactPhone" MaxLength="99" Margin="2" Text="{Binding DPGContactPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
                 <CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="2"/>
-                <ComboBox x:Name="comboBoxVesselClass" Grid.Row="5" Grid.Column="1" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" IsEditable="True" />
+                <ComboBox x:Name="comboBoxVesselClass" Grid.Row="5" Grid.Column="1" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
 
                 <TextBlock Name="textBlockMessageClass" FontWeight="DemiBold" Grid.Row="6" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0" />
                 <Button Content="{x:Static p:Resources.textNewDGItem}" Name="buttonNewItem" Margin="2" Click="buttonNewItem_Click" Grid.Row="6" Grid.Column="1" Background="Transparent" />
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml b/ENI2/SheetDisplayControls/PortControl.xaml
index 513efbdb..1164b36f 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml
+++ b/ENI2/SheetDisplayControls/PortControl.xaml
@@ -53,7 +53,7 @@
                     <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="1" 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="3" 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">
@@ -274,6 +274,8 @@
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
                         <RowDefinition Height="56" />
                         <RowDefinition Height="56" />
                         <RowDefinition Height="530" />
@@ -286,19 +288,23 @@
                         <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">
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textValidExemption}" Name="label_ValidExemption" Margin="0,0,10,0"/>
+                    <CheckBox Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxValidExemption" IsChecked="{Binding WasteDisposalValidExemption, Mode=TwoWay}" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textAccurateDetailsGiven}" Name="label_AccurateDetailsGiven" Margin="0,0,10,0"/>
+                    <CheckBox Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxAccurateCorrectDetails" IsChecked="{Binding ConfirmationOfCorrectness, Mode=TwoWay}" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textLastPortWasteDischarge}" Name="label_WasteLastPortDischarged" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textWasteDateLastDisposal}" Name="label_DateOfLastDisposal" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textWasteDisposalServiceProviders}" Name="label_WasteDisposalServiceProviders" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl Grid.Row="3" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
+                    <DatePicker Grid.Row="4" 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.ColumnSpan="2">
+                    <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="1" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText, Converter={util:TrimStringConverter}}" Margin="2" />
+                    <Label Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right" Content="{x:Static p:Resources.textAgentTemplate}" Margin="0,0,10,0" />
+                    <Grid Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width=".25*" />
                             <ColumnDefinition Width=".25*" />
@@ -342,7 +348,7 @@
                         <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="3" CanUserAddRows="False">
+                    <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="7" Grid.ColumnSpan="3" 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*" />
@@ -409,8 +415,8 @@
                             </DataGridTemplateColumn>
                         </DataGrid.Columns>
                     </enictrl:ENIDataGrid>
-                    <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" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textNextWasteDisposalPort}" Name="label_NextWasteDisposalPort" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl Grid.Row="8" 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">
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml.cs b/ENI2/SheetDisplayControls/PortControl.xaml.cs
index 18672a58..fe65e4fe 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/PortControl.xaml.cs
@@ -170,6 +170,8 @@ namespace ENI2.SheetDisplayControls
             this.dataGridLADG.CreateRequested += DataGridLADG_CreateRequested;
 
             // 2.7
+            this.checkBoxAccurateCorrectDetails.DataContext = _was;
+            this.checkBoxValidExemption.DataContext = _was;
             this.dataGridWaste.Initialize();
             this.dataGridWaste.ItemsSource = _was.Waste;
             this.dataGridWaste.AddingNewItem += DataGridWaste_AddingNewItem;
diff --git a/ENI2/SheetDisplayControls/ShipDataControl.xaml b/ENI2/SheetDisplayControls/ShipDataControl.xaml
index abc6d1ea..7221720b 100644
--- a/ENI2/SheetDisplayControls/ShipDataControl.xaml
+++ b/ENI2/SheetDisplayControls/ShipDataControl.xaml
@@ -124,6 +124,8 @@
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
 
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
@@ -139,54 +141,65 @@
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
                     </Grid.RowDefinitions>
                     
                     <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"/>
 
-                    <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">
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textSimplificationAvailable}" Name="label_MDHSimplificationAvailable" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkSimplification" IsChecked="{Binding MDHSimplification}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textPortOfHealth}" Name="label_PortOfHealth" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl x:Name="locodePortWhereHealthDeclarationWasGiven" Grid.Row="2" Grid.Column="1" LocodeValue="{Binding PortOfCallWhereCompleteMDHNotified, Mode=TwoWay}"  />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" 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="3" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textPlaceOfIssue}" Name="label_PlaceOfIssue" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxPlaceOfIssue" Grid.Row="4" Grid.Column="1" MaxLength="100" Text="{Binding PlaceOfIssue, Converter={util:TrimStringConverter}}" Margin="2" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0"  Content="{x:Static p:Resources.textDateOfIssue}" Name="label_DateOfIssue" Margin="0,0,10,0"/>
+                    <DatePicker Name="datePickerDateOfIssue" Grid.Row="5" 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="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"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="6" 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="6" Grid.Column="1" VerticalAlignment="Center"/>
+
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text53ISPS}" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textSimplificationAvailable}" Name="label_SimplificationAvailable" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxSECSimplification" IsChecked="{Binding SECSimplification}" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textPortWhereSimplWasGiven}" Name="label_PortWhereSimplWasGiven" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl x:Name="locodePortOfCallWhereCompleteSECNotified" Grid.Row="9" Grid.Column="1" LocodeValue="{Binding PortOfCallWhereCompleteSECNotified, Mode=TwoWay}" />
+                    <Label HorizontalContentAlignment="Right" VerticalContentAlignment="Bottom" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textChiefSecurityOfficer}" Name="label_ChiefSecurityOfficer" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" Name="label_LastName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOLastName" Grid.Row="11" Grid.Column="1" MaxLength="100" Text="{Binding CSOLastName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" Name="label_FirstName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOFirstName" Grid.Row="12" Grid.Column="1" MaxLength="100" Text="{Binding CSOFirstName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" Name="label_Phone" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOPhoneName" Grid.Row="13" Grid.Column="1" MaxLength="100" Text="{Binding CSOPhone, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="14" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_EMail" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOEMailName" Grid.Row="14" Grid.Column="1" MaxLength="100" Text="{Binding CSOEMail, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textFax}" Name="label_Fax" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOFaxName" Grid.Row="15" Grid.Column="1" MaxLength="100" Text="{Binding CSOFax, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="16" 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="16" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="17" Grid.Column="0" Content="{x:Static p:Resources.textReasonForInvalidISSC}" Name="label_ReasonForInvalidISSC" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxReasonsForNoValidISSC" Grid.Row="17" Grid.Column="1" MaxLength="255" Text="{Binding ReasonsForNoValidISSC, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="0" Content="{x:Static p:Resources.textISSCType}" Name="label_ISSCType" Margin="0,0,10,0"/>
+                    <ComboBox Name="comboBoxISSCType" Grid.Row="18" Grid.Column="1" SelectedIndex="{Binding ISSCType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="19" Grid.Column="0" Content="{x:Static p:Resources.textISSCExpirationDate}" Name="label_ISSCExpirationDate" Margin="0,0,10,0"/>
+                    <DatePicker Name="datePickerISSCDateOfExpiration" Grid.Row="19" 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="20" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerType}" Name="label_ISSCIssuerType" Margin="0,0,10,0"/>
+                    <ComboBox Name="comboBoxISSCIssuerType" Grid.Row="20" Grid.Column="1" SelectedIndex="{Binding ISSCIssuerType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="21" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerName}" Name="label_ISSCIssuerName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxISSCIssuerName" Grid.Row="21" Grid.Column="1" MaxLength="100" Text="{Binding ISSCIssuerName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="22" 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="22" Grid.Column="1" VerticalAlignment="Center"/>
                 </Grid>
             </TabItem>
             <TabItem Header="{x:Static p:Resources.textTab53}">
@@ -200,10 +213,13 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
+                        <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}"/>
+                    <Label Content="{x:Static p:Resources.textTanker}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxTanker" IsChecked="{Binding Tanker}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label Content="{x:Static p:Resources.textTankerHullConfig}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <ComboBox Grid.Row="2" 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>
diff --git a/ENI2/SheetDisplayControls/ShipDataControl.xaml.cs b/ENI2/SheetDisplayControls/ShipDataControl.xaml.cs
index 764ee5dd..10f954c8 100644
--- a/ENI2/SheetDisplayControls/ShipDataControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/ShipDataControl.xaml.cs
@@ -85,12 +85,16 @@ namespace ENI2.SheetDisplayControls
             this.shipEMailLabel.DataContext = this.Core;
 
             // 5.2
+            this.checkSimplification.DataContext = _mdh;
+            this.locodePortWhereHealthDeclarationWasGiven.DataContext = _mdh;
             this.checkBoxSanitaryControlExemption.DataContext = _mdh;
             this.textBoxPlaceOfIssue.DataContext = _mdh;
             this.datePickerDateOfIssue.DataContext = _mdh;
             this.checkBoxReinspectionSanitary.DataContext = _mdh;
 
             // 5.3
+            this.checkBoxSECSimplification.DataContext = _sec;
+            this.locodePortOfCallWhereCompleteSECNotified.DataContext = _sec;
             this.textBoxCSOLastName.DataContext = _sec;
             this.textBoxCSOFirstName.DataContext = _sec;
             this.textBoxCSOPhoneName.DataContext = _sec;
@@ -107,6 +111,7 @@ namespace ENI2.SheetDisplayControls
             this.checkBoxApprovedSecurityPlanOnBoard.DataContext = _sec;
 
             // 5.4
+            this.checkBoxTanker.DataContext = _pre72H;
             this.comboBoxTankerHullConfig.ItemsSource = hullConfiguration;
             this.comboBoxTankerHullConfig.DataContext = _pre72H;
 
diff --git a/ENI2/SheetDisplayControls/VoyageControl.xaml b/ENI2/SheetDisplayControls/VoyageControl.xaml
index 86ff7422..6a7b9598 100644
--- a/ENI2/SheetDisplayControls/VoyageControl.xaml
+++ b/ENI2/SheetDisplayControls/VoyageControl.xaml
@@ -303,13 +303,17 @@
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
                         <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" 
+                    <Label Content="{x:Static p:Resources.textStowaways}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxStowaways" IsChecked="{Binding StowawaysOnBoard}" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"/>
+
+                    <Button Name="buttonImportPortOfItineraryFromSEC" Grid.Column="0" Grid.Row="3" Margin="2" HorizontalAlignment="Left" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportPortOfItineraryFromSEC_Click" Background="Transparent" />
+                    <enictrl:ENIDataGrid Grid.Row="4" 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" />
diff --git a/ENI2/SheetDisplayControls/VoyageControl.xaml.cs b/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
index 40fd6b2d..a574ae3c 100644
--- a/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
@@ -180,6 +180,14 @@ namespace ENI2.SheetDisplayControls
             this.dataGridInfectedAreas.DeleteRequested += DataGridInfectedAreas_DeleteRequested;
             this.dataGridInfectedAreas.CreateRequested += DataGridInfectedAreas_CreateRequested;
 
+            this.checkBoxStowaways.DataContext = _bpol;
+            this.checkBoxCruiseShip.DataContext = _bpol;
+            this.dataGridPortOfItinerary.Initialize();
+            this.dataGridPortOfItinerary.ItemsSource = _bpol.PortOfItineraries;
+            this.dataGridPortOfItinerary.AddingNewItem += DataGridPortOfItinerary_AddingNewItem;
+            this.dataGridPortOfItinerary.EditRequested += DataGridPortOfItinerary_EditRequested;
+            this.dataGridPortOfItinerary.DeleteRequested += DataGridPortOfItinerary_DeleteRequested;
+            this.dataGridPortOfItinerary.CreateRequested += DataGridPortOfItinerary_CreateRequested;
         }
 
         public override void SetEnabled(bool enabled)
@@ -235,14 +243,10 @@ namespace ENI2.SheetDisplayControls
             this.RegisterIntegerUpDownChange(this.integerUpDownNumberOfIllPersons, Message.NotificationClass.MDH);            
             this.RegisterTextboxChange(this.textBoxStowawaysJoiningLocation, Message.NotificationClass.MDH);
 
-            // 1.11
-            this.checkBoxCruiseShip.DataContext = _bpol;
-            this.dataGridPortOfItinerary.Initialize();
-            this.dataGridPortOfItinerary.ItemsSource = _bpol.PortOfItineraries;
-            this.dataGridPortOfItinerary.AddingNewItem += DataGridPortOfItinerary_AddingNewItem;
-            this.dataGridPortOfItinerary.EditRequested += DataGridPortOfItinerary_EditRequested;
-            this.dataGridPortOfItinerary.DeleteRequested += DataGridPortOfItinerary_DeleteRequested;
-            this.dataGridPortOfItinerary.CreateRequested += DataGridPortOfItinerary_CreateRequested;
+            // 1.11                        
+
+            this.RegisterCheckboxChange(this.checkBoxStowaways, Message.NotificationClass.BPOL);
+            this.RegisterCheckboxChange(this.checkBoxCruiseShip, Message.NotificationClass.BPOL);
 
         }