diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 7a12570..84a97b7 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.1</AssemblyVersion>
-    <FileVersion>1.3.0.1</FileVersion>
+    <AssemblyVersion>1.3.0.2</AssemblyVersion>
+    <FileVersion>1.3.0.2</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/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 956cc2e..006256f 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -69,8 +69,9 @@
         <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="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"/>
+        <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"/>
 
         <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/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index f021b81..b5d46be 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -130,8 +130,17 @@ namespace BreCalClient
 
             if (this.ShipcallModel.Shipcall?.Type != ShipcallType.Shifting)
             {
-                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]);
+                int displayIndex = this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0;
+                if (displayIndex > 0)
+                {
+                    this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[displayIndex]);
+                    this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[displayIndex]);
+                } 
+                else
+                {
+                    this.labelETA.Content = BreCalClient.Resources.Resources.textETABerth;
+                    this.labelETD.Content = BreCalClient.Resources.Resources.textETDBerth;
+                }
             }
 
             switch (ShipcallModel.Shipcall?.Type)
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index a7a86cf..6bfa3f7 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -26,8 +26,8 @@
 
         <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" HorizontalContentAlignment="Right" x:Name="labelStart" />
         <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" />
-        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textPierside}" HorizontalContentAlignment="Right" />
+        <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="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 ba80394..17cad98 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -124,15 +124,27 @@ namespace BreCalClient
                 case ShipcallType.Arrival:
                     this.labelStart.FontWeight = FontWeights.Bold;
                     this.datePickerOperationStart.ContextMenu.IsEnabled = false;
+                    this.labelEnd.Visibility = Visibility.Hidden;
+                    this.datePickerOperationEnd.Visibility = Visibility.Hidden;
+                    this.datePickerOperationEnd_End.Visibility = Visibility.Hidden;
                     this.rowEnd.Height = new(0);
                     break;
                 case ShipcallType.Departure:
                     this.rowStart.Height = new(0);
-                    this.labelEnd.FontWeight = FontWeights.Bold;
+                    this.labelEnd.FontWeight = FontWeights.Bold;                    
+                    this.labelBerth.Visibility = Visibility.Hidden;
+                    this.comboBoxBerth.Visibility= Visibility.Hidden;
+                    this.labelPierside.Visibility = Visibility.Hidden;
+                    this.comboBoxPierside.Visibility = Visibility.Hidden;
                     break;
                 case ShipcallType.Shifting:
+                    this.rowStart.Height = new(0);
                     this.labelEnd.FontWeight = FontWeights.Bold;
-                    this.datePickerOperationEnd.ContextMenu.IsEnabled = false;
+                    this.datePickerOperationEnd.ContextMenu.IsEnabled = false;                    
+                    this.labelBerth.Visibility = Visibility.Hidden;
+                    this.comboBoxBerth.Visibility = Visibility.Hidden;
+                    this.labelPierside.Visibility = Visibility.Hidden;
+                    this.comboBoxPierside.Visibility = Visibility.Hidden;
                     break;
             }
 
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index fb2b52a..317f884 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.1</ApplicationVersion>
+    <ApplicationVersion>1.3.0.2</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 6beb445..fc40e6a 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -272,7 +272,12 @@ namespace BreCalClient
                     else
                         this.imageEvaluation.ToolTip = null;
 
-                    this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
+                    //Times? bsmdTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.BSMD);
+                    //if (bsmdTimes != null)
+                        this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
+                    //else
+                    //    this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
+
                     this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
                     if (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival)
                     {
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index dd95c2a..cf112c5 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -174,7 +174,7 @@ namespace BreCalClient
         /// <summary>
         /// Get berth display text for columns AGENT and TERMINAL
         /// </summary>
-        public string? GetBerthText(Times times)
+        public string? GetBerthText(Times? times)
         {
             string? timesBerthText = null;
             string? scArrivalBerthText = null;
@@ -182,7 +182,7 @@ namespace BreCalClient
             string? berthText = null;
             Berth? berth;
 
-            if(times.BerthId.HasValue)
+            if((times != null) && times.BerthId.HasValue)
             {
                 berth = BreCalLists.AllBerths.Find((x) => x.Id == times.BerthId.Value);
                 timesBerthText = berth?.Name;
@@ -203,7 +203,10 @@ namespace BreCalClient
                     berthText = timesBerthText ?? scDepartureBerthText;
                     break;
                 case ShipcallType.Shifting:
-                    berthText = (scDepartureBerthText ?? "") + "-" + timesBerthText ?? scArrivalBerthText;
+                    if (times?.ParticipantType != (int)Extensions.ParticipantType.TERMINAL)
+                        berthText = (scDepartureBerthText ?? "") + " / " + (timesBerthText ?? scArrivalBerthText);
+                    else
+                        berthText = scDepartureBerthText ?? "";
                     break;
                 default: break;
             }