diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 981dc77..cc55bdc 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -29,7 +29,6 @@
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
-
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
@@ -64,32 +63,32 @@
                     <TextBlock x:Name="textBlockIMO" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
                 <Viewbox Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left">
-                    <TextBlock Text="{x:Static p:Resources.textCallsign}" />
-                </Viewbox>
-                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
-                    <TextBlock x:Name="textBlockCallsign" Padding="0"/>
-                </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textLengthWidth}" Padding="0" />
                 </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
                 </Viewbox>
-                <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="ETA" x:Name="labelETA"/>
                 </Viewbox>
-                <Viewbox Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockETA"  Padding="0" FontWeight="DemiBold"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textBerth}"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="4" 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">
+                <Viewbox Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockHarbour" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
+                <Viewbox Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left">
+                    <TextBlock Text="{x:Static p:Resources.textDraft}" />
+                </Viewbox>
+                <Viewbox Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockDraft" Padding="0"/>
+                </Viewbox>
 
             </Grid>
             <Grid Grid.Row="0" Grid.Column="1">
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index ca8bbbe..7c115ab 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -269,7 +269,7 @@ namespace BreCalClient
                         this.imageEvaluation.ToolTip = null;
 
                     this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
-                    this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
+                    this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1") : "-";
                     this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true);
 
                     this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();