diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config
index 26bd10f2..f39c4f5a 100644
--- a/ENI-2/ENI2/ENI2/App.config
+++ b/ENI-2/ENI2/ENI2/App.config
@@ -26,12 +26,12 @@
                 <value>1000</value>
             </setting>
             <setting name="LockingServerAddress" serializeAs="String">
-              <!--value>http://192.168.2.4/LockingService/LockingService.svc</value-->
-                <value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
+              <value>http://192.168.2.4/LockingService/LockingService.svc</value>
+                <!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-              <!--value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
-              <value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
+              <value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
+                <!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI-2/ENI2/ENI2/DetailBaseControl.cs b/ENI-2/ENI2/ENI2/DetailBaseControl.cs
index 758180b4..94467804 100644
--- a/ENI-2/ENI2/ENI2/DetailBaseControl.cs
+++ b/ENI-2/ENI2/ENI2/DetailBaseControl.cs
@@ -65,6 +65,12 @@ namespace ENI2
         /// </summary>
         public event Action<Message.NotificationClass> NotificationClassChanged;
 
+        /// <summary>
+        /// Eine Maske soll neu erzeugt werden weil sich dort "indirekt" etwas geändert hat durch eine Änderung in einer anderen Maske.
+        /// (Beispiel Copy HAZA nach HAZD Elemente)
+        /// </summary>
+        public event Action<string> ResetControlCache;
+
         #endregion
 
         #region Properties
@@ -124,7 +130,12 @@ namespace ENI2
         protected virtual void OnRequestReload()
         {
             this.RequestReload?.Invoke();
-        }        
+        }
+
+        protected virtual void OnControlCacheReset(string messageGroupName)
+        {
+            this.ResetControlCache?.Invoke(messageGroupName);
+        }
 
         #region event handling for control content changes (signal dirty etc)
 
diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
index b38d5b4c..9547472f 100644
--- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
@@ -127,6 +127,7 @@ namespace ENI2
 
                     detailControl.RequestReload += DetailControl_RequestReload;                    
                     detailControl.NotificationClassChanged += DetailControl_NotificationClassChanged;
+                    detailControl.ResetControlCache += DetailControl_ResetControlCache;
 
                     detailControl.Initialize();
                     detailControl.IsEnabled = !this.LockedByOtherUser;
@@ -160,6 +161,13 @@ namespace ENI2
             }
         }
 
+        private void DetailControl_ResetControlCache(string messageGroupName)
+        {
+            if (messageGroupName.IsNullOrEmpty()) return;
+            if (controlCache.ContainsKey(messageGroupName))
+                controlCache.Remove(messageGroupName);
+        }
+
         private void buttonSave_Click(object sender, RoutedEventArgs e)
         {
             MessageBoxResult result = MessageBox.Show(Properties.Resources.textQuestionSavePage, Properties.Resources.textConfirmation, 
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
index 59a2342a..ded673a4 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
@@ -27,7 +27,7 @@
                         <ColumnDefinition Width="2*" />
                     </Grid.ColumnDefinitions>
                     <Label Content="ATA" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:DateTimePicker Grid.Column="1" Value="{Binding ATAPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
+                    <xctk:DateTimePicker Grid.Column="1" Value="{Binding ATAPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
                 </Grid>
             </GroupBox>
             <GroupBox Name="tiefaGroupBox" Header="{x:Static p:Resources.textDraughtOnArrival}" Grid.Row="1">
@@ -38,7 +38,7 @@
                         <ColumnDefinition Width="2*" />
                     </Grid.ColumnDefinitions>
                     <Label Content="{x:Static p:Resources.textDraughtOnArrivalLabel}" Grid.Column="0"  HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:DoubleUpDown Grid.Row="0" Grid.Column="1" Name="doubleUpDownDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" Value="{Binding DraughtUponArrival_DMT, Mode=TwoWay}"/>
+                    <xctk:DoubleUpDown Grid.Row="0" Grid.Column="1" Name="doubleUpDownDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" Value="{Binding DraughtUponArrival_DMT, Mode=TwoWay}" TextAlignment="Left"/>
                 </Grid>
             </GroupBox>
             <GroupBox Name="pobaGroupBox" Header="{x:Static p:Resources.textPersonOnBoardArrival}" Grid.Row="2">
@@ -54,13 +54,13 @@
                         <RowDefinition Height="28" />
                     </Grid.RowDefinitions>
                     <Label Content="{x:Static p:Resources.textCrewMemberOnBoard}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:IntegerUpDown Value="{Binding TotalCrewMembersOnBoardUponArrival, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" Name="integerUpDownCrewMemberOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+                    <xctk:IntegerUpDown Value="{Binding TotalCrewMembersOnBoardUponArrival, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" Name="integerUpDownCrewMemberOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                     <Label Content="{x:Static p:Resources.textPassengersOnBoard}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:IntegerUpDown Value="{Binding TotalPassengersOnBoardUponArrival, Mode=TwoWay}" Grid.Row="0" Grid.Column="3" Name="integerUpDownPassengersOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+                    <xctk:IntegerUpDown Value="{Binding TotalPassengersOnBoardUponArrival, Mode=TwoWay}" Grid.Row="0" Grid.Column="3" Name="integerUpDownPassengersOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                     <Label Content="{x:Static p:Resources.textStowawaysOnBoard}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:IntegerUpDown Value="{Binding TotalStowawaysOnBoardUponArrival, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" Name="integerUpDownStowawaysOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+                    <xctk:IntegerUpDown Value="{Binding TotalStowawaysOnBoardUponArrival, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" Name="integerUpDownStowawaysOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                     <Label Content="{x:Static p:Resources.textPersonsOnBoard}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:IntegerUpDown Value="{Binding TotalPersonsOnBoardUponArrival, Mode=TwoWay}" Grid.Row="1" Grid.Column="3" Name="integerUpDownPersonsOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+                    <xctk:IntegerUpDown Value="{Binding TotalPersonsOnBoardUponArrival, Mode=TwoWay}" Grid.Row="1" Grid.Column="3" Name="integerUpDownPersonsOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                 </Grid>
                 
             </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
index 624b428e..06a13a57 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
@@ -39,7 +39,7 @@
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortOfItineraryName, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
                             <DataGridTextColumn Binding="{Binding PortOfItineraryLocode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textETA}" Binding="{Binding PortOfItineraryETA, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" Width="0.6*" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textETA}" Binding="{Binding PortOfItineraryETA, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}, StringFormat=\{0:dd.MM.yy HH:mm\}}" IsReadOnly="True" Width="0.6*" />
                         </DataGrid.Columns>
                     </enictrl:ENIDataGrid>
                 </Grid>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
index 897eaddb..451ef3f6 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
@@ -201,6 +201,7 @@ namespace ENI2.DetailViewControls
                     copyMARPOL.Identifier = DatabaseEntity.GetNewIdentifier(this.hazd.MARPOLPositions);
                     this.hazd.MARPOLPositions.Add(copyMARPOL);
                     this.SublistElementChanged(Message.NotificationClass.HAZD);
+                    this.OnControlCacheReset(Properties.Resources.textDGDeparture);
                 }
             }
         }
@@ -220,6 +221,7 @@ namespace ENI2.DetailViewControls
                     copyIMSBC.Identifier = DatabaseEntity.GetNewIdentifier(this.hazd.IMSBCPositions);
                     this.hazd.IMSBCPositions.Add(copyIMSBC);
                     this.SublistElementChanged(Message.NotificationClass.HAZD);
+                    this.OnControlCacheReset(Properties.Resources.textDGDeparture);
                 }
             }
         }
@@ -239,6 +241,7 @@ namespace ENI2.DetailViewControls
                     copyIMDG.Identifier = DatabaseEntity.GetNewIdentifier(this.hazd.IMDGPositions);
                     this.hazd.IMDGPositions.Add(copyIMDG);
                     this.SublistElementChanged(Message.NotificationClass.HAZD);
+                    this.OnControlCacheReset(Properties.Resources.textDGDeparture);
                 }
             }
         }
@@ -258,6 +261,7 @@ namespace ENI2.DetailViewControls
                     copyIGC.Identifier = DatabaseEntity.GetNewIdentifier(this.hazd.IGCPositions);
                     this.hazd.IGCPositions.Add(copyIGC);
                     this.SublistElementChanged(Message.NotificationClass.HAZD);
+                    this.OnControlCacheReset(Properties.Resources.textDGDeparture);
                 }
             }
         }
@@ -277,6 +281,7 @@ namespace ENI2.DetailViewControls
                     copyIBC.Identifier = DatabaseEntity.GetNewIdentifier(this.hazd.IBCPositions);
                     this.hazd.IBCPositions.Add(copyIBC);
                     this.SublistElementChanged(Message.NotificationClass.HAZD);
+                    this.OnControlCacheReset(Properties.Resources.textDGDeparture);
                 }
             }
         }
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
index 39f2135c..4e399da7 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
@@ -27,7 +27,7 @@
                         <ColumnDefinition Width="2*" />
                     </Grid.ColumnDefinitions>
                     <Label Content="ATD" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:DateTimePicker Grid.Column="1" Value="{Binding ATDPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
+                    <xctk:DateTimePicker Grid.Column="1" Value="{Binding ATDPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
                 </Grid>
             </GroupBox>
             <GroupBox Name="tiefdGroupBox" Header="{x:Static p:Resources.textDraughtOnDeparture}" Grid.Row="1">
@@ -38,7 +38,7 @@
                         <ColumnDefinition Width="2*" />
                     </Grid.ColumnDefinitions>
                     <Label Content="{x:Static p:Resources.textDraughtOnDepartureLabel}" Grid.Column="0"  HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:DoubleUpDown Grid.Row="0" Grid.Column="1" Name="doubleUpDownDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" Value="{Binding DraughtUponDeparture_DMT, Mode=TwoWay}"/>
+                    <xctk:DoubleUpDown Grid.Row="0" Grid.Column="1" Name="doubleUpDownDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" Value="{Binding DraughtUponDeparture_DMT, Mode=TwoWay}" TextAlignment="Left"/>
                 </Grid>
             </GroupBox>
             <GroupBox Name="pobdGroupBox" Header="{x:Static p:Resources.textPersonOnBoardDeparture}" Grid.Row="2">
