diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 71eac00..8a44182 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -64,12 +64,12 @@
 
         <Label Content="Zeit Ref." Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right" />
 
-        <Label Content="ETA" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right" Margin="0,2,0,26" Grid.RowSpan="2"/>
-        <Label Content="ETD" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
+        <Label Content="ETA" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right" Margin="0,2,0,26" Grid.RowSpan="2" x:Name="labelETA"/>
+        <Label Content="ETD" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right" x:Name="labelETD"/>
 
         <ComboBox x:Name="comboBoxTimeRef" Grid.Column="3" Margin="2" Grid.Row="2" />
-        <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
-        <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
+        <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
+        <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
 
         <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="5"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 052dfaa..077eebb 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -116,9 +116,13 @@ namespace BreCalClient
             {
                 switch (type)
                 {
-                    case ShipcallType.Arrival:
-                        this.datePickerETA.IsEnabled = true;
-                        this.datePickerETD.IsEnabled = false;
+                    case ShipcallType.Arrival:                        
+                        this.datePickerETD.Visibility = Visibility.Hidden;
+                        this.labelETD.Visibility = Visibility.Hidden;
+                        this.datePickerETA.Visibility = Visibility.Visible;
+                        this.labelETA.Visibility = Visibility.Visible;
+                        Grid.SetRow(datePickerETA, 3);
+                        Grid.SetRow(labelETA, 3);
                         this.datePickerETD.Value = null;
                         this.comboBoxDepartureBerth.SelectedIndex = -1;
                         this.comboBoxDepartureBerth.IsEnabled = false;
@@ -126,8 +130,10 @@ namespace BreCalClient
                         this.comboBoxTimeRef.IsEnabled = true;
                         break;
                     case ShipcallType.Departure:
-                        this.datePickerETA.IsEnabled = false;
-                        this.datePickerETD.IsEnabled = true;
+                        this.datePickerETD.Visibility = Visibility.Visible;
+                        this.labelETD.Visibility = Visibility.Visible;
+                        this.datePickerETA.Visibility = Visibility.Hidden;
+                        this.labelETA.Visibility = Visibility.Hidden;
                         this.datePickerETA.Value = null;
                         this.comboBoxArrivalBerth.SelectedIndex = -1;
                         this.comboBoxArrivalBerth.IsEnabled = false;
@@ -136,8 +142,12 @@ namespace BreCalClient
                         this.comboBoxTimeRef.SelectedIndex = 0;
                         break;
                     case ShipcallType.Shifting:
-                        this.datePickerETA.IsEnabled = true;
-                        this.datePickerETD.IsEnabled = true;
+                        Grid.SetRow(datePickerETA, 4);
+                        Grid.SetRow(labelETA, 4);
+                        this.datePickerETA.Visibility = Visibility.Visible;
+                        this.labelETA.Visibility = Visibility.Visible;
+                        this.datePickerETD.Visibility = Visibility.Visible;
+                        this.labelETD.Visibility = Visibility.Visible;
                         this.comboBoxArrivalBerth.IsEnabled = true;
                         this.comboBoxDepartureBerth.IsEnabled = true;
                         this.comboBoxTimeRef.IsEnabled = false;