diff --git a/src/BreCalClient/Extensions.cs b/src/BreCalClient/Extensions.cs
index 9ec655a..de76cdb 100644
--- a/src/BreCalClient/Extensions.cs
+++ b/src/BreCalClient/Extensions.cs
@@ -72,6 +72,14 @@ namespace BreCalClient
             return value.Length <= maxLength ? value : value.Substring(0, maxLength);
         }
 
+        public static string TruncateDots(this string value, int maxLength)
+        {
+            if(string.IsNullOrEmpty(value)) return value;
+            if (value.Length <= maxLength) return value;
+            if (value.Length > (maxLength + 1)) return $"{value.Substring(0, maxLength)}..";
+            return value.Substring(0, maxLength);
+        }
+
         #endregion
 
     }
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 2389d19..075b91a 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -49,40 +49,40 @@
                     <Label Grid.Column="1" FontSize="12" x:Name="labelShipName" Foreground="White" Background="#203864" VerticalAlignment="Stretch" 
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" PreviewMouseUp="Image_PreviewMouseUp"/>
                 </Grid>
-                <Viewbox Grid.Row="1" Grid.Column="0">
+                <Viewbox Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="IMO" />
                 </Viewbox>
-                <Viewbox Grid.Row="1" Grid.Column="1">
-                    <TextBlock x:Name="textBlockIMO" />
+                <Viewbox Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockIMO" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
-                <Viewbox Grid.Row="2" Grid.Column="0">
+                <Viewbox Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textCallsign}" />
                 </Viewbox>
-                <Viewbox Grid.Row="2" Grid.Column="1">
-                    <TextBlock x:Name="textBlockCallsign" />
+                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockCallsign" Padding="0"/>
                 </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="0">
-                    <TextBlock Text="{x:Static p:Resources.textLengthWidth}" />
+                <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">
-                    <TextBlock x:Name="textBlockLengthWidth" />
+                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="0">
+                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="ETA" x:Name="labelETA"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="1">
+                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockETA" />
                 </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="0">
+                <Viewbox Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textBerth}" />
                 </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="1">
+                <Viewbox Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockBerth" />
                 </Viewbox>
-                <Viewbox Grid.Row="7" Grid.Column="0">
+                <Viewbox Grid.Row="7" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textAgency}" />
                 </Viewbox>
-                <Viewbox Grid.Row="7" Grid.Column="1">
+                <Viewbox Grid.Row="7" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockAgency" />
                 </Viewbox>
 
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 3110d56..208090d 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -54,12 +54,16 @@ namespace BreCalClient
         #region public methods
 
         public void RefreshData()
-        {
+        {            
             if (this.ShipcallControlModel == null) return;
+            string agentName = "";
             string? name;
             name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.AGENCY);
             if (name != null)
+            {
                 this.labelAgent.Content = name;
+                agentName = name;
+            }
             name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.MOORING);
             if (name != null)
                 this.labelMooring.Content = name;
@@ -126,16 +130,17 @@ namespace BreCalClient
             this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
             if ((this.ShipcallControlModel?.Shipcall?.Type == 1) || (this.ShipcallControlModel?.Shipcall?.Type == 3))
             {
-                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta.ToString();
+                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta.ToString("dd.MM. HH:mm");
             }
             if(this.ShipcallControlModel?.Shipcall?.Type == 2)
             {
                 this.labelETA.Text = "ETD";
-                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Etd.ToString();
+                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Etd?.ToString("dd.MM. HH:mm");
             }
 
             this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
             this.textBlockLengthWidth.Text = $"{this.ShipcallControlModel?.Ship?.Length} / {this.ShipcallControlModel?.Ship?.Width}";
+            this.textBlockAgency.Text = agentName.TruncateDots(10);
 
             if (this.ParticipantDict != null)
             {