@@ -54,13 +54,13 @@
                         <RowDefinition Height="28" />
                     </Grid.RowDefinitions>
                     <Label Content="{x:Static p:Resources.textCrewMemberOnBoard}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:IntegerUpDown Value="{Binding TotalCrewMembersOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" Name="integerUpDownCrewMemberOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+                    <xctk:IntegerUpDown Value="{Binding TotalCrewMembersOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" Name="integerUpDownCrewMemberOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                     <Label Content="{x:Static p:Resources.textPassengersOnBoard}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:IntegerUpDown Value="{Binding TotalPassengersOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="0" Grid.Column="3" Name="integerUpDownPassengersOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+                    <xctk:IntegerUpDown Value="{Binding TotalPassengersOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="0" Grid.Column="3" Name="integerUpDownPassengersOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                     <Label Content="{x:Static p:Resources.textStowawaysOnBoard}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:IntegerUpDown Value="{Binding TotalStowawaysOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" Name="integerUpDownStowawaysOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+                    <xctk:IntegerUpDown Value="{Binding TotalStowawaysOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" Name="integerUpDownStowawaysOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                     <Label Content="{x:Static p:Resources.textPersonsOnBoard}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:IntegerUpDown Value="{Binding TotalPersonsOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="1" Grid.Column="3" Name="integerUpDownPersonsOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+                    <xctk:IntegerUpDown Value="{Binding TotalPersonsOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="1" Grid.Column="3" Name="integerUpDownPersonsOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                 </Grid>
 
             </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
index 40416b17..51dbca63 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
@@ -67,18 +67,18 @@
                     <CheckBox Name="checkSimplification" IsChecked="{Binding MDHSimplification}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"/>
                     <enictrl:LocodeControl x:Name="locodePortWhereHealthDeclarationWasGiven" Grid.Row="1" Grid.Column="1" LocodeValue="{Binding PortOfCallWhereCompleteMDHNotified}"  />
                     <CheckBox Name="checkBoxHavePersonsDied" IsChecked="{Binding NonAccidentalDeathsDuringVoyage}" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"/>
-                    <xctk:IntegerUpDown Name="integerUpDownNumberOfDeaths" Grid.Row="3" Grid.Column="3" Value="{Binding NonAccidentalDeathsDuringVoyageCount}" Margin="2" ShowButtonSpinner="False" />
+                    <xctk:IntegerUpDown Name="integerUpDownNumberOfDeaths" Grid.Row="3" Grid.Column="3" Value="{Binding NonAccidentalDeathsDuringVoyageCount}" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
                     <CheckBox Name="checkBoxIsSuspectedInfectious" IsChecked="{Binding SuspisionInfectiousNature}" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center"/>
                     <CheckBox Name="checkBoxTotalNumberSickHigherThan" IsChecked="{Binding NumberOfIllPersonsHigherThanExpected}" Grid.Row="7" Grid.Column="1" VerticalAlignment="Center"/>
-                    <xctk:IntegerUpDown Name="integerUpDownNumberOfIllPersons" Grid.Row="7" Grid.Column="3" Value="{Binding NumberOfIllPersons}" Margin="2" ShowButtonSpinner="False" />
+                    <xctk:IntegerUpDown Name="integerUpDownNumberOfIllPersons" Grid.Row="7" Grid.Column="3" Value="{Binding NumberOfIllPersons}" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
                     <CheckBox Name="checkBoxSickPersonsOnBoard" IsChecked="{Binding SickPersonsOnBoard}" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center"/>
                     <CheckBox Name="checkBoxWasMedicalConsulted" IsChecked="{Binding MedicalConsulted}" Grid.Row="8" Grid.Column="3" VerticalAlignment="Center"/>
                     <CheckBox Name="checkBoxAwareOfConditions" IsChecked="{Binding AwareOfFurtherInfections}" Grid.Row="9" Grid.Column="1" VerticalAlignment="Center"/>
                     <CheckBox Name="checkBoxStowawaysOnBoard" IsChecked="{Binding StowawaysDetected}" Grid.Row="11" Grid.Column="1" VerticalAlignment="Center"/>
-                    <TextBox Name="textBoxStowawaysJoiningLocation" Grid.Row="11" Grid.RowSpan="3" Grid.Column="3" MaxLength="100" Text="{Binding CSOLastName}" Margin="2" />
+                    <TextBox Name="textBoxStowawaysJoiningLocation" Grid.Row="11" Grid.RowSpan="3" Grid.Column="3" MaxLength="100" Text="{Binding CSOLastName}" Margin="2" VerticalContentAlignment="Center"/>
                     <CheckBox Name="checkBoxSickAnimalsOrPets" IsChecked="{Binding SickAnimalOrPetOnBoard}" Grid.Row="12" Grid.Column="1" VerticalAlignment="Center"/>
                     <CheckBox Name="checkBoxSanitaryControlExemption" IsChecked="{Binding ValidSanitaryControlExemptionOrCertificateOnBoard}" Grid.Row="13" Grid.Column="1" VerticalAlignment="Center"/>
-                    <TextBox Name="textBoxPlaceOfIssue" Grid.Row="14" Grid.Column="1" MaxLength="100" Text="{Binding PlaceOfIssue}" Margin="2" />
+                    <TextBox Name="textBoxPlaceOfIssue" Grid.Row="14" Grid.Column="1" MaxLength="100" Text="{Binding PlaceOfIssue}" Margin="2" VerticalContentAlignment="Center"/>
                     <DatePicker Name="datePickerDateOfIssue" Grid.Row="14" Grid.Column="3" SelectedDate="{Binding DateOfIssue}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" />
                     <CheckBox Name="checkBoxReinspectionSanitary" IsChecked="{Binding SanitaryControlReinspectionRequired}" Grid.Row="15" Grid.Column="1" VerticalAlignment="Center"/>
                 </Grid>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
index eeec5ce3..8c180716 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -57,23 +57,23 @@
                 <Image Name="imagePoCState" Grid.Column="1" Source="../Resources/bullet_ball_grey.png" />
             </-->
                 <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="3" Content="{x:Static p:Resources.textVisitTransitId}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxDisplayId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" IsReadOnly="True" Margin="2" />
+                <TextBox Name="textBoxDisplayId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" IsReadOnly="True" Margin="2" VerticalContentAlignment="Center" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textIMO}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxIMO" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="1" Text="{Binding IMO}" Margin="2" IsReadOnly="True" />
+                <TextBox Name="textBoxIMO" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="1" Text="{Binding IMO}" Margin="2" IsReadOnly="True" VerticalContentAlignment="Center"/>
                 <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="3" Content="{x:Static p:Resources.textENI}" Margin="0,0,10,0" />
-                <TextBox Name="textBoxENI" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Text="{Binding ENI}" Margin="2" IsReadOnly="True" />
+                <TextBox Name="textBoxENI" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Text="{Binding ENI}" Margin="2" IsReadOnly="True" VerticalContentAlignment="Center"/>
                 <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETAPortOfCall}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="3" Content="{x:Static p:Resources.textETDPortOfCall}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textATAPortOfCall}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="3" Content="{x:Static p:Resources.textATDPortOfCall}" Margin="0,0,10,0" />
-                <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Value="{Binding ETAToPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
-                <xctk:DateTimePicker Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="2" Value="{Binding ETDFromPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" />
-                <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3" Value="{Binding ATAPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" />
-                <xctk:DateTimePicker Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="3" Value="{Binding ATDPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" />
+                <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Value="{Binding ETAToPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                <xctk:DateTimePicker Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="2" Value="{Binding ETDFromPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3" Value="{Binding ATAPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                <xctk:DateTimePicker Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="3" Value="{Binding ATDPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
                 <Label HorizontalAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="3" Content="{x:Static p:Resources.textCreated}" Margin="0,0,10,0" />
                 <Label Name="labelCreated" Grid.Column="4" Grid.Row="4" Margin="2, 0, 0, 0" />
-                <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay}" Margin="2" />
+                <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay}" Margin="2" VerticalContentAlignment="Center"/>
 
                 <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="6" Visibility="Hidden" Name="stackPanelLock">
                     <Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
@@ -131,6 +131,18 @@
                                 </Style>
                             </DataGridTextColumn.ElementStyle>
                         </DataGridTextColumn>
+                        <DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <Image x:Name="imageHasSystemErrors"/>
+                                    <DataTemplate.Triggers>
+                                        <DataTrigger Binding="{Binding Path=HasSystemErrors}" Value="True">
+                                            <Setter Property="Source" Value="/Resources/hand_red_card.png" TargetName="imageHasSystemErrors"/>
+                                        </DataTrigger>
+                                    </DataTemplate.Triggers>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
                         <DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index 203530f0..063cf2cc 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -209,6 +209,12 @@ namespace ENI2.DetailViewControls
             resetItem.Click += new RoutedEventHandler(this.contextResetMessage);       
             this.dataGridMessages.ContextMenu.Items.Add(resetItem);
 
+            MenuItem systemErrorItem = new MenuItem();
+            systemErrorItem.Header = Properties.Resources.textSystemErrors;
+            systemErrorItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/hand_red_card.png")) };
+            systemErrorItem.Click += new RoutedEventHandler(this.buttonSystemErrors_Click);
+            this.dataGridMessages.ContextMenu.Items.Add(systemErrorItem);
+
             MenuItem errorItem = new MenuItem();
             errorItem.Header = Properties.Resources.textErrors;
             errorItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/error.png")) };
@@ -311,7 +317,7 @@ namespace ENI2.DetailViewControls
 
             this.dataGridMessages.ItemsSource = this.Messages;
             this._initialized = true;
-        }
+        }        
 
         #endregion
 
@@ -541,6 +547,17 @@ namespace ENI2.DetailViewControls
             }
         }
 
+        private void buttonSystemErrors_Click(object sender, RoutedEventArgs e)
+        {
+            if (this.dataGridMessages.SelectedItems.Count > 0)
+            {
+                Message selectedMessage = this.dataGridMessages.SelectedItems[0] as Message;
+                SystemErrorDialog sed = new SystemErrorDialog();
+                sed.SystemErrors = selectedMessage.SystemErrorList;
+                sed.ShowDialog();
+            }
+        }
+
         #endregion
 
     }
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
index 863a8528..fd7c7f98 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
@@ -37,17 +37,17 @@
             <Label Content="{x:Static p:Resources.textTankerCondition}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
             <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxConditionCargoBallastTanks" Margin="2" SelectedIndex="{Binding ConditionCargoBallastTanks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
             <Label Content="{x:Static p:Resources.textTankerNatureOfCargo}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <TextBox Text="{Binding NatureOfCargo, Mode=TwoWay}" Name="textBoxNatureOfCargo" Grid.Column="1" Grid.Row="3"  Margin="2,2,2,2"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"/>
+            <TextBox Text="{Binding NatureOfCargo, Mode=TwoWay}" Name="textBoxNatureOfCargo" Grid.Column="1" Grid.Row="3"  Margin="2,2,2,2"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" VerticalContentAlignment="Center"/>
             <Label Content="{x:Static p:Resources.textTankerVolumeOfCargo}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownVolumeOfCargo" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N3" Value="{Binding VolumeOfCargo, Mode=TwoWay}"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"/>
+            <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownVolumeOfCargo" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N3" Value="{Binding VolumeOfCargo, Mode=TwoWay}"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" TextAlignment="Left"/>
             <Label Content="{x:Static p:Resources.textPlannedOperations}" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <TextBox Text="{Binding PlannedOperations, Mode=TwoWay}" Name="textBoxPlannedOperations" Grid.Column="1" Grid.Row="5"  Margin="2,2,2,2" />
+            <TextBox Text="{Binding PlannedOperations, Mode=TwoWay}" Name="textBoxPlannedOperations" Grid.Column="1" Grid.Row="5"  Margin="2,2,2,2" VerticalContentAlignment="Center"/>
             <Label Content="{x:Static p:Resources.textPlannedInspection}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
             <TextBox Text="{Binding PlannedWorks, Mode=TwoWay}" Name="textBoxPlannedWorks" Grid.Column="1" Grid.Row="6"  Margin="2,2,2,2" />
             <Label Content="{x:Static p:Resources.textLastExpandedInspection  }" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
             <DatePicker Grid.Column="1" Grid.Row="7" Name="datePickerLastExpandedInspection" VerticalAlignment="Center" SelectedDate="{Binding DateOfLastExpandedInspection, Mode=TwoWay}"  Margin="2,2,2,2" />
             <Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <xctk:IntegerUpDown Grid.Row="8" Grid.Column="1" Name="integerUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
+            <xctk:IntegerUpDown Grid.Row="8" Grid.Column="1" Name="integerUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
         </Grid>
     </GroupBox>
 </src:DetailBaseControl>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
index 4da4b122..4d25fd6a 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
@@ -42,12 +42,12 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="2" Content="{x:Static p:Resources.textETDLastPort}" Name="label_ETDFromLastport"  Margin="0,0,10,0"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textETANextPort}" Name="label_ETAToNextPort" Margin="0,0,10,0" />
                     <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textAnchored}" Name="label_IsAnchored" Margin="0,0,10,0" />
