diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 54e3b24..0d25c00 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.3.0.3</AssemblyVersion>
-    <FileVersion>1.3.0.3</FileVersion>
+    <AssemblyVersion>1.3.0.4</AssemblyVersion>
+    <FileVersion>1.3.0.4</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index 2bdc6ac..0a778fd 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -211,7 +211,10 @@ namespace BreCalClient
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
 
-                this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+                if ((this.ShipcallModel.Shipcall.TimeRefPoint ?? 0) == 0)
+                    this.labelETD.Content = BreCalClient.Resources.Resources.textETDBerth;
+                else
+                    this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);                
 
                 if (!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
index bd2d571..5dbafcb 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
@@ -43,7 +43,7 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingFrom}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETD" x:Name="labelETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Label Content="{x:Static p:Resources.textETDBerth}" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <Grid Grid.Column="1" Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width=".5*" />
@@ -81,7 +81,7 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingTo}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETA" x:Name="labelETA" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Label Content="{x:Static p:Resources.textETABerth}" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <Grid Grid.Column="1" Grid.Row="9">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width=".5*" />
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
index c7b588c..5fa79ad 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
@@ -217,10 +217,7 @@ namespace BreCalClient
 
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
-
-                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]);
-
+               
                 if (!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
 
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index 6bfa3f7..e1b96ad 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -28,7 +28,7 @@
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" x:Name="labelEnd" />
         <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textBerth}" HorizontalAlignment="Right" x:Name="labelBerth"/>
         <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textPierside}" HorizontalContentAlignment="Right" x:Name="labelPierside" />
-        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" x:Name="labelBerthRemarks"/>
 
         <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
 
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index 17cad98..a80a1a6 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -126,7 +126,7 @@ namespace BreCalClient
                     this.datePickerOperationStart.ContextMenu.IsEnabled = false;
                     this.labelEnd.Visibility = Visibility.Hidden;
                     this.datePickerOperationEnd.Visibility = Visibility.Hidden;
-                    this.datePickerOperationEnd_End.Visibility = Visibility.Hidden;
+                    this.datePickerOperationEnd_End.Visibility = Visibility.Hidden;                    
                     this.rowEnd.Height = new(0);
                     break;
                 case ShipcallType.Departure:
@@ -136,6 +136,8 @@ namespace BreCalClient
                     this.comboBoxBerth.Visibility= Visibility.Hidden;
                     this.labelPierside.Visibility = Visibility.Hidden;
                     this.comboBoxPierside.Visibility = Visibility.Hidden;
+                    this.labelBerthRemarks.Visibility = Visibility.Hidden;
+                    this.textBoxBerthRemarks.Visibility = Visibility.Hidden;
                     break;
                 case ShipcallType.Shifting:
                     this.rowStart.Height = new(0);
@@ -145,6 +147,8 @@ namespace BreCalClient
                     this.comboBoxBerth.Visibility = Visibility.Hidden;
                     this.labelPierside.Visibility = Visibility.Hidden;
                     this.comboBoxPierside.Visibility = Visibility.Hidden;
+                    this.labelBerthRemarks.Visibility = Visibility.Hidden;
+                    this.textBoxBerthRemarks.Visibility = Visibility.Hidden;
                     break;
             }
 
@@ -162,6 +166,7 @@ namespace BreCalClient
             this.comboBoxPierside.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
             this.textBoxBerthRemarks.IsReadOnly = ShipcallModel.Shipcall?.Type != ShipcallType.Arrival;
             this.textBoxRemarks.IsReadOnly = false;
+            
             this.CheckOKButton();
         }
 
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index 8ab1a61..a6aaa3c 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.3.0.3</ApplicationVersion>
+    <ApplicationVersion>1.3.0.4</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 9fde2fe..934ae9f 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -231,7 +231,7 @@
                         <RowDefinition Height="20" />
                         <RowDefinition Height=".5*" />
                         <RowDefinition Height="14" x:Name="rowDefinitionTerminalBerth"/>
-                        <RowDefinition Height=".5*" />
+                        <RowDefinition Height=".5*" x:Name="rowDefinitionTerminalBerthRemarks"/>
                     </Grid.RowDefinitions>
                     <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" x:Name="labelETAETDTerminal" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelOperationsStart" FontWeight="DemiBold"/>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 15a0c80..0c1b9b3 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -427,7 +427,10 @@ namespace BreCalClient
                             this.imageTugLocked.Visibility = Visibility.Hidden;
                         }
 
-                        Times? terminalTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TERMINAL);
+                        this.rowDefinitionTerminalBerth.Height = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? new(14) : new(0);
+                        this.rowDefinitionTerminalBerthRemarks.Height = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? new GridLength(.5, GridUnitType.Star) : new(0);
+
+                        Times ? terminalTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TERMINAL);
                         if (terminalTimes != null)
                         {
                             this.labelTerminalBerth.Visibility = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? Visibility.Visible : Visibility.Hidden;