diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 84f8595..9068853 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -287,6 +287,7 @@ namespace BreCalClient
                             }
                         };
                         scmOut.Shipcall.ShipId = esc.ShipcallModel.Shipcall.ShipId;
+                        scmOut.Shipcall.PortId = esc.ShipcallModel.Shipcall.PortId;
                         scmOut.Ship = esc.ShipcallModel.Ship;
                         DateTime eta = esc.ShipcallModel.Shipcall?.Eta ?? DateTime.Now;
                         scmOut.Shipcall.Etd = eta.AddDays(2);
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 934ae9f..c045168 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -76,24 +76,20 @@
                     <TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
                 </Viewbox>
                 <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
-                    <TextBlock Text="{x:Static p:Resources.textDraft}" Padding="0" />
-                </Viewbox>
-                <Viewbox Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left">
-                    <TextBlock x:Name="textBlockDraft" Padding="0"/>
-                </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="ETA" x:Name="labelETA"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockETA"  Padding="0" FontWeight="DemiBold"/>
                 </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textBerth}"/>
                 </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockBerth" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
-                
+                <Viewbox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockHarbour" Padding="0" FontWeight="DemiBold" />
+                </Viewbox>
 
             </Grid>
 
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 8f343df..7026253 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -82,8 +82,7 @@ namespace BreCalClient
                         this.labelAgencyBerth.Content = "";
                         this.labelAgencyETAETDValue.Content = "";
                         this.textBlockAgencyRemarks.Text = "";
-                        this.textBlockAgencyBerthRemarks.Text = "";
-                        this.textBlockDraft.Text = "";
+                        this.textBlockAgencyBerthRemarks.Text = "";                        
                     }
 
                     _mooring = this.ShipcallControlModel?.GetParticipantForType(Extensions.ParticipantType.MOORING);
@@ -315,6 +314,8 @@ namespace BreCalClient
 
                     if (this.ShipcallControlModel != null)
                     {
+                        this.textBlockHarbour.Text = ((ShipcallControlModel != null) && (ShipcallControlModel.Shipcall != null) && BreCalLists.PortLookupDict.ContainsKey(ShipcallControlModel.Shipcall.PortId)) ?
+                                BreCalLists.PortLookupDict[ShipcallControlModel.Shipcall.PortId].Name : "";
 
                         Times? agencyTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
                         if (agencyTimes != null)
@@ -322,8 +323,7 @@ namespace BreCalClient
                             this.labelAgencyBerth.Content = this.ShipcallControlModel?.GetBerthText(agencyTimes);
                             this.labelAgencyETAETDValue.Content = agencyTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockAgencyRemarks.Text = agencyTimes.Remarks.TruncateDots(50);
-                            this.textBlockAgencyBerthRemarks.Text = agencyTimes.BerthInfo.TruncateDots(50);
-                            this.textBlockDraft.Text = ShipcallControlModel?.Shipcall?.Draft?.ToString("N2");
+                            this.textBlockAgencyBerthRemarks.Text = agencyTimes.BerthInfo.TruncateDots(50);                                                        
                         }
                         else
                         {
@@ -331,8 +331,7 @@ namespace BreCalClient
                             this.labelAgencyBerth.Content = "";
                             this.labelAgencyETAETDValue.Content = "- / -";
                             this.textBlockAgencyRemarks.Text = "";
-                            this.textBlockAgencyBerthRemarks.Text = "";
-                            this.textBlockDraft.Text = "";
+                            this.textBlockAgencyBerthRemarks.Text = "";                            
                         }
 
                         Times? mooringTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.MOORING);