diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index 6ab1b75..8619d48 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -8,7 +8,7 @@
         xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="{x:Static p:Resources.textEditTimes}" Height="293" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditTimes}" Height="331" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width=".25*" />
@@ -22,6 +22,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
             <RowDefinition Height="56" />
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
@@ -32,10 +33,11 @@
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textETABerth}" HorizontalContentAlignment="Right" x:Name="labelETA" />
         <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDBerth}" HorizontalContentAlignment="Right" x:Name="labelETD" />
         <Label Grid.Row="3" Grid.Column="0" Content="ATA" HorizontalContentAlignment="Right" x:Name="labelATA" />
-        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textZoneEntryTime}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="4" Grid.Column="0" Content="ATD" HorizontalContentAlignment="Right" x:Name="labelATD" />
+        <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textZoneEntryTime}" HorizontalContentAlignment="Right" />
         
-        <Label Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
 
         <xctk:DateTimePicker IsEnabled="False" Grid.Row="1" Grid.Column="1" Margin="2" Name="datePickerETABerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
@@ -61,10 +63,10 @@
             </xctk:DateTimePicker.ContextMenu>
         </xctk:DateTimePicker>
 
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="3" Grid.Column="1" Margin="2" Name="datePickerATAATD" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        <xctk:DateTimePicker IsEnabled="False"  Grid.Row="3" Grid.Column="1" Margin="2" Name="datePickerATA" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearATAATD" Click="contextMenuItemClearATAATD_Click" >
+                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearATA" Click="contextMenuItemClearATA_Click" >
                         <MenuItem.Icon>
                             <Image Source="Resources\delete.png" />
                         </MenuItem.Icon>
@@ -72,8 +74,20 @@
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
         </xctk:DateTimePicker>
-        
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="4" Grid.Column="1" Margin="2" Name="datePickerLockTime" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="4" Grid.Column="1" Margin="2" Name="datePickerATD" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+            <xctk:DateTimePicker.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearATD" Click="contextMenuItemClearATD_Click" >
+                        <MenuItem.Icon>
+                            <Image Source="Resources\delete.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+            </xctk:DateTimePicker.ContextMenu>
+        </xctk:DateTimePicker>
+
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="5" Grid.Column="1" Margin="2" Name="datePickerLockTime" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearLockTime" Click="contextMenuItemClearLockTime_Click" >
@@ -85,7 +99,7 @@
             </xctk:DateTimePicker.ContextMenu>
         </xctk:DateTimePicker>
         <!--CheckBox IsEnabled="False" Grid.Row="3" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxLockTimeFixed" VerticalAlignment="Center" /-->
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="5" Grid.Column="1" Margin="2" Name="datePickerZoneEntry" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="6" Grid.Column="1" Margin="2" Name="datePickerZoneEntry" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearZoneEntry" Click="contextMenuItemClearZoneEntry_Click" >
@@ -98,8 +112,8 @@
         </xctk:DateTimePicker>
         <!--CheckBox IsEnabled="False" Grid.Row="4" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxZoneEntryFixed" VerticalAlignment="Center" /-->
 
-        <TextBox Grid.Row="6" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsEnabled="False" MaxLength="512"/>
-        <StackPanel Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
+        <TextBox Grid.Row="7" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsEnabled="False" MaxLength="512"/>
+        <StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 5383e2e..d31b992 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -73,7 +73,8 @@ namespace BreCalClient
             this.Times.EtdBerth = this.datePickerETDBerth.Value;
             this.Times.LockTime = this.datePickerLockTime.Value;
             this.Times.ZoneEntry = this.datePickerZoneEntry.Value;
-            this.Times.AtaAtd = this.datePickerATAATD.Value;
+            this.Times.Ata = this.datePickerATA.Value;
+            this.Times.Atd = this.datePickerATD.Value;
         }
 
         private void CopyToControls()
@@ -83,7 +84,8 @@ namespace BreCalClient
             this.datePickerETDBerth.Value = this.Times.EtdBerth;
             this.datePickerLockTime.Value = this.Times.LockTime;
             this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
-            this.datePickerATAATD.Value = this.Times.AtaAtd;
+            this.datePickerATA.Value = this.Times.Ata;
+            this.datePickerATD.Value = this.Times.Atd;
 
             this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
             this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
@@ -111,20 +113,37 @@ namespace BreCalClient
             if (pType != Extensions.ParticipantType.MOORING)
             {
                 this.labelATA.Visibility = Visibility.Hidden;
-                this.datePickerATAATD.Visibility = Visibility.Hidden;
+                this.datePickerATA.Visibility = Visibility.Hidden;
+                this.labelATD.Visibility = Visibility.Hidden;
+                this.datePickerATD.Visibility = Visibility.Hidden;
+            }
+            else
+            {
+                if(ShipcallModel.Shipcall?.Type == ShipcallType.Arrival)
+                {
+                    this.labelATD.Visibility = Visibility.Hidden;
+                    this.datePickerATD.Visibility = Visibility.Hidden;
+                }
+                if (ShipcallModel.Shipcall?.Type == ShipcallType.Departure)
+                {
+                    this.labelATA.Visibility = Visibility.Hidden;
+                    this.datePickerATA.Visibility = Visibility.Hidden;
+                }
             }
 
             if (this.Times.ParticipantId != App.Participant.Id)
             {
                 this.buttonFixedOrder.IsEnabled = false;
                 return; // if this is not "my" entry, there is no editing!
-            }                       
+            }                                   
 