-                    <xctk:DateTimePicker Grid.Column="1" Grid.Row="0" Value="{Binding ETAToPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToPortOfCall" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="0" Value="{Binding ETDFromPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromPortOfCall" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <xctk:DateTimePicker Grid.Column="1" Grid.Row="1" Value="{Binding ETAToKielCanal, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToKielCanal" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="1" Value="{Binding ETDFromKielCanal, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromKielCanal" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="3" Value="{Binding ETAToNextPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToNextPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="2" Value="{Binding ETDFromLastPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromLastPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
+                    <xctk:DateTimePicker Grid.Column="1" Grid.Row="0" Value="{Binding ETAToPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToPortOfCall" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="0" Value="{Binding ETDFromPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromPortOfCall" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <xctk:DateTimePicker Grid.Column="1" Grid.Row="1" Value="{Binding ETAToKielCanal, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToKielCanal" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="1" Value="{Binding ETDFromKielCanal, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromKielCanal" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="3" Value="{Binding ETAToNextPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToNextPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="2" Value="{Binding ETDFromLastPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromLastPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
 
                     <enictrl:LocodeControl Grid.Column="1" Grid.Row="2" Width="Auto" x:Name="locodeControl_LastPort" LocodeValue="{Binding LastPort, Mode=TwoWay}"/>
                     <enictrl:LocodeControl Grid.Column="1" Grid.Row="3" Width="Auto" x:Name="locodeControl_NextPort" LocodeValue="{Binding NextPort, Mode=TwoWay}"/>
@@ -94,15 +94,15 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="2" Content="{x:Static p:Resources.textFirstName}" Name="label_AgentFirstName" Margin="0,0,10,0"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textFax}" Name="label_AgentFax" Margin="0,0,10,0"/>
 
-                    <TextBox Grid.Row="0" Grid.Column="1" Name="textBox_AgentCompanyName" MaxLength="100" Margin="2" Text="{Binding AgentCompanyName}"/>
-                    <TextBox Grid.Row="1" Grid.Column="1" Name="textBox_AgentStreetAndNumber" MaxLength="100" Margin="2" Text="{Binding AgentStreetAndNumber}" />
-                    <TextBox Grid.Row="2" Grid.Column="1" Name="textBox_AgentPostalCode" MaxLength="100" Margin="2" Text="{Binding AgentPostalCode}" />
-                    <TextBox Grid.Row="2" Grid.Column="3" Name="textBox_AgentCity" MaxLength="100" Margin="2" Text="{Binding AgentCity}"/>
-                    <TextBox Grid.Row="5" Grid.Column="1" Name="textBox_AgentLastName" MaxLength="100" Margin="2" Text="{Binding AgentLastName}"/>
-                    <TextBox Grid.Row="6" Grid.Column="1" Name="textBox_AgentPhone" MaxLength="100" Margin="2" Text="{Binding AgentPhone}"/>
-                    <TextBox Grid.Row="7" Grid.Column="1" Name="textBox_AgentEMail" MaxLength="100" Margin="2" Text="{Binding AgentEMail}"/>
-                    <TextBox Grid.Row="5" Grid.Column="3" Name="textBox_AgentFirstName" MaxLength="100" Margin="2" Text="{Binding AgentFirstName}"/>
-                    <TextBox Grid.Row="6" Grid.Column="3" Name="textBox_AgentFax" MaxLength="100" Margin="2" Text="{Binding AgentFax}"/>
+                    <TextBox Grid.Row="0" Grid.Column="1" Name="textBox_AgentCompanyName" MaxLength="100" Margin="2" Text="{Binding AgentCompanyName}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="1" Grid.Column="1" Name="textBox_AgentStreetAndNumber" MaxLength="100" Margin="2" Text="{Binding AgentStreetAndNumber}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="2" Grid.Column="1" Name="textBox_AgentPostalCode" MaxLength="100" Margin="2" Text="{Binding AgentPostalCode}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="2" Grid.Column="3" Name="textBox_AgentCity" MaxLength="100" Margin="2" Text="{Binding AgentCity}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="5" Grid.Column="1" Name="textBox_AgentLastName" MaxLength="100" Margin="2" Text="{Binding AgentLastName}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="6" Grid.Column="1" Name="textBox_AgentPhone" MaxLength="100" Margin="2" Text="{Binding AgentPhone}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="7" Grid.Column="1" Name="textBox_AgentEMail" MaxLength="100" Margin="2" Text="{Binding AgentEMail}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="5" Grid.Column="3" Name="textBox_AgentFirstName" MaxLength="100" Margin="2" Text="{Binding AgentFirstName}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="6" Grid.Column="3" Name="textBox_AgentFax" MaxLength="100" Margin="2" Text="{Binding AgentFax}" VerticalContentAlignment="Center"/>
 
                 </Grid>
             </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
index a98f4bb8..6008ef74 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
@@ -57,13 +57,13 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="2" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                     <ComboBox Grid.Row="0" Grid.Column="1" x:Name="comboBoxShippingArea" Margin="2" SelectedIndex="{Binding ShippingArea, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
                     <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
-                    <TextBox Grid.Row="2" Grid.Column="1" Name="textRequestedPostionInPortOfCall" Margin="2" Text="{Binding RequestedPositionInPortOfCall}" />
-                    <TextBox Grid.Row="3" Grid.Column="1" Name="textBowThrusterPower" Margin="2" Text="{Binding BowThrusterPower}" />
-                    <TextBox Grid.Row="4" Grid.Column="1" Name="textSternThrusterPower" Margin="2" Text="{Binding SternThrusterPower}" />
+                    <TextBox Grid.Row="2" Grid.Column="1" Name="textRequestedPostionInPortOfCall" Margin="2" Text="{Binding RequestedPositionInPortOfCall}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="3" Grid.Column="1" Name="textBowThrusterPower" Margin="2" Text="{Binding BowThrusterPower}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="4" Grid.Column="1" Name="textSternThrusterPower" Margin="2" Text="{Binding SternThrusterPower}" VerticalContentAlignment="Center"/>
                     <CheckBox Grid.Row="5" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" IsThreeState="True" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargo}" Margin="2"/>
-                    <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1"/>
-                    <TextBox Grid.Row="2" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth}" />
-                    <TextBox Grid.Row="4" Grid.Column="3" Grid.RowSpan="2" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip}" />
+                    <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1" TextAlignment="Left"/>
+                    <TextBox Grid.Row="2" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="4" Grid.Column="3" Grid.RowSpan="2" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip}" VerticalContentAlignment="Center"/>
                 </Grid>
             </GroupBox>
             <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="2">
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
index 12f8223c..d73e69cb 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
@@ -68,25 +68,25 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="2" Content="{x:Static p:Resources.textGeneralCargoDescription}" Name="label_GeneralCargoDescription" Margin="0,0,10,0"/>
 
                     <CheckBox Name="checkBoxKielCanalPassagePlanned" IsChecked="{Binding KielCanalPassagePlanned}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"/>
-                    <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedIncomming" Grid.Row="1" Grid.Column="1" Value="{Binding KielCanalPassagePlannedIncomming}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedOutgoing" Grid.Row="1" Grid.Column="3" Value="{Binding KielCanalPassagePlannedOutgoing}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <ComboBox Name="comboBoxCurrentShipSecurityLevel" Grid.Row="3" Grid.Column="1" SelectedValue="{Binding CurrentShipSecurityLevel}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+                    <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedIncomming" Grid.Row="1" Grid.Column="1" Value="{Binding KielCanalPassagePlannedIncomming}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedOutgoing" Grid.Row="1" Grid.Column="3" Value="{Binding KielCanalPassagePlannedOutgoing}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <ComboBox Name="comboBoxCurrentShipSecurityLevel" Grid.Row="3" Grid.Column="1" SelectedValue="{Binding CurrentShipSecurityLevel}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
                     <CheckBox Name="checkBoxSECSimplification" IsChecked="{Binding SECSimplification}" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center"/>
                     <enictrl:LocodeControl x:Name="locodePortOfCallWhereCompleteSECNotified" Grid.Row="6" Grid.Column="1" LocodeValue="{Binding PortOfCallWhereCompleteSECNotified}" />
-                    <TextBox Name="textBoxCSOFirstName" Grid.Row="8" Grid.Column="1" MaxLength="100" Text="{Binding CSOFirstName}" Margin="2" />
-                    <TextBox Name="textBoxCSOLastName" Grid.Row="8" Grid.Column="3" MaxLength="100" Text="{Binding CSOLastName}" Margin="2" />
-                    <TextBox Name="textBoxCSOPhoneName" Grid.Row="9" Grid.Column="1" MaxLength="100" Text="{Binding CSOPhone}" Margin="2" />
-                    <TextBox Name="textBoxCSOFaxName" Grid.Row="9" Grid.Column="3" MaxLength="100" Text="{Binding CSOFax}" Margin="2" />
-                    <TextBox Name="textBoxCSOEMailName" Grid.Row="10" Grid.Column="1" MaxLength="100" Text="{Binding CSOEMail}" Margin="2" />
+                    <TextBox Name="textBoxCSOFirstName" Grid.Row="8" Grid.Column="1" MaxLength="100" Text="{Binding CSOFirstName}" Margin="2" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxCSOLastName" Grid.Row="8" Grid.Column="3" MaxLength="100" Text="{Binding CSOLastName}" Margin="2" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxCSOPhoneName" Grid.Row="9" Grid.Column="1" MaxLength="100" Text="{Binding CSOPhone}" Margin="2" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxCSOFaxName" Grid.Row="9" Grid.Column="3" MaxLength="100" Text="{Binding CSOFax}" Margin="2" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxCSOEMailName" Grid.Row="10" Grid.Column="1" MaxLength="100" Text="{Binding CSOEMail}" Margin="2" VerticalContentAlignment="Center"/>
                     <CheckBox Name="checkBoxValidISSCOnBoard" IsChecked="{Binding ValidISSCOnBoard}" Grid.Row="13" Grid.Column="1" VerticalAlignment="Center"/>
-                    <TextBox Name="textBoxReasonsForNoValidISSC" Grid.Row="13" Grid.Column="3" MaxLength="255" Text="{Binding ReasonsForNoValidISSC}" Margin="2" />
-                    <ComboBox Name="comboBoxISSCType" Grid.Row="14" Grid.Column="1" SelectedIndex="{Binding ISSCType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
-                    <ComboBox Name="comboBoxISSCIssuerType" Grid.Row="14" Grid.Column="3" SelectedIndex="{Binding ISSCIssuerType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
+                    <TextBox Name="textBoxReasonsForNoValidISSC" Grid.Row="13" Grid.Column="3" MaxLength="255" Text="{Binding ReasonsForNoValidISSC}" Margin="2" VerticalContentAlignment="Center"/>
+                    <ComboBox Name="comboBoxISSCType" Grid.Row="14" Grid.Column="1" SelectedIndex="{Binding ISSCType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+                    <ComboBox Name="comboBoxISSCIssuerType" Grid.Row="14" Grid.Column="3" SelectedIndex="{Binding ISSCIssuerType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
                     <DatePicker Name="datePickerISSCDateOfExpiration" Grid.Row="15" Grid.Column="1" SelectedDate="{Binding ISSCDateOfExpiration}" Margin="2" />
-                    <TextBox Name="textBoxISSCIssuerName" Grid.Row="15" Grid.Column="3" MaxLength="100" Text="{Binding ISSCIssuerName}" Margin="2" />
+                    <TextBox Name="textBoxISSCIssuerName" Grid.Row="15" Grid.Column="3" MaxLength="100" Text="{Binding ISSCIssuerName}" Margin="2" VerticalContentAlignment="Center"/>
                     <CheckBox Name="checkBoxApprovedSecurityPlanOnBoard" IsChecked="{Binding ApprovedSecurityPlanOnBoard}" Grid.Row="17" Grid.Column="1" VerticalAlignment="Center"/>
-                    <TextBox Name="textBoxPortFacilityOfArrival" Grid.Row="18" Grid.Column="1" MaxLength="100" Text="{Binding PortFacilityOfArrival}" Margin="2" />
-                    <ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="18" Grid.Column="3" IsEditable="True" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2"  IsTextSearchEnabled="False"/>
+                    <TextBox Name="textBoxPortFacilityOfArrival" Grid.Row="18" Grid.Column="1" MaxLength="100" Text="{Binding PortFacilityOfArrival}" Margin="2" VerticalContentAlignment="Center"/>
+                    <ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="18" Grid.Column="3" IsEditable="True" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2"  IsTextSearchEnabled="True"/>
 
                 </Grid>
             </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
index 6fe939ef..d006a3a5 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
@@ -70,13 +70,13 @@ namespace ENI2.DetailViewControls
             this._sec = sec;
 
             this.comboBoxCurrentShipSecurityLevel.ItemsSource = Util.GlobalStructures.ShipSecurityLevels;
-            this.comboBoxCurrentShipSecurityLevel.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxCurrentShipSecurityLevel.KeyUp += ComboBox_KeyUp;
             this.comboBoxISSCType.ItemsSource = isscTypes;
-            this.comboBoxISSCType.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxISSCType.KeyUp += ComboBox_KeyUp;
             this.comboBoxISSCIssuerType.ItemsSource = isscIssuerTypes;
-            this.comboBoxISSCIssuerType.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxISSCIssuerType.KeyUp += ComboBox_KeyUp;
             this.comboBoxGeneralDescriptionOfCargo.ItemsSource = cargoDescriptions;
-            this.comboBoxGeneralDescriptionOfCargo.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxGeneralDescriptionOfCargo.KeyUp += ComboBox_KeyUp;
 
             this.dataGridLast10PortFacilities.Initialize();
             this.dataGridLast10PortFacilities.ItemsSource = sec.LastTenPortFacilitesCalled;
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
index 0bc52519..2939b0b8 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
@@ -48,21 +48,21 @@
                 <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="3" Content="{x:Static p:Resources.textBeamOverAll}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="3" Content="{x:Static p:Resources.textInmarsatCallNumber}" Margin="0,0,10,0" />
 
-                <TextBox Name="textBoxVesselName" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ShipName}" Margin="2" VerticalAlignment="Center"/>
-                <ComboBox Name="comboBoxVesselType" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" SelectedValue="{Binding ShipType}" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
-                <TextBox Name="textBoxCallsign" Grid.Column="4" Grid.Row="1" Text="{Binding CallSign}" Margin="2" VerticalAlignment="Center" />
-                <ComboBox Name="comboBoxTransportMode" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Margin="2" SelectedValue="{Binding TransportMode}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
-                <ComboBox Name="comboBoxFlag" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="2" SelectedValue="{Binding Flag}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+                <TextBox Name="textBoxVesselName" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ShipName}" Margin="2" VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+                <ComboBox Name="comboBoxVesselType" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" SelectedValue="{Binding ShipType}" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
+                <TextBox Name="textBoxCallsign" Grid.Column="4" Grid.Row="1" Text="{Binding CallSign}" Margin="2" VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+                <ComboBox Name="comboBoxTransportMode" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Margin="2" SelectedValue="{Binding TransportMode}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
+                <ComboBox Name="comboBoxFlag" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="2" SelectedValue="{Binding Flag}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
                 <enictrl:LocodeControl x:Name="locodePortOfRegistry" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" LocodeValue="{Binding PortOfRegistry}" />
