diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 864dd16..6566e00 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -8,7 +8,7 @@
         xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="326" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize">
+        Title="{x:Static p:Resources.textEditShipcall}" Height="466" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.15*"/>
@@ -27,15 +27,27 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
 
-        <Label Content="{x:Static p:Resources.textShip}" Grid.Column="0" Grid.Row="0" />
-        <Label Content="{x:Static p:Resources.textType}" Grid.Column="0" Grid.Row="1" />
-        <Label Content="ETA" Grid.Column="0" Grid.Row="2" />
-        <Label Content="{x:Static p:Resources.textVoyage}" Grid.Column="0" Grid.Row="3" />
-        <Label Content="ETD" Grid.Column="0" Grid.Row="4" />
-        <Label Content="{x:Static p:Resources.textArrivalTerminal}" Grid.Column="0" Grid.Row="5" />
-        <Label Content="{x:Static p:Resources.textDepartureTerminal}" Grid.Column="0" Grid.Row="6" />
+        <Label Content="{x:Static p:Resources.textShip}" Grid.Column="0" Grid.Row="0"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textType}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" />
+        <Label Content="ETA" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textVoyage}" Grid.Column="0" Grid.Row="3"  HorizontalContentAlignment="Right"/>
+        <Label Content="ETD" Grid.Column="0" Grid.Row="4"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textArrivalTerminal}" Grid.Column="0" Grid.Row="5"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textDepartureTerminal}" Grid.Column="0" Grid.Row="6"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textTugRequired}" Grid.Column="1" Grid.Row="7" />
+        <Label Content="{x:Static p:Resources.textPilotRequired}" Grid.Column="1" Grid.Row="8" />
+        <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="9" HorizontalContentAlignment="Right" />
+        <Label Content="{x:Static p:Resources.textBunkering}" Grid.Column="1" Grid.Row="10" />
+        <Label Content="{x:Static p:Resources.textReplenishingTerminal}" Grid.Column="1" Grid.Row="11" />
+        <Label Content="{x:Static p:Resources.textReplenishingLock}" Grid.Column="1" Grid.Row="12" />
+        <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="13" HorizontalContentAlignment="Right" />
 
         <ComboBox x:Name="comboBoxShip" Margin="2" Grid.Column="1" Grid.Row="0" >
             <ComboBox.ItemTemplate>
@@ -59,20 +71,42 @@
         <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="1" Grid.Row="4" Margin="2" />
         <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="5" Margin="2" DisplayMemberPath="Name" />
         <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="6" Margin="2" DisplayMemberPath="Name" />
+        <CheckBox x:Name="checkBoxTugRequired" Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
+        <CheckBox x:Name="checkBoxPilotRequired" Grid.Column="0" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
+        <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="9" Margin="2" />
+        <CheckBox x:Name="checkBoxBunkering" Grid.Column="0" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
+        <CheckBox x:Name="checkBoxReplenishingTerminal" Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
+        <CheckBox x:Name="checkBoxReplenishingLock" Grid.Column="0" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
+        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="13" Margin="2" FormatString="C2" Minimum="0" />
 
-        <Label Content="{x:Static p:Resources.textParticipants}" FontWeight="DemiBold" Grid.Column="2" Grid.Row="0" />
-        <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="1" />
-        <Label Content="{x:Static p:Resources.textMooring}" Grid.Column="2" Grid.Row="2" />
-        <Label Content="{x:Static p:Resources.textPilot}" Grid.Column="2" Grid.Row="3" />
-        <Label Content="{x:Static p:Resources.textTug}" Grid.Column="2" Grid.Row="4" />
-        <Label Content="{x:Static p:Resources.textTerminal}" Grid.Column="2" Grid.Row="5" />
+        <Label Content="{x:Static p:Resources.textParticipants}" FontWeight="DemiBold" Grid.Column="3" Grid.Row="0" />
+        <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="1"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textMooring}" Grid.Column="2" Grid.Row="2"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textPilot}" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textTug}" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textTerminal}" Grid.Column="2" Grid.Row="5"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textTidalWindow}" FontWeight="DemiBold" Grid.Column="3" Grid.Row="6" />
+        <Label Content="{x:Static p:Resources.textFrom}" Grid.Column="2" Grid.Row="7" HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textTo}" Grid.Column="2" Grid.Row="8" HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textRainSensitiveCargo}" Grid.Column="3" Grid.Row="9" />
+        <Label Content="{x:Static p:Resources.textRecommendedTugs}" Grid.Column="2" Grid.Row="10" HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textAnchored}" Grid.Column="3" Grid.Row="11" />
+        <Label Content="{x:Static p:Resources.textMooredLock}" Grid.Column="3" Grid.Row="12" />
+        <Label Content="{x:Static p:Resources.textCancelled}" Grid.Column="3" Grid.Row="13" />
         <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="1" Margin="2" DisplayMemberPath="Name"/>
         <ComboBox Name="comboBoxMooring" Grid.Column="3" Grid.Row="2" Margin="2" DisplayMemberPath="Name"/>
         <ComboBox Name="comboBoxPilot" Grid.Column="3" Grid.Row="3" Margin="2" DisplayMemberPath="Name"/>
         <ComboBox Name="comboBoxTug" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name"/>
         <ComboBox Name="comboBoxTerminal" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name"/>