-            if(ShipcallModel.Shipcall?.Type != ShipcallType.Arrival)
+            if(pType == Extensions.ParticipantType.MOORING)
             {
-                this.labelATA.Content = "ATD";
+                this.datePickerATA.IsEnabled = true;
+                this.datePickerATD.IsEnabled = true;
             }
 
+
             switch (pType)
             {
                 case Extensions.ParticipantType.MOORING:
@@ -135,7 +154,6 @@ namespace BreCalClient
                     this.datePickerLockTime.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
                     this.datePickerZoneEntry.IsEnabled = false;                    
                     this.textBoxRemarks.IsEnabled = true;
-                    this.datePickerATAATD.IsEnabled = true;
                     break;
                 case Extensions.ParticipantType.PILOT:
                     this.datePickerETABerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);                    
@@ -143,7 +161,6 @@ namespace BreCalClient
                     this.datePickerLockTime.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);                    
                     this.datePickerZoneEntry.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);                    
                     this.textBoxRemarks.IsEnabled = true;
-                    this.datePickerATAATD.IsEnabled = true;
                     break;
             }
 
@@ -189,9 +206,14 @@ namespace BreCalClient
             this.datePickerZoneEntry.Value = null;
         }        
 
-        private void contextMenuItemClearATAATD_Click(object sender, RoutedEventArgs e)
+        private void contextMenuItemClearATA_Click(object sender, RoutedEventArgs e)
         {
-            this.datePickerATAATD.Value = null;
+            this.datePickerATA.Value = null;
+        }        
+
+        private void contextMenuItemClearATD_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerATD.Value = null;
         }
 
         #endregion
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index e04b3e7..39db78b 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -7,7 +7,7 @@
              xmlns:sets="clr-namespace:BreCalClient.Properties"
              xmlns:db="clr-namespace:BreCalClient;assembly=BreCalDevelClient"             
              mc:Ignorable="d" 
-             d:DesignHeight="135" d:DesignWidth="800" Loaded="UserControl_Loaded">
+             d:DesignHeight="135" d:DesignWidth="800">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
         <Grid>
             <Grid.ColumnDefinitions>
@@ -139,13 +139,19 @@
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="20" />
-                        <RowDefinition Height="*" />
+                        <RowDefinition Height="0" x:Name="ataRowDefinition" />
+                        <RowDefinition Height="0" x:Name="atdRowDefinition" />
+                        <RowDefinition Height="*" x:Name="infoRowDefinition"/>
                     </Grid.RowDefinitions>
                     <Label Grid.Row="0" x:Name="labelETAETDMooring" Grid.Column="0" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
-                    <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelMooringETAETDValue" FontWeight="DemiBold"/>
-                    <Image Grid.Row="1" Grid.Column="0" x:Name="imageMooringLocked" VerticalAlignment="Top" Margin="0 20 0 0" HorizontalAlignment="Left" Source="./Resources/lock.png" Width="16" Height="16" ToolTip="{x:Static p:Resources.textFixedOrder}"/>
-                    <TextBlock Grid.Row="1" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockMooringRemarks"/>
+                    <Label Grid.Row="1" Grid.Column="0" Content="ATA" Padding="0" VerticalContentAlignment="Center" />
+                    <Label Grid.Row="1" Grid.Column="1" x:Name="labelTimesMooringATA" Padding="0" VerticalContentAlignment="Center" />
+                    <Label Grid.Row="2" Grid.Column="0" Content="ATD" Padding="0" VerticalContentAlignment="Center" />
+                    <Label Grid.Row="2" Grid.Column="1" x:Name="labelTimesMooringATD" Padding="0" VerticalContentAlignment="Center" />
+                    <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
+                    <Image Grid.Row="3" Grid.Column="0" x:Name="imageMooringLocked" VerticalAlignment="Top" Margin="0 20 0 0" HorizontalAlignment="Left" Source="./Resources/lock.png" Width="16" Height="16" ToolTip="{x:Static p:Resources.textFixedOrder}"/>
+                    <TextBlock Grid.Row="3" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockMooringRemarks"/>
                 </Grid>
             </Border>
 
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 06683ab..d31a4b7 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -26,6 +26,8 @@ namespace BreCalClient
         Participant? _tug;
         Participant? _port_administration;
         private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));
+        bool ataAdded = false;
+        bool atdAdded = false;
 
         #endregion
 
@@ -339,6 +341,28 @@ namespace BreCalClient
                                 this.labelMooringETAETDValue.Content = mooringTimes.EtdBerth.HasValue ? mooringTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
                             }
                             this.imageMooringLocked.Visibility = (mooringTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
+
+                            if(mooringTimes.Ata.HasValue)
+                            {
+                                if(!ataAdded) 
+                                {                                    
+
+                                    ataRowDefinition.Height = new GridLength(15);
+                                    labelTimesMooringATA.Content = mooringTimes.Ata.ToString();                                    
+                                    ataAdded = true;
+                                }
+                            }
+
+                            if (mooringTimes.Atd.HasValue)
+                            {
+                                if (!atdAdded)
+                                {
+                                    atdRowDefinition.Height = new GridLength(15);
+                                    labelTimesMooringATD.Content = mooringTimes.Atd.ToString();
+                                    atdAdded = true;
+                                }
+                            }
+
                         }
                         else
                         {
@@ -433,12 +457,7 @@ namespace BreCalClient
 
         #endregion
 
-        #region event handler
-
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            // TBD
-        }
+        #region event handler        
 
         private void buttonEditShipcall_Click(object? sender, RoutedEventArgs? e)
         {