-                
-                <xctk:IntegerUpDown Name="integerUpDownGrossTonnage" Grid.Column="1" Grid.Row="4" Margin="2" Value="{Binding GrossTonnage}" ShowButtonSpinner="False"/>
+
+                <xctk:IntegerUpDown Name="integerUpDownGrossTonnage" Grid.Column="1" Grid.Row="4" Margin="2" Value="{Binding GrossTonnage}" ShowButtonSpinner="False" TextAlignment="Left"/>
                 <Label Content="t" Grid.Column="2" Grid.Row="4" />
-                <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Column="1" Grid.Row="5" Margin="2" Value="{Binding LengthOverall_MTR}" ShowButtonSpinner="False" />
+                <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Column="1" Grid.Row="5" Margin="2" Value="{Binding LengthOverall_MTR}" ShowButtonSpinner="False" TextAlignment="Left"/>
                 <Label Content="m" Grid.Column="2" Grid.Row="5" />
-                <xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="4" Grid.Row="5" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" />
+                <xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="4" Grid.Row="5" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" TextAlignment="Left" />
                 <Label Content="m" Grid.Column="5" Grid.Row="5" />
-                <TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="6" Margin="2" Text="{Binding MMSINumber}" VerticalAlignment="Center"/>
-                <TextBox Name="textBoxInmarsatCallNumber" Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="6" VerticalAlignment="Center" Margin="2" Text="{Binding InmarsatCallNumber}" />
+                <TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="6" Margin="2" Text="{Binding MMSINumber}" VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+                <TextBox Name="textBoxInmarsatCallNumber" Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="6" VerticalAlignment="Center" Margin="2" Text="{Binding InmarsatCallNumber}" VerticalContentAlignment="Center" />
 
             </Grid>
             <GroupBox Name="groupBoxISMCompany" Header="{x:Static p:Resources.textISMCompany}" Grid.Row="1">
@@ -89,12 +89,12 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="3" Content="{x:Static p:Resources.textCompanyId}" Margin="0,0,10,0" />
                     <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="3" Content="{x:Static p:Resources.textCity}" Margin="0,0,10,0" />
 
-                    <TextBox VerticalAlignment="Center" Name="textBoxCompanyName" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyName}" MaxLength="100" />
-                    <TextBox VerticalAlignment="Center" Name="textBoxCompanyId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyId}" MaxLength="100" />
-                    <TextBox VerticalAlignment="Center" Name="textBoxStreetNumber" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyStreetAndNumber}" MaxLength="100" />
-                    <TextBox VerticalAlignment="Center" Name="textBoxCity" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCity}" MaxLength="100" />
-                    <TextBox VerticalAlignment="Center" Name="textBoxPostalCode" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyPostalCode}" MaxLength="24" />
-                    <TextBox VerticalAlignment="Center" Name="textBoxCountry" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCountry}" MaxLength="100" />
+                    <TextBox VerticalAlignment="Center" Name="textBoxCompanyName" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyName}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox VerticalAlignment="Center" Name="textBoxCompanyId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyId}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox VerticalAlignment="Center" Name="textBoxStreetNumber" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyStreetAndNumber}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox VerticalAlignment="Center" Name="textBoxCity" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCity}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox VerticalAlignment="Center" Name="textBoxPostalCode" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyPostalCode}" MaxLength="24" VerticalContentAlignment="Center"/>
+                    <TextBox VerticalAlignment="Center" Name="textBoxCountry" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCountry}" MaxLength="100" VerticalContentAlignment="Center"/>
 
                 </Grid>
             </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs
index fd8f4002..71e0f0e3 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs
@@ -76,11 +76,11 @@ namespace ENI2.DetailViewControls
             }
 
             this.comboBoxFlag.ItemsSource = CREW.NationalityDict;
-            this.comboBoxFlag.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxFlag.KeyUp += ComboBox_KeyUp;
             this.comboBoxVesselType.ItemsSource = STAT.VesselTypeDict;
-            this.comboBoxVesselType.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxVesselType.KeyUp += ComboBox_KeyUp;
             this.comboBoxTransportMode.ItemsSource = STAT.TransportModeDict;
-            this.comboBoxTransportMode.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxTransportMode.KeyUp += ComboBox_KeyUp;
             this.shipDataGroupBox.DataContext = stat;
 
             #endregion
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 536fb8ab..f4bf01e8 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -35,8 +35,8 @@
     <MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>4</ApplicationRevision>
-    <ApplicationVersion>3.6.13.%2a</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>3.6.15.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -288,6 +288,9 @@
     <Compile Include="EditControls\SimplePropertyViewDialog.xaml.cs">
       <DependentUpon>SimplePropertyViewDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="EditControls\SystemErrorDialog.xaml.cs">
+      <DependentUpon>SystemErrorDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="EditControls\ViolationListDialog.xaml.cs">
       <DependentUpon>ViolationListDialog.xaml</DependentUpon>
     </Compile>
@@ -482,6 +485,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="EditControls\SystemErrorDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="EditControls\ViolationListDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -587,6 +594,7 @@
     <Resource Include="Resources\nav_refresh_green.png" />
     <Resource Include="Resources\recycle.png" />
     <Resource Include="Resources\check.png" />
+    <Resource Include="Resources\hand_red_card.png" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditBKRDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditBKRDialog.xaml
index d12e1022..5fb9e83c 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditBKRDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditBKRDialog.xaml
@@ -19,8 +19,8 @@
             <ColumnDefinition Width="3*" />
         </Grid.ColumnDefinitions>
         <Label Content="{x:Static p:Resources.textBunkerType}" Grid.Row="0" Grid.Column="0" />
-        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxBunkerType" Margin="2" MinLines="2" MaxLength="100" />
+        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxBunkerType" Margin="2" MinLines="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <Label Content="{x:Static p:Resources.textBunkerQuantity}" Grid.Row="1" Grid.Column="0" />
-        <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Name="doubleUpDownBunkerQuantity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1"/>
+        <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Name="doubleUpDownBunkerQuantity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" TextAlignment="Left" />
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml
index 0d80c2a9..6b84e7bc 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml
@@ -37,11 +37,11 @@
         <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxDuty" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxLastName" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <TextBox Grid.Row="1" Grid.Column="3" Width="auto" Name="textBoxFirstName" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
-        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxGender" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
+        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxGender" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
         <TextBox Grid.Row="2" Grid.Column="3" Width="auto" Name="textBoxPlaceOfBirth" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
-        <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" ContextMenu="{DynamicResource ClearContextMenu}"/>
+        <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
         <DatePicker Grid.Row="3" Grid.Column="3" Name="datePickerDateOfBirth" Margin="2" />
-        <ComboBox Grid.Row="4" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" ContextMenu="{DynamicResource ClearContextMenu}" />
+        <ComboBox Grid.Row="4" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}" />
         <TextBox Grid.Row="4" Grid.Column="3" Width="auto" Name="textBoxIdDocNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="5" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
     </Grid>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml.cs
index b7751fdd..d355e4ad 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml.cs
@@ -35,11 +35,11 @@ namespace ENI2.EditControls
             this.comboBoxGender.SelectedIndex = this.CREW.CrewMemberGender.HasValue ? this.CREW.CrewMemberGender.Value : -1;
             this.textBoxPlaceOfBirth.Text = this.CREW.CrewMemberPlaceOfBirth;
             this.comboBoxNationality.ItemsSource = bsmd.database.CREW.NationalityDict;
-            this.comboBoxNationality.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxNationality.KeyUp += ComboBox_KeyUp;
             this.comboBoxNationality.SelectedValue = this.CREW.CrewMemberNationality;
             this.datePickerDateOfBirth.SelectedDate = this.CREW.CrewMemberDateOfBirth;
             this.comboBoxIdDocType.ItemsSource = GlobalStructures.IDDocTypeList;
-            this.comboBoxIdDocType.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxIdDocType.KeyUp += ComboBox_KeyUp;
             this.comboBoxIdDocType.SelectedIndex = this.CREW.CrewMemberIdentityDocumentType.HasValue ? this.CREW.CrewMemberIdentityDocumentType.Value : -1;
             this.textBoxIdDocNumber.Text = this.CREW.CrewMemberIdentityDocumentId;
             this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber;
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml
index 540af1d3..aec2831f 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml
@@ -46,12 +46,12 @@
             <TextBox Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Name="textBoxIdentifier" IsReadOnly="True" MaxLength="40" Margin="2" VerticalContentAlignment="Center" />
             <TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Name="textBoxProductName" MaxLength="255" Margin="2" VerticalContentAlignment="Center" />
             <CheckBox Grid.Row="1" Grid.Column="4" Name="checkBoxSpecRef15_19" VerticalAlignment="Center" Margin="2" />
-            <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxPollutionCategory" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
-            <ComboBox Grid.Row="2" Grid.Column="4" Name="comboBoxRisks" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
-            <ComboBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Name="comboBoxFlashpointInformation" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
+            <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxPollutionCategory" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+            <ComboBox Grid.Row="2" Grid.Column="4" Name="comboBoxRisks" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+            <ComboBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Name="comboBoxFlashpointInformation" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
             <TextBox Name="textBoxFlashpoint" Grid.Row="3" Grid.Column="4" Margin="2" MaxLength="11"  VerticalContentAlignment="Center"/>
             <Label Grid.Row="3" Grid.Column="5" Content="°C" />
-            <xctk:DoubleUpDown Name="doubleUpDownQuantity" Grid.Row="4" Grid.Column="1" Margin="2" FormatString="N3" ShowButtonSpinner="False" />
+            <xctk:DoubleUpDown Name="doubleUpDownQuantity" Grid.Row="4" Grid.Column="1" Margin="2" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
             <Label Grid.Row="4" Grid.Column="2" Content="kg" />
             <TextBox Name="textBoxStowagePosition" Grid.Row="4" Grid.Column="4" Grid.ColumnSpan="2" MaxLength="24" Margin="2" VerticalContentAlignment="Center"/>
             <enictrl:LocodeControl x:Name="locodePortOfLoading" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml.cs
index 7c865996..0bf70f6f 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml.cs
@@ -35,13 +35,13 @@ namespace ENI2.EditControls
             this.checkBoxSpecRef15_19.IsChecked = this.IBC.SpecRef15_19;
 
             this.comboBoxFlashpointInformation.ItemsSource = IBCPosition.flashpointInformations;
-            this.comboBoxFlashpointInformation.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxFlashpointInformation.KeyUp += ComboBox_KeyUp;
             this.comboBoxFlashpointInformation.SelectedIndex = this.IBC.FlashpointInformation ?? -1;
             this.comboBoxPollutionCategory.ItemsSource = IBCPosition.pollutionCategories;
-            this.comboBoxPollutionCategory.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxPollutionCategory.KeyUp += ComboBox_KeyUp;
             this.comboBoxPollutionCategory.SelectedIndex = this.IBC.PollutionCategory ?? -1;
             this.comboBoxRisks.ItemsSource = IBCPosition.hazards;
-            this.comboBoxRisks.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxRisks.KeyUp += ComboBox_KeyUp;
             this.comboBoxRisks.SelectedIndex = this.IBC.Hazards ?? -1;
 
             this.doubleUpDownQuantity.Value = this.IBC.Quantity_KGM;
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIGCDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditIGCDialog.xaml
index 9c359d8f..ee578f56 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditIGCDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditIGCDialog.xaml
@@ -41,7 +41,7 @@
         <TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Name="textBoxProductName" MaxLength="255" Margin="2" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="2" Grid.Column="1" Name="textBoxUNNumber" MaxLength="4" Margin="2" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="2" Grid.Column="4" Name="textBoxIMOClass" MaxLength="4" Margin="2" VerticalContentAlignment="Center" />