+        <xctk:DateTimePicker Name="datePickerTidalWindowFrom" Grid.Column="3" Grid.Row="7" Margin="2" />
+        <xctk:DateTimePicker Name="datePickerTidalWindowTo" Grid.Column="3" Grid.Row="8" Margin="2" />
+        <CheckBox x:Name="checkBoxRainsensitiveCargo" Grid.Column="2" Grid.Row="9" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
+        <xctk:IntegerUpDown x:Name="integerUpDownRecommendedTugs" Grid.Column="3" Grid.Row="10" Minimum="0" Margin="2" />
+        <CheckBox x:Name="checkBoxAnchored" Grid.Column="2" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
+        <CheckBox x:Name="checkBoxMooredLock" Grid.Column="2" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
+        <CheckBox x:Name="checkBoxCanceled" Grid.Column="2" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
 
-        <StackPanel Grid.Row="9" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel Grid.Row="14" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click"/>
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 3c02483..a6e05ac 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -188,6 +188,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Anchored.
+        /// </summary>
+        public static string textAnchored {
+            get {
+                return ResourceManager.GetString("textAnchored", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Arrival terminal.
         /// </summary>
@@ -215,6 +224,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Bunkering.
+        /// </summary>
+        public static string textBunkering {
+            get {
+                return ResourceManager.GetString("textBunkering", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Callsign.
         /// </summary>
@@ -233,6 +251,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cancelled.
+        /// </summary>
+        public static string textCancelled {
+            get {
+                return ResourceManager.GetString("textCancelled", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Categories.
         /// </summary>
@@ -251,6 +278,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Draft.
+        /// </summary>
+        public static string textDraft {
+            get {
+                return ResourceManager.GetString("textDraft", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit ship call.
         /// </summary>
@@ -314,6 +350,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Moored in lock.
+        /// </summary>
+        public static string textMooredLock {
+            get {
+                return ResourceManager.GetString("textMooredLock", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Mooring.
         /// </summary>
@@ -359,6 +404,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pier side.
+        /// </summary>
+        public static string textPierside {
+            get {
+                return ResourceManager.GetString("textPierside", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Pilot.
         /// </summary>
@@ -377,6 +431,42 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Rain sensitive cargo.
+        /// </summary>
+        public static string textRainSensitiveCargo {
+            get {
+                return ResourceManager.GetString("textRainSensitiveCargo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Recommended tugs.
+        /// </summary>
+        public static string textRecommendedTugs {
+            get {
+                return ResourceManager.GetString("textRecommendedTugs", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Replenishing lock.
+        /// </summary>
+        public static string textReplenishingLock {
+            get {
+                return ResourceManager.GetString("textReplenishingLock", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Replenishing terminal.
+        /// </summary>
+        public static string textReplenishingTerminal {
+            get {
+                return ResourceManager.GetString("textReplenishingTerminal", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Search.
         /// </summary>
@@ -422,6 +512,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Tidal window.
+        /// </summary>
+        public static string textTidalWindow {
+            get {
+                return ResourceManager.GetString("textTidalWindow", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to to.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 362a339..67eab1c 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -151,6 +151,9 @@
   <data name="textAgency" xml:space="preserve">
     <value>Agentur</value>
   </data>
+  <data name="textAnchored" xml:space="preserve">
+    <value>Ankerorder</value>
+  </data>
   <data name="textArrivalTerminal" xml:space="preserve">
     <value>Terminal Ankunft</value>
   </data>
@@ -160,18 +163,27 @@
   <data name="textBerths" xml:space="preserve">
     <value>Liegeplätze</value>
   </data>
+  <data name="textBunkering" xml:space="preserve">
+    <value>Bunkeraufnahme</value>
+  </data>
   <data name="textCallsign" xml:space="preserve">
     <value>Rufzeichen</value>
   </data>
   <data name="textCancel" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
+  <data name="textCancelled" xml:space="preserve">
+    <value>Annulliert</value>
+  </data>
   <data name="textCategories" xml:space="preserve">
     <value>Kategorien</value>
   </data>
   <data name="textDepartureTerminal" xml:space="preserve">
     <value>Terminal Abfahrt</value>
   </data>
+  <data name="textDraft" xml:space="preserve">
+    <value>Tiefgang</value>
+  </data>
   <data name="textEditShipcall" xml:space="preserve">
     <value>Schiffsanlauf bearbeiten</value>
   </data>
@@ -193,6 +205,9 @@
   <data name="textLogin" xml:space="preserve">
     <value>Anmelden</value>
   </data>
+  <data name="textMooredLock" xml:space="preserve">
+    <value>Festmacher in Schleuse</value>
+  </data>
   <data name="textMooring" xml:space="preserve">
     <value>Festmacher</value>
   </data>
@@ -208,9 +223,27 @@
   <data name="textPassword" xml:space="preserve">
     <value>Passwort</value>
   </data>
+  <data name="textPierside" xml:space="preserve">
+    <value>Anlegeseite</value>
+  </data>
   <data name="textPilot" xml:space="preserve">
     <value>Lotse</value>
   </data>
+  <data name="textPilotRequired" xml:space="preserve">
+    <value>Lotsorder</value>
+  </data>
+  <data name="textRainSensitiveCargo" xml:space="preserve">
+    <value>Regensensitive Ladung</value>
+  </data>
+  <data name="textRecommendedTugs" xml:space="preserve">
+    <value>Anzahl Schlepper</value>
+  </data>
+  <data name="textReplenishingLock" xml:space="preserve">
+    <value>Versorgungsaufnahme Schleuse</value>
+  </data>
+  <data name="textReplenishingTerminal" xml:space="preserve">
+    <value>Versorgungsaufnahme Terminal</value>
+  </data>
   <data name="textSearch" xml:space="preserve">
     <value>Suche</value>
   </data>
@@ -226,12 +259,18 @@
   <data name="textTerminal" xml:space="preserve">
     <value>Terminal</value>
   </data>
+  <data name="textTidalWindow" xml:space="preserve">
+    <value>Tidenfenster</value>
+  </data>
   <data name="textTo" xml:space="preserve">
     <value>bis</value>
   </data>
   <data name="textTug" xml:space="preserve">
     <value>Schlepper</value>
   </data>
+  <data name="textTugRequired" xml:space="preserve">
+    <value>Schlepperorder</value>
+  </data>
   <data name="textType" xml:space="preserve">
     <value>Typ</value>
   </data>
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index bd3f0f8..4b00555 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -157,6 +157,9 @@
   <data name="textAgency" xml:space="preserve">
     <value>Agency</value>
   </data>
+  <data name="textAnchored" xml:space="preserve">
+    <value>Anchored</value>
+  </data>
   <data name="textArrivalTerminal" xml:space="preserve">
     <value>Arrival terminal</value>
   </data>
@@ -166,18 +169,27 @@
   <data name="textBerths" xml:space="preserve">
     <value>Berths</value>
   </data>
+  <data name="textBunkering" xml:space="preserve">
+    <value>Bunkering</value>
+  </data>
   <data name="textCallsign" xml:space="preserve">
     <value>Callsign</value>
   </data>
   <data name="textCancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
+  <data name="textCancelled" xml:space="preserve">
+    <value>Cancelled</value>
+  </data>
   <data name="textCategories" xml:space="preserve">
     <value>Categories</value>
   </data>
   <data name="textDepartureTerminal" xml:space="preserve">
     <value>Departure terminal</value>
   </data>
+  <data name="textDraft" xml:space="preserve">
+    <value>Draft</value>
+  </data>
   <data name="textEditShipcall" xml:space="preserve">
     <value>Edit ship call</value>
   </data>
@@ -199,6 +211,9 @@
   <data name="textLogin" xml:space="preserve">
     <value>Login</value>
   </data>
+  <data name="textMooredLock" xml:space="preserve">
+    <value>Moored in lock</value>
+  </data>
   <data name="textMooring" xml:space="preserve">
     <value>Mooring</value>
   </data>
@@ -214,12 +229,27 @@
   <data name="textPassword" xml:space="preserve">
     <value>Password</value>
   </data>
+  <data name="textPierside" xml:space="preserve">
+    <value>Pier side</value>
+  </data>
   <data name="textPilot" xml:space="preserve">
     <value>Pilot</value>
   </data>
   <data name="textPilotRequired" xml:space="preserve">
     <value>Pilot required</value>
   </data>
+  <data name="textRainSensitiveCargo" xml:space="preserve">
+    <value>Rain sensitive cargo</value>
+  </data>
+  <data name="textRecommendedTugs" xml:space="preserve">
+    <value>Recommended tugs</value>
+  </data>
+  <data name="textReplenishingLock" xml:space="preserve">
+    <value>Replenishing lock</value>
+  </data>
+  <data name="textReplenishingTerminal" xml:space="preserve">
+    <value>Replenishing terminal</value>
+  </data>
   <data name="textSearch" xml:space="preserve">
     <value>Search</value>
   </data>
@@ -235,6 +265,9 @@
   <data name="textTerminal" xml:space="preserve">
     <value>Terminal</value>
   </data>
+  <data name="textTidalWindow" xml:space="preserve">
+    <value>Tidal window</value>
+  </data>
   <data name="textTo" xml:space="preserve">
     <value>to</value>
   </data>