-        <xctk:DoubleUpDown Name="doubleUpDownQuantity" Grid.Row="3" Grid.Column="1" Margin="2" FormatString="N3" ShowButtonSpinner="False" />
+        <xctk:DoubleUpDown Name="doubleUpDownQuantity" Grid.Row="3" Grid.Column="1" Margin="2" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
         <Label Grid.Row="3" Grid.Column="2" Content="kg" />
         <TextBox Grid.Row="3" Grid.Column="4" Name="textBoxStowagePosition" MaxLength="24" Margin="2" VerticalContentAlignment="Center" />
         <enictrl:LocodeControl x:Name="locodePortOfLoading" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml
index 4e88b3ef..a39a6c99 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml
@@ -81,31 +81,31 @@ Copyright (c) 2017 schick Informatik
         <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxIdentifier" IsReadOnly = "True" Margin="2" MaxLength="100" Grid.ColumnSpan="2" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxUNNumber" Margin="2" MaxLength="4" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="1" Grid.Column="4" Width="auto" Name="textBoxIMOClass" MaxLength="10" Margin="2" VerticalContentAlignment="Center" />
-        <ComboBox Grid.Row="1" Grid.Column="7" Name="comboBoxPackingGroup" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
+        <ComboBox Grid.Row="1" Grid.Column="7" Name="comboBoxPackingGroup" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
         <TextBox Grid.Row="2" Grid.Column="1" Width="auto" Name="textBoxProperShippingName" Margin="2" MaxLength="255" Grid.ColumnSpan="2" />
         <TextBox Grid.Row="2" Grid.Column="4" Width="auto" Name="textBoxTechnicalName" MaxLength="255" Margin="2" Grid.ColumnSpan="2"/>
         <CheckBox Grid.Row="2" Grid.Column="7" Name="checkBoxMarinePollutant" VerticalAlignment="Top" Margin="2,6,0,0" />
-        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="decimalUpDownNetExplosiveMass" Margin="2" ShowButtonSpinner="False" FormatString="N3"/>
+        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="decimalUpDownNetExplosiveMass" Margin="2" ShowButtonSpinner="False" FormatString="N3" TextAlignment="Left"/>
         <Label Grid.Row="3" Grid.Column="2" Content="kg" />
         <TextBox Grid.Row="3" Grid.Column="4" Width="auto" Name="textBoxFlashpoint" MaxLength="10" Margin="2" VerticalContentAlignment="Center" />
-        <xctk:IntegerUpDown Grid.Row="3" Grid.Column="7" Name="integerUpDownCategory" Maximum="3" Minimum="1" Margin="2" ShowButtonSpinner="False" />
+        <xctk:IntegerUpDown Grid.Row="3" Grid.Column="7" Name="integerUpDownCategory" Maximum="3" Minimum="1" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
         <TextBox Grid.Row="4" Grid.Column="1" Width="auto" Name="textBoxClass7NuclideName" Margin="2" MaxLength="100" Grid.ColumnSpan="2" />
-        <xctk:DoubleUpDown Grid.Row="4" Grid.Column="4" Name="decimalUpDownMaxActivity" Minimum="0" FormatString="N6" Margin="2" ShowButtonSpinner="False" />
+        <xctk:DoubleUpDown Grid.Row="4" Grid.Column="4" Name="decimalUpDownMaxActivity" Minimum="0" FormatString="N6" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
         <TextBox Grid.Row="4" Grid.Column="7" Name="textBoxSubsidiaryRisks" Margin="2" Grid.ColumnSpan="2" Grid.RowSpan="2" />
-        <xctk:DoubleUpDown Grid.Row="5" Grid.Column="1" Name="decimalUpdownClass7TransportIndex" Margin="2" ShowButtonSpinner="False" FormatString="N1" Maximum="50" />
-        <xctk:DoubleUpDown Grid.Row="5" Grid.Column="4" Name="decimalUpDownCSI" Minimum="0" Maximum="100" Margin="2" FormatString="N2" ShowButtonSpinner="False" />
-        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="decimalUpdownControlTemperature" Margin="2" ShowButtonSpinner="False" FormatString="N2" />
+        <xctk:DoubleUpDown Grid.Row="5" Grid.Column="1" Name="decimalUpdownClass7TransportIndex" Margin="2" ShowButtonSpinner="False" FormatString="N1" Maximum="50" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="5" Grid.Column="4" Name="decimalUpDownCSI" Minimum="0" Maximum="100" Margin="2" FormatString="N2" ShowButtonSpinner="False" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="decimalUpdownControlTemperature" Margin="2" ShowButtonSpinner="False" FormatString="N2" TextAlignment="Left"/>
         <Label Grid.Row="6" Grid.Column="2" Content="°C" />
-        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="4" Name="decimalUpDownEmergencyTemperature" Margin="2" FormatString="N2" ShowButtonSpinner="False" />
+        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="4" Name="decimalUpDownEmergencyTemperature" Margin="2" FormatString="N2" ShowButtonSpinner="False" TextAlignment="Left"/>
         <Label Grid.Row="6" Grid.Column="5" Content="°C" />
-        <xctk:IntegerUpDown Grid.Row="7" Grid.Column="1" Name="integerUpDownNumberOfPackages" Margin="2" ShowButtonSpinner="False" Minimum="0" />
-        <ComboBox Name="comboBoxPackageType" Grid.Column="4" Grid.Row="7" Grid.ColumnSpan="2" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+        <xctk:IntegerUpDown Grid.Row="7" Grid.Column="1" Name="integerUpDownNumberOfPackages" Margin="2" ShowButtonSpinner="False" Minimum="0" TextAlignment="Left"/>
+        <ComboBox Name="comboBoxPackageType" Grid.Column="4" Grid.Row="7" Grid.ColumnSpan="2" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
         <CheckBox Grid.Row="8" Grid.Column="1" Name="checkBoxLimitedQuantities" VerticalAlignment="Center" Margin="2"/>
         <CheckBox Grid.Row="8" Grid.Column="4" Name="checkBoxExceptedQuantities" VerticalAlignment="Center" Margin="2" />
-        <xctk:DoubleUpDown Grid.Row="8" Grid.Column="7" Name="doubleUpDownCargoVolume" Margin="2" Minimum="0" ShowButtonSpinner="False" FormatString="N3" />
-        <xctk:DoubleUpDown Grid.Row="9" Grid.Column="1" Name="decimalUpDownNetQuantity" Margin="2" Minimum="0" FormatString="N3" ShowButtonSpinner="False" />
+        <xctk:DoubleUpDown Grid.Row="8" Grid.Column="7" Name="doubleUpDownCargoVolume" Margin="2" Minimum="0" ShowButtonSpinner="False" FormatString="N3" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="9" Grid.Column="1" Name="decimalUpDownNetQuantity" Margin="2" Minimum="0" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
         <Label Grid.Row="9" Grid.Column="2" Content="kg" />
-        <xctk:DoubleUpDown Grid.Row="9" Grid.Column="4" Name="decimalUpDownGrossQuantity" Minimum="0" FormatString="N3" Margin="2" ShowButtonSpinner="False" />
+        <xctk:DoubleUpDown Grid.Row="9" Grid.Column="4" Name="decimalUpDownGrossQuantity" Minimum="0" FormatString="N3" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
         <Label Grid.Row="9" Grid.Column="5" Content="kg" />
         <TextBox Grid.Row="9" Grid.Column="7" Name="textBoxVehicleLicensePlate" Margin="2" MaxLength="24" Grid.ColumnSpan="2" />
         <CheckBox Grid.Row="10" Grid.Column="1" Name="checkBoxGeneralCargo" VerticalAlignment="Center" Margin="2" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs
index 241e6751..b610db9d 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs
@@ -60,10 +60,10 @@ namespace ENI2.EditControls
             this.checkBoxMarinePollutant.IsChecked = this.IMDG.MarinePollutant;
 
             this.comboBoxPackageType.ItemsSource = HAZ.PackageTypes;
-            this.comboBoxPackageType.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxPackageType.KeyUp += ComboBox_KeyUp;
             this.comboBoxPackageType.SelectedValue = this.IMDG.PackageType;
             this.comboBoxPackingGroup.ItemsSource = GlobalStructures.packingGroups;
-            this.comboBoxPackingGroup.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxPackingGroup.KeyUp += ComboBox_KeyUp;
             this.comboBoxPackingGroup.SelectedIndex = (int) (this.IMDG.PackingGroup ?? -1);
 
             this.locodeControlPortOfDischarge.LocodeValue = this.IMDG.PortOfDischarge;
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml
index 32fb4e3f..bd043da4 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml
@@ -45,7 +45,7 @@
         <CheckBox Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="2" Name="checkBoxMaterialHazardous" />
         <TextBox Grid.Row="2" Grid.Column="4" Name="textBoxUNNumber" MaxLength="4" Margin="2" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="3" Grid.Column="1" Name="textBoxIMOClass" MaxLength="4" Margin="2" VerticalContentAlignment="Center" />
-        <xctk:DoubleUpDown Name="doubleUpDownQuantity" Grid.Row="3" Grid.Column="4" Margin="2" FormatString="N3" ShowButtonSpinner="False" />
+        <xctk:DoubleUpDown Name="doubleUpDownQuantity" Grid.Row="3" Grid.Column="4" Margin="2" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
         <Label Grid.Row="3" Grid.Column="5" Content="kg" />
         <TextBox Grid.Row="4" Grid.Column="1" Name="textBoxStowagePosition" MaxLength="24" Margin="2" VerticalContentAlignment="Center" />
         <enictrl:LocodeControl x:Name="locodePortOfLoading" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml
index 65680c8b..4a845d57 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml
@@ -36,12 +36,12 @@ Copyright (c) 2017 schick Informatik
         <Label Name="labelPortOfDischarge" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textCargoPortOfDischarge}" />
         <Label Name="labelCodeNST3" Grid.Row="1" Grid.Column="2" Content="{x:Static p:Resources.textCargoCodeNST3}" />
 
-        <ComboBox Grid.Row="0" Grid.Column="1" Name="comboBoxHandlingType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
-        <ComboBox Grid.Row="0" Grid.Column="3" Name="comboBoxLACodes" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
-        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxNSTCode" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
-        <ComboBox Grid.Row="1" Grid.Column="3" Name="comboBoxNST3Code" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
-        <xctk:IntegerUpDown Grid.Row="2" Grid.Column="1" Name="integerUpDownNumberOfItems" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
-        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownGrossQuantity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1"/>
+        <ComboBox Grid.Row="0" Grid.Column="1" Name="comboBoxHandlingType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+        <ComboBox Grid.Row="0" Grid.Column="3" Name="comboBoxLACodes" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxNSTCode" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+        <ComboBox Grid.Row="1" Grid.Column="3" Name="comboBoxNST3Code" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+        <xctk:IntegerUpDown Grid.Row="2" Grid.Column="1" Name="integerUpDownNumberOfItems" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownGrossQuantity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" TextAlignment="Left"/>
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="4" Width="Auto" x:Name="locodeControl_PortOfLoading" />
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="5" Width="Auto" x:Name="locodeControl_PortOfDischarge" />
         
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml.cs
index 908b4dbc..3db60d3c 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml.cs
@@ -51,28 +51,27 @@ namespace ENI2.EditControls
             else
                 this.comboBoxHandlingType.ItemsSource = handlinTypeListDE;
 
-            this.comboBoxHandlingType.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxHandlingType.KeyUp += ComboBox_KeyUp;
             if (this.LADG.CargoHandlingType.HasValue)
                 this.comboBoxHandlingType.SelectedIndex = this.LADG.CargoHandlingType.Value;
 
             this.comboBoxLACodes.ItemsSource = LADG.LACodes;            
-            this.comboBoxLACodes.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxLACodes.KeyUp += ComboBox_KeyUp;
             this.comboBoxLACodes.SelectedValue = this.LADG.CargoLACode;
             
             this.integerUpDownNumberOfItems.Value = this.LADG.CargoNumberOfItems;
             this.doubleUpDownGrossQuantity.Value = this.LADG.CargoGrossQuantity_TNE;
             this.locodeControl_PortOfLoading.LocodeValue = this.LADG.PortOfLoading;
             this.locodeControl_PortOfDischarge.LocodeValue = this.LADG.PortOfDischarge;
-            this.comboBoxLACodes.SelectedValue = this.LADG.CargoLACode;
-            this.comboBoxLACodes.KeyUp += ComboBox_KeyUp;
+            this.comboBoxLACodes.SelectedValue = this.LADG.CargoLACode;            
 
             this.comboBoxNSTCode.ItemsSource = LADG.CargoCodesNST;
-            this.comboBoxNSTCode.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxNSTCode.KeyUp += ComboBox_KeyUp;
             this.comboBoxNSTCode.SelectedValue = this.LADG.CargoCodeNST;
             this.comboBoxNSTCode.SelectionChanged += ComboBoxNSTCode_SelectionChanged;
 
             this.comboBoxNST3Code.ItemsSource = LADG.CargoCodesNST3;
-            this.comboBoxNST3Code.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxNST3Code.KeyUp += ComboBox_KeyUp;
             this.comboBoxNST3Code.SelectedValue = this.LADG.CargoCodeNST_3;
 
             this.AddVisible = true;
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
index 8da9f474..bb2b5ff4 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
@@ -35,12 +35,12 @@
         <Label Name="labelSecurityMatters" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textSecurityMatters}" />
 
         <enictrl:LocodeControl Grid.Row="0" Grid.Column="1" x:Name="locodePort" />
-        <TextBox Name="textBoxPortName" Grid.Row="1" Grid.Column="1" Margin="2" MaxLength="100" />
-        <TextBox Name="textBoxPortCountry" Grid.Row="2" Grid.Column="1" Margin="2" MaxLength="100" />
+        <TextBox Name="textBoxPortName" Grid.Row="1" Grid.Column="1" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
+        <TextBox Name="textBoxPortCountry" Grid.Row="2" Grid.Column="1" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <DatePicker Name="datePickerATA" Grid.Row="3" Grid.Column="1" Margin="2" />
         <DatePicker Name="datePickerATD" Grid.Row="4" Grid.Column="1" Margin="2" />
         <ComboBox Name="comboBoxShipSecurityLevel" Grid.Row="5" Grid.Column="1" Margin="2" />
-        <TextBox Name="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" />
+        <TextBox Name="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" VerticalContentAlignment="Center"/>
         <TextBox Name="textBoxGisisDescription" Grid.Row="7" Grid.Column="1" Margin="2" IsEnabled="False"/>
         <TextBox Name="textBoxSecurityMatters" Grid.Row="8" Grid.Column="1" Margin="2" MaxLength="255" />
 
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs
index ffee74a3..4219e4f0 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs
@@ -32,7 +32,12 @@ namespace ENI2.EditControls
             this.datePickerATA.SelectedDate = this.LastTenPortFacilitiesCalled.PortFacilityDateOfArrival;
             this.datePickerATD.SelectedDate = this.LastTenPortFacilitiesCalled.PortFacilityDateOfDeparture;
             this.comboBoxShipSecurityLevel.ItemsSource = GlobalStructures.ShipSecurityLevels;
-            this.comboBoxShipSecurityLevel.SelectedIndex = this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel ?? -1;
+
+            if (this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.HasValue)
+                this.comboBoxShipSecurityLevel.SelectedIndex = (this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.Value - 1);
+            else
+                this.comboBoxShipSecurityLevel.SelectedIndex = -1;
+
             this.textBoxGisisCode.Text = this.LastTenPortFacilitiesCalled.PortFacilityGISISCode;
             this.textBoxSecurityMatters.Text = this.LastTenPortFacilitiesCalled.PortFacilitySecurityMattersToReport;
 
@@ -48,10 +53,12 @@ namespace ENI2.EditControls
             this.LastTenPortFacilitiesCalled.PortFacilityDateOfArrival = this.datePickerATA.SelectedDate;
             this.LastTenPortFacilitiesCalled.PortFacilityDateOfDeparture = this.datePickerATD.SelectedDate;
             this.LastTenPortFacilitiesCalled.PortFacilityGISISCode = this.textBoxGisisCode.Text;
+
             if (this.comboBoxShipSecurityLevel.SelectedIndex == -1)
                 this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel = null;
             else
-                this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel = ((byte)this.comboBoxShipSecurityLevel.SelectedIndex);
+                this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel = (byte?) (this.comboBoxShipSecurityLevel.SelectedIndex + 1);
+
             this.LastTenPortFacilitiesCalled.PortFacilitySecurityMattersToReport = this.textBoxSecurityMatters.Text;
         }
 
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml
index 9132c311..22114a07 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml
@@ -37,14 +37,14 @@
         <Label Name="labelStowagePosition" Grid.Row="3" Grid.Column="3" Content="{x:Static p:Resources.textStowagePosition}" HorizontalContentAlignment="Right" />
         <Label Name="labelPortOfDischarge" Grid.Row="4" Grid.Column="3" Content="{x:Static p:Resources.textPortOfDischarge}" HorizontalContentAlignment="Right" />
 
-        <TextBox Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Name="textBoxIdentifier" IsReadOnly="True" MaxLength="40" Margin="2" />
-        <TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Name="textBoxName" MaxLength="255" Margin="2" />
-        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxFlashpointInformation" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
-        <TextBox Grid.Row="2" Grid.Column="4" Name="textBoxFlashpoint" MaxLength="10" Margin="2" />
+        <TextBox Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Name="textBoxIdentifier" IsReadOnly="True" MaxLength="40" Margin="2" VerticalContentAlignment="Center"/>
+        <TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Name="textBoxName" MaxLength="255" Margin="2" VerticalContentAlignment="Center"/>
+        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxFlashpointInformation" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
+        <TextBox Grid.Row="2" Grid.Column="4" Name="textBoxFlashpoint" MaxLength="10" Margin="2" VerticalContentAlignment="Center"/>
         <Label Grid.Row="2" Grid.Column="5" Content="°C" />
-        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownQuantity" Margin="2" FormatString="N3" ShowButtonSpinner="False" />
+        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownQuantity" Margin="2" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
         <Label Grid.Row="3" Grid.Column="2" Content="kg" />
-        <TextBox Grid.Row="3" Grid.Column="4" Name="textBoxStowagePosition" MaxLength="24" Margin="2" />
+        <TextBox Grid.Row="3" Grid.Column="4" Name="textBoxStowagePosition" MaxLength="24" Margin="2" VerticalContentAlignment="Center" />
         <enictrl:LocodeControl Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" x:Name="locodeControlPortOfLoading" />
         <enictrl:LocodeControl Grid.Row="4" Grid.Column="4" Grid.ColumnSpan="2" x:Name="locodeControlPortOfDischarge" />
         <TextBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3" Name="textBoxRemarks" Margin="2" MaxLength="255" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml.cs
index d5977cac..8ad483fb 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml.cs
@@ -33,7 +33,7 @@ namespace ENI2.EditControls
             this.textBoxStowagePosition.Text = this.MARPOL.StowagePosition;
 
             this.comboBoxFlashpointInformation.ItemsSource = IBCPosition.flashpointInformations;
-            this.comboBoxFlashpointInformation.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxFlashpointInformation.KeyUp += ComboBox_KeyUp;
             this.comboBoxFlashpointInformation.SelectedIndex = (this.MARPOL.FlashpointInformation == null) ? -1 : ((int)this.MARPOL.FlashpointInformation);
             this.doubleUpDownQuantity.Value = this.MARPOL.Quantity_KGM;
             this.locodeControlPortOfDischarge.LocodeValue = this.MARPOL.PortOfDischarge;
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml
index 7330f814..7cdb4d4c 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml
@@ -39,11 +39,11 @@
 
         <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxLastName" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="0" Grid.Column="3" Width="auto" Name="textBoxFirstName" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
-        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxGender" Margin="2"  IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
+        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxGender" Margin="2"  IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
         <TextBox Grid.Row="1" Grid.Column="3" Width="auto" Name="textBoxPlaceOfBirth" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
-        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
         <DatePicker Grid.Row="2" Grid.Column="3" Name="datePickerDateOfBirth" Margin="2" />
-        <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+        <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
         <TextBox Grid.Row="3" Grid.Column="3" Width="auto" Name="textBoxIdDocNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="4" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <enictrl:LocodeControl x:Name="locodePortOfEmbarkation" Grid.Row="4" Grid.Column="3" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml.cs
index e57b0cf8..51042205 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml.cs
@@ -30,15 +30,15 @@ namespace ENI2.EditControls
             this.textBoxLastName.Text = this.PAS.PassengerLastName;
             this.textBoxFirstName.Text = this.PAS.PassengerFirstName;
             this.comboBoxGender.ItemsSource = GlobalStructures.GenderList;
-            this.comboBoxGender.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxGender.KeyUp += ComboBox_KeyUp;
             this.comboBoxGender.SelectedIndex = this.PAS.PassengerGender.HasValue ? this.PAS.PassengerGender.Value : -1;
             this.textBoxPlaceOfBirth.Text = this.PAS.PassengerPlaceOfBirth;
             this.comboBoxNationality.ItemsSource = bsmd.database.CREW.NationalityDict;
-            this.comboBoxNationality.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxNationality.KeyUp += ComboBox_KeyUp;
             this.comboBoxNationality.SelectedValue = this.PAS.PassengerNationality;
             this.datePickerDateOfBirth.SelectedDate = this.PAS.PassengerDateOfBirth;
             this.comboBoxIdDocType.ItemsSource = GlobalStructures.IDDocTypeList;
-            this.comboBoxIdDocType.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxIdDocType.KeyUp += ComboBox_KeyUp;
             this.comboBoxIdDocType.SelectedIndex = this.PAS.PassengerIdentityDocumentType.HasValue ? this.PAS.PassengerIdentityDocumentType.Value : -1;
             this.textBoxIdDocNumber.Text = this.PAS.PassengerIdentityDocumentId;
             this.textBoxVisaNumber.Text = this.PAS.PassengerVisaNumber;
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditPortOfItineraryDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditPortOfItineraryDialog.xaml
index 38a23d45..ed89013c 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditPortOfItineraryDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditPortOfItineraryDialog.xaml
@@ -21,7 +21,7 @@
         <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textPortname}" />
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textETA}" />
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="0" x:Name="locodeControlPortName" />
-        <xctk:DateTimePicker Name="dateTimePickerETA" Grid.Column="1" Grid.Row="1" Margin="2" ShowButtonSpinner="False" Format="Custom" FormatString="dd.MM.yyyy HH:mm" VerticalContentAlignment="Center"/>
+        <xctk:DateTimePicker Name="dateTimePickerETA" Grid.Column="1" Grid.Row="1" Margin="2" ShowButtonSpinner="False" Format="Custom" FormatString="dd.MM.yyyy HH:mm" VerticalContentAlignment="Center" TextAlignment="Left"/>
 
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml
index 309a2962..2546154b 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml
@@ -21,7 +21,7 @@
         <Label Name="labelServiceName" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textServiceName}" />
         <Label Name="labelServiceBeneficiary" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textServiceBeneficiary}" />
         <Label Name="labelServiceInvoiceRecipient" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textServiceInvoiceRecipient}" />
-        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxServiceName" Margin="2" MinLines="2" MaxLength="100" />
+        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxServiceName" Margin="2" MinLines="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxServiceBeneficiary" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="100" />
         <TextBox Grid.Row="2" Grid.Column="1" Width="auto" Name="textBoxServiceInvoiceRecipient" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="100" />
     </Grid>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditSanitaryMeasureDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditSanitaryMeasureDialog.xaml
index 24260fb8..5e694deb 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditSanitaryMeasureDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditSanitaryMeasureDialog.xaml
@@ -21,8 +21,8 @@
         <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textSanitaryMeasureKind}" />
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textSanitaryMeasurePlace}" />
         <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textSanitaryMeasureDate}" />
-        <TextBox Name="textBoxSanitaryMeasureKind" Grid.Row="0" Grid.Column="1" Margin="2" MaxLength="255"/>
-        <TextBox Name="textBoxSanitaryMeasurePlace" Grid.Row="1" Grid.Column="1" Margin="2" MaxLength="255"/>
+        <TextBox Name="textBoxSanitaryMeasureKind" Grid.Row="0" Grid.Column="1" Margin="2" MaxLength="255" VerticalContentAlignment="Center"/>
+        <TextBox Name="textBoxSanitaryMeasurePlace" Grid.Row="1" Grid.Column="1" Margin="2" MaxLength="255" VerticalContentAlignment="Center"/>
         <DatePicker Grid.Row="2" Grid.Column="2" Name="datePickerSanitaryMeasureDate" Margin="2" />
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml
index e2c16cfb..1037d2a9 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml
@@ -34,10 +34,10 @@
         <Label Name="labelActivityType" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textActivityType}" />
         <Label Name="labelSecurityMatters" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textSecurityMatters}" />
 
-        <TextBox Name="textBoxLocationName" Grid.Row="0" Grid.Column="1" Margin="2" />
+        <TextBox Name="textBoxLocationName" Grid.Row="0" Grid.Column="1" Margin="2" VerticalContentAlignment="Center"/>
         <enictrl:LocodeControl x:Name="locodeLocation" Grid.Row="0" Grid.Column="3" />
-        <xctk:DoubleUpDown Name="doubleUpDownLatitudeDegrees" Grid.Row="1" Grid.Column="1"  Margin="2" FormatString="N3" ShowButtonSpinner="False" />
-        <xctk:DoubleUpDown Name="doubleUpDownLongitudeDegrees" Grid.Row="1" Grid.Column="3" Margin="2" FormatString="N3" ShowButtonSpinner="False" />
+        <xctk:DoubleUpDown Name="doubleUpDownLatitudeDegrees" Grid.Row="1" Grid.Column="1"  Margin="2" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Name="doubleUpDownLongitudeDegrees" Grid.Row="1" Grid.Column="3" Margin="2" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
         <DatePicker Name="datePickerFrom" Grid.Row="2" Grid.Column="1" Margin="2" />
         <DatePicker Name="datePickerTo" Grid.Row="2" Grid.Column="3" Margin="2" />
         <ComboBox Name="comboBoxActivityType" Grid.Row="4" Grid.Column="1" Margin="2" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml
index f3857226..c77405de 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml
@@ -47,11 +47,11 @@
         
         <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxName" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxPurposeOfCall" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
-        <ComboBox Grid.Row="1" Grid.Column="4" Name="comboBoxFlag" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
-        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownDraught" Margin="2" ShowButtonSpinner="False" FormatString="N1" />
-        <xctk:IntegerUpDown Grid.Row="2" Grid.Column="4" Name="integerUpDownGrossTonnage" Margin="2" ShowButtonSpinner="False" />
-        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownLength" Margin="2" ShowButtonSpinner="False" FormatString="N2"/>
-        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="4" Name="doubleUpDownBeam" Margin="2" ShowButtonSpinner="False" FormatString="N2"/>
+        <ComboBox Grid.Row="1" Grid.Column="4" Name="comboBoxFlag" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
+        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownDraught" Margin="2" ShowButtonSpinner="False" FormatString="N1" TextAlignment="Left"/>
+        <xctk:IntegerUpDown Grid.Row="2" Grid.Column="4" Name="integerUpDownGrossTonnage" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownLength" Margin="2" ShowButtonSpinner="False" FormatString="N2" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="4" Name="doubleUpDownBeam" Margin="2" ShowButtonSpinner="False" FormatString="N2" TextAlignment="Left"/>
         <TextBox Grid.Row="4" Grid.Column="1" Width="auto" Name="textBoxRemarks" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
 
         <TextBlock Text="Operator" FontWeight="Bold" FontSize="10" Grid.Row="5" Grid.Column="0" Margin="10,0,0,0" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml.cs
index 50f3d142..ae5808cd 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml.cs
@@ -50,7 +50,7 @@ namespace ENI2.EditControls
             this.textBoxRemarks.Text = this.IsDeparture ? this.TOWD.TowageOnDepartureRemarks : this.TOWA.TowageOnArrivalRemarks;
             this.comboBoxFlag.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxFlag.SelectedValue = this.IsDeparture ? this.TOWD.TowageOnDepartureFlag : this.TOWA.TowageOnArrivalFlag;
-            this.comboBoxFlag.KeyUp += ComboBox_KeyUp;
+            //this.comboBoxFlag.KeyUp += ComboBox_KeyUp;
             this.doubleUpDownBeam.Value = this.IsDeparture ? this.TOWD.TowageOnDepartureBeam_MTR : this.TOWA.TowageOnArrivalBeam_MTR;
 
             this.textBoxOperatorName.Text = this.IsDeparture ? this.TOWD.TowageOnDepartureOperatorCompanyName : this.TOWA.TowageOnArrivalOperatorCompanyName;
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditWasteDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditWasteDialog.xaml
index 80a0fd23..b5eab007 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditWasteDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditWasteDialog.xaml
@@ -39,12 +39,12 @@
         <Label Name="labelWasteCodeText" Grid.Row="0" Grid.Column="2" />
         <TextBox Name="textBoxDescription" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Width="auto" MaxLength="100" />
 
-        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountWasteDischargedLastPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3"/>
-        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownAmountDisposed" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3"/>
-        <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownMaxCapacity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3"/>
-        <xctk:DoubleUpDown Grid.Row="5" Grid.Column="1" Name="doubleUpDownAmountRetained" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3"/>
+        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountWasteDischargedLastPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownAmountDisposed" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownMaxCapacity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="5" Grid.Column="1" Name="doubleUpDownAmountRetained" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
         <enictrl:LocodeControl Grid.Row="6" Grid.Column="1" x:Name="locodePortOfDeliveryRemainingWaste" />
-        <xctk:DoubleUpDown Grid.Row="7" Grid.Column="1" Name="doubleUpDownAmountGeneratedTilNextPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3"/>
+        <xctk:DoubleUpDown Grid.Row="7" Grid.Column="1" Name="doubleUpDownAmountGeneratedTilNextPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
 
         <Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "2" Grid.Column="2" />
         <Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "3" Grid.Column="2" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
index ab381891..988c9ce8 100644
--- a/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
@@ -23,7 +23,7 @@
             <ColumnDefinition Width="28" />
         </Grid.ColumnDefinitions>
         <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textVisitTransitId}" />
-        <TextBox Name="textBoxVisitTransitId" Margin="2" Grid.Row="0" Grid.Column="1" TextChanged="textBoxVisitTransitId_TextChanged"/>
+        <TextBox Name="textBoxVisitTransitId" Margin="2" Grid.Row="0" Grid.Column="1" TextChanged="textBoxVisitTransitId_TextChanged" VerticalContentAlignment="Center"/>
         <Image Grid.Row="0" Grid.Column="2" Name="okCheckMark" Source="pack://application:,,,/Resources/check.png" Margin="2" Visibility="Hidden" />
         <Label Name="labelIMO" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textIMO}" />
         <Label Name="labelENI" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textENI}" />
@@ -40,7 +40,8 @@
                                   DisplayDefaultValueOnEmptyText="False"
                                   ButtonSpinnerLocation="Right"
                                   ParsingNumberStyle="Integer"
-                                  Watermark="Enter IMO" ValueChanged="doubleUpDownIMO_ValueChanged"/>
+                                  Watermark="Enter IMO" ValueChanged="doubleUpDownIMO_ValueChanged"
+                                  TextAlignment="Left" />
         <xctk:DoubleUpDown x:Name="doubleUpDownENI" Margin="2" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"                                                       
                                   ClipValueToMinMax="True"
                                   ShowButtonSpinner="False" 
@@ -53,7 +54,7 @@
                                   DisplayDefaultValueOnEmptyText="False"
                                   ButtonSpinnerLocation="Right"
                                   ParsingNumberStyle="Integer"
-                                  Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged"/>
+                                  Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
         <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" Grid.ColumnSpan="2"
                     SelectedDateChanged="datePickerETA_SelectedDateChanged" />
 
diff --git a/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml
new file mode 100644
index 00000000..8f4a1e0c
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml
@@ -0,0 +1,27 @@
+<enictrl:EditWindowBase x:Class="ENI2.EditControls.SystemErrorDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:ENI2.EditControls"
+        xmlns:enictrl="clr-namespace:ENI2.Controls"
+        xmlns:p="clr-namespace:ENI2.Properties"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        mc:Ignorable="d"
+        Title="{x:Static p:Resources.textSystemErrors}" Height="300" Width="800" Background="AliceBlue">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="220" />
+        </Grid.RowDefinitions>
+        <enictrl:ENIDataGrid Grid.Row="0" Grid.Column="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                                             SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0" x:Name="dataGridSystemErrors">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="At" Binding="{Binding ErrorAt}" IsReadOnly="True" Width="0.15*" />
+                <DataGridTextColumn Header="{x:Static p:Resources.textSendDate}" Binding="{Binding SendDate}" IsReadOnly="True" Width="0.15*" />
+                <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding ErrorCode}" IsReadOnly="True" Width="0.1*" />
+                <DataGridTextColumn Header="{x:Static p:Resources.textMessage}" Binding="{Binding ErrorMessage}" IsReadOnly="True" Width="0.2*" />
+                <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding ErrorDescription}" IsReadOnly="True" Width="0.3*"  />
+            </DataGrid.Columns>
+        </enictrl:ENIDataGrid>
+    </Grid>
+</enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml.cs
new file mode 100644
index 00000000..34b5077e
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml.cs
@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System.Collections.Generic;
+using System.Windows;
+
+using ENI2.Controls;
+using bsmd.database;
+
+namespace ENI2.EditControls
+{
+    /// <summary>
+    /// Interaction logic for SystemErrorDialog.xaml
+    /// </summary>
+    public partial class SystemErrorDialog : EditWindowBase
+    {
+        public SystemErrorDialog()
+        {
+            InitializeComponent();
+            Loaded += SystemErrorList_Loaded;
+        }
+
+        public List<SystemError> SystemErrors { get; set; }
+
+        private void SystemErrorList_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.dataGridSystemErrors.Initialize();
+            this.dataGridSystemErrors.ItemsSource = this.SystemErrors;
+        }
+    }
+}
diff --git a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
index 0c5f42af..0f4a2ffa 100644
--- a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
@@ -36,7 +36,7 @@
                                   DisplayDefaultValueOnEmptyText="False"
                                   ButtonSpinnerLocation="Right"
                                   ParsingNumberStyle="Integer"
-                                  Watermark="Enter IMO" ValueChanged="doubleUpDownIMO_ValueChanged"/>
+                                  Watermark="Enter IMO" ValueChanged="doubleUpDownIMO_ValueChanged" TextAlignment="Left"/>
         <xctk:DoubleUpDown x:Name="doubleUpDownENI" Margin="2" Grid.Row="1" Grid.Column="1"                                                             
                                   ClipValueToMinMax="True"
                                   ShowButtonSpinner="False" 
@@ -49,7 +49,7 @@
                                   DisplayDefaultValueOnEmptyText="False"
                                   ButtonSpinnerLocation="Right"
                                   ParsingNumberStyle="Integer"
-                                  Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged"/>
+                                  Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="2" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" />
         <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" />
     </Grid>
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
index 9716e053..45d2f4e0 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
@@ -360,6 +360,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap hand_red_card {
+            get {
+                object obj = ResourceManager.GetObject("hand_red_card", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -1919,6 +1929,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Import filename.
+        /// </summary>
+        public static string textImportFilename {
+            get {
+                return ResourceManager.GetString("textImportFilename", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Import from Excel file.
         /// </summary>
@@ -2423,6 +2442,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Message.
+        /// </summary>
+        public static string textMessage {
+            get {
+                return ResourceManager.GetString("textMessage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Message reset at {0}.
         /// </summary>
@@ -3305,6 +3333,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Send date.
+        /// </summary>
+        public static string textSendDate {
+            get {
+                return ResourceManager.GetString("textSendDate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Send to NSW.
         /// </summary>
@@ -3584,6 +3621,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to System errors.
+        /// </summary>
+        public static string textSystemErrors {
+            get {
+                return ResourceManager.GetString("textSystemErrors", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Border police.
         /// </summary>
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.resx b/ENI-2/ENI2/ENI2/Properties/Resources.resx
index d6215b7e..06aec4ce 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.resx
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.resx
@@ -1432,4 +1432,19 @@
   <data name="textCopyToHAZD" xml:space="preserve">
     <value>Copy to HAZD</value>
   </data>
+  <data name="hand_red_card" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\hand_red_card.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="textSystemErrors" xml:space="preserve">
+    <value>System errors</value>
+  </data>
+  <data name="textImportFilename" xml:space="preserve">
+    <value>Import filename</value>
+  </data>
+  <data name="textMessage" xml:space="preserve">
+    <value>Message</value>
+  </data>
+  <data name="textSendDate" xml:space="preserve">
+    <value>Send date</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/Resources/hand_red_card.png b/ENI-2/ENI2/ENI2/Resources/hand_red_card.png
new file mode 100644
index 00000000..1b3fd3f4
Binary files /dev/null and b/ENI-2/ENI2/ENI2/Resources/hand_red_card.png differ
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 3226b8d1..b7bd80a0 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/DBManager.cs b/nsw/Source/bsmd.database/DBManager.cs
index 4abcaa35..f652bac8 100644
--- a/nsw/Source/bsmd.database/DBManager.cs
+++ b/nsw/Source/bsmd.database/DBManager.cs
@@ -579,6 +579,14 @@ namespace bsmd.database
             this.LogNonQueryResult(cmd.CommandText, queryResult);
         }
 
+        public void DeleteSystemErrors(Message message)
+        {
+            SqlCommand cmd = new SqlCommand();
+            cmd.CommandText = string.Format("UPDATE SystemError SET Deleted = 1 WHERE MessageHeaderId='{0}'", message.Id);
+            int queryResult = this.PerformNonQuery(cmd);
+            this.LogNonQueryResult(cmd.CommandText, queryResult);
+        }
+
         public void Save(MessageCore core)
         {
             if (core.Customer != null)
@@ -638,6 +646,7 @@ namespace bsmd.database
             {            
                 this.LoadErrorList(message);
                 this.LoadViolationList(message);
+                this.LoadSystemErrorList(message);
 
                 SqlCommand cmd = new SqlCommand();
 
@@ -1004,6 +1013,17 @@ namespace bsmd.database
                 message.ViolationList.Add(violation);
         }
 
+        internal void LoadSystemErrorList(Message message)
+        {
+            SystemError aSystemError = new SystemError();
+            SqlCommand cmd = new SqlCommand();
+            aSystemError.PrepareLoadCommand(cmd, Message.LoadFilter.MESSAGEHEADER, message.Id);
+            SqlDataReader reader = this.PerformCommand(cmd);
+            List<DatabaseEntity> systemErrorList = aSystemError.LoadList(reader);
+            foreach (SystemError sError in systemErrorList)
+                message.SystemErrorList.Add(sError);
+        }
+
         internal void LoadCustomer(MessageCore core)
         {
             if (core.CustomerId.HasValue)
diff --git a/nsw/Source/bsmd.database/MARPOL_Annex_I_Position.cs b/nsw/Source/bsmd.database/MARPOL_Annex_I_Position.cs
index e779d3a7..28db6d13 100644
--- a/nsw/Source/bsmd.database/MARPOL_Annex_I_Position.cs
+++ b/nsw/Source/bsmd.database/MARPOL_Annex_I_Position.cs
@@ -171,6 +171,7 @@ namespace bsmd.database
 
         public void CopyFromMARPOL(MARPOL_Annex_I_Position selectedMARPOL)
         {
+            if (selectedMARPOL == null) return;
             this.FlashpointInformation = selectedMARPOL.FlashpointInformation;
             this.Flashpoint_CEL = selectedMARPOL.Flashpoint_CEL;
             this.Name = selectedMARPOL.Name;
diff --git a/nsw/Source/bsmd.database/Message.cs b/nsw/Source/bsmd.database/Message.cs
index 72b8582d..c2898313 100644
--- a/nsw/Source/bsmd.database/Message.cs
+++ b/nsw/Source/bsmd.database/Message.cs
@@ -21,6 +21,7 @@ namespace bsmd.database
         private DateTime? changed;
         private List<MessageError> errorList = new List<MessageError>();
         private List<MessageViolation> violationList = new List<MessageViolation>();
+        private List<SystemError> systemErrorList = new List<SystemError>();
         private List<DatabaseEntity> elements = new List<DatabaseEntity>();
 
         #endregion
@@ -266,6 +267,11 @@ namespace bsmd.database
         /// </summary>
         public List<MessageViolation> ViolationList { get { return this.violationList; } }
 
+        /// <summary>
+        /// Liste mit "System"-Errors (HIS-Nord)
+        /// </summary>
+        public List<SystemError> SystemErrorList { get { return this.systemErrorList; } }
+
         /// <summary>
         /// Property to overwrite reporting party in certain circumstances (other melder meldet)
         /// </summary>
@@ -321,6 +327,11 @@ namespace bsmd.database
         /// </summary>
         public bool HasUpdates { get; set; }
 
+        /// <summary>
+        /// ENI Display flag
+        /// </summary>
+        public bool HasSystemErrors { get { return !this.SystemErrorList.IsNullOrEmpty(); } }
+
         /// <summary>
         /// Flag zeigt an ob ein Benutzer einen Reminder für ein Feld der Meldeklasse gesetzt hat
         /// </summary>
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index dbde6ac7..620b9521 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.6.14")]
+[assembly: AssemblyInformationalVersion("3.6.15")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index c7570efc..676ed9a4 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.6.14.*")]
+[assembly: AssemblyVersion("3.6.15.*")]
 
diff --git a/nsw/Source/bsmd.database/SystemError.cs b/nsw/Source/bsmd.database/SystemError.cs
index 6e44d0ce..fd60bae9 100644
--- a/nsw/Source/bsmd.database/SystemError.cs
+++ b/nsw/Source/bsmd.database/SystemError.cs
@@ -61,6 +61,8 @@ namespace bsmd.database
 
         public DateTime? SendDate { get; set; }
 
+        public Guid? MessageHeaderId { get; set; }
+
         #endregion
 
         #region DatabaseEntity implementation
@@ -83,6 +85,7 @@ namespace bsmd.database
                 if (!reader.IsDBNull(8)) se.ErrorDescription = reader.GetString(8);
                 if (!reader.IsDBNull(9)) se.MessageCoreId = reader.GetGuid(9);
                 if (!reader.IsDBNull(10)) se.Status = (SystemError.SystemErrorStatus) Enum.ToObject(typeof(SystemError.SystemErrorStatus), reader.GetByte(10));
+                if (!reader.IsDBNull(11)) se.MessageHeaderId = reader.GetGuid(11);
 
                 result.Add(se);
             }
@@ -92,7 +95,7 @@ namespace bsmd.database
 
         public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
         {
-            string query = string.Format("SELECT Id, ErrorAt, MeldeType, ReferenceId, ProcessStatus, ImportFilename, ErrorCode, ErrorMessage, ErrorDescription, MessageCoreId, Status FROM {0} ", this.Tablename);
+            string query = string.Format("SELECT Id, ErrorAt, MeldeType, ReferenceId, ProcessStatus, ImportFilename, ErrorCode, ErrorMessage, ErrorDescription, MessageCoreId, Status, MessageHeaderId FROM {0} ", this.Tablename);
 
             switch (filter)
             {
@@ -100,6 +103,10 @@ namespace bsmd.database
                     query += "WHERE MessageCoreId = @COREID";
                     ((SqlCommand)cmd).Parameters.AddWithValue("@COREID", criteria[0]);
                     break;
+                case Message.LoadFilter.MESSAGEHEADER:
+                    query += "WHERE MessageHeaderId = @MHID";
+                    ((SqlCommand)cmd).Parameters.AddWithValue("@MHID", criteria[0]);
+                    break;
                 case Message.LoadFilter.ALL:
                 default:
                     break;
@@ -112,27 +119,28 @@ namespace bsmd.database
         {
             SqlCommand scmd = cmd as SqlCommand;
 
-            scmd.Parameters.AddWithValue("@EAT", this.ErrorAt);
-            scmd.Parameters.AddWithValue("@MT", this.Meldetype);
-            scmd.Parameters.AddWithValue("@REFID", this.ReferenceId);
-            scmd.Parameters.AddWithValue("@PS", this.ProcessStatus);
-            scmd.Parameters.AddWithValue("@IF", this.ImportFilename);
-            scmd.Parameters.AddWithValue("@EC", this.ErrorCode);
-            scmd.Parameters.AddWithValue("@EM", this.ErrorMessage);
-            scmd.Parameters.AddWithValue("@ED", this.ErrorDescription);
-            scmd.Parameters.AddWithValue("@MCID", this.MessageCoreId);
-            scmd.Parameters.AddWithValue("@STATUS", (byte)this.Status);
+            scmd.Parameters.AddWithNullableValue("@EAT", this.ErrorAt);
+            scmd.Parameters.AddWithNullableValue("@MT", this.Meldetype);
+            scmd.Parameters.AddWithNullableValue("@REFID", this.ReferenceId);
+            scmd.Parameters.AddWithNullableValue("@PS", this.ProcessStatus);
+            scmd.Parameters.AddWithNullableValue("@IF", this.ImportFilename);
+            scmd.Parameters.AddWithNullableValue("@EC", this.ErrorCode);
+            scmd.Parameters.AddWithNullableValue("@EM", this.ErrorMessage);
+            scmd.Parameters.AddWithNullableValue("@ED", this.ErrorDescription);
+            scmd.Parameters.AddWithNullableValue("@MCID", this.MessageCoreId);
+            scmd.Parameters.AddWithNullableValue("@STATUS", (byte)this.Status);
+            scmd.Parameters.AddWithNullableValue("@MHID", this.MessageHeaderId);
 
             if (this.IsNew)
             {
-                scmd.CommandText = string.Format("INSERT INTO {0} (ErrorAt, MeldeType, ReferenceId, ProcessStatus, ImportFilename, ErrorCode, ErrorMessage, ErrorDescription, MessageCoreId, Status) " +
-                    "VALUES (@EAT, @MT, @REFID, @PS, @IF, @EC, @EM, @ED, @MCID, @STATUS)", this.Tablename);
+                scmd.CommandText = string.Format("INSERT INTO {0} (ErrorAt, MeldeType, ReferenceId, ProcessStatus, ImportFilename, ErrorCode, ErrorMessage, ErrorDescription, MessageCoreId, Status, MessageHeaderId) " +
+                    "VALUES (@EAT, @MT, @REFID, @PS, @IF, @EC, @EM, @ED, @MCID, @STATUS, @MHID)", this.Tablename);
             }
             else
             {
                 scmd.Parameters.AddWithValue("@ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET ErrorAt = @EAT, MeldeType = @MT, ReferenceId = @REFID, ProcessStatus = @PS, ImportFilename = @IF, " +
-                    "ErrorCode = @EC, ErrorMessage = @EM, ErrorDescription = @ED, MessageCoreId = @MCID, Status = @STATUS WHERE Id = @ID", this.Tablename);
+                    "ErrorCode = @EC, ErrorMessage = @EM, ErrorDescription = @ED, MessageCoreId = @MCID, Status = @STATUS, MessageHeaderId = @MHID WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs
index 3a41f087..8267a92e 100644
--- a/nsw/Source/bsmd.hisnord/Request.cs
+++ b/nsw/Source/bsmd.hisnord/Request.cs
@@ -97,6 +97,7 @@ namespace bsmd.hisnord
                         _log.DebugFormat("preparing {0}", noteMessageDict[notificationClass].MessageNotificationClassDisplay);
                         noteMessageDict[notificationClass].InternalStatus = Message.BSMDStatus.SENT;
                         noteMessageDict[notificationClass].SentAt = DateTime.Now;
+                        DBManager.Instance.DeleteSystemErrors(noteMessageDict[notificationClass]);
                         result = noteMessageDict[notificationClass];
                     }
                     DBManager.Instance.Save(noteMessageDict[notificationClass]);                  
diff --git a/nsw/Source/bsmd.hisnord/Response.cs b/nsw/Source/bsmd.hisnord/Response.cs
index d82d0489..b1063d2e 100644
--- a/nsw/Source/bsmd.hisnord/Response.cs
+++ b/nsw/Source/bsmd.hisnord/Response.cs
@@ -83,13 +83,14 @@ namespace bsmd.hisnord
                                             {
                                                 Message refMessage = DBManager.Instance.GetMessage(aCore, notificationClass);
                                                 if(refMessage != null)
-                                                {
+                                                {                                                    
                                                     refMessage.InternalStatus = Message.BSMDStatus.SEND_FAILED;
+                                                    systemError.MessageHeaderId = refMessage.Id;
                                                     DBManager.Instance.Save(refMessage);
                                                 }
                                             }
 
-                                            _log.InfoFormat("SystemError received for Core [{0}], IMO {1} ETA {2}: {3}", aCore.Id, aCore.IMO, aCore.ETADisplay, systemError.ErrorMessage);
+                                            _log.WarnFormat("SystemError received for Core [{0}], IMO {1} ETA {2}: {3} Class {4}", aCore.Id, aCore.IMO, aCore.ETADisplay, systemError.ErrorMessage, Enum.GetName(typeof(Message.NotificationClass), notificationClass));
                                         }
                                         else
                                         {
@@ -132,8 +133,7 @@ namespace bsmd.hisnord
                                             foreach (Message aMessage in messages)
                                             {
                                                 if (aMessage.MessageNotificationClass == nswResponse.NotificationClass)
-                                                {
-
+                                                {                                                    
                                                     if (nswResponse.Status != null)
                                                     {
                                                         aMessage.ReceivedAt = nswResponse.ReceiveAt;