diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 09f93b2..466eb14 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -24,14 +24,17 @@
     <None Remove="Resources\arrow_up_blue.png" />
     <None Remove="Resources\arrow_up_green.png" />
     <None Remove="Resources\arrow_up_red.png" />
+    <None Remove="Resources\check.png" />
     <None Remove="Resources\clipboard.png" />
     <None Remove="Resources\clock.png" />
     <None Remove="Resources\containership.ico" />
     <None Remove="Resources\containership.png" />
     <None Remove="Resources\delete.png" />
+    <None Remove="Resources\delete2.png" />
     <None Remove="Resources\emergency_stop_button.png" />
     <None Remove="Resources\logo_bremen_calling.png" />
     <None Remove="Resources\ship2.png" />
+    <None Remove="Resources\sign_warning.png" />
     <None Remove="Resources\trafficlight_green.png" />
     <None Remove="Resources\trafficlight_off.png" />
     <None Remove="Resources\trafficlight_on.png" />
@@ -72,14 +75,17 @@
     <Resource Include="Resources\arrow_up_blue.png" />
     <Resource Include="Resources\arrow_up_green.png" />
     <Resource Include="Resources\arrow_up_red.png" />
+    <Resource Include="Resources\check.png" />
     <Resource Include="Resources\clipboard.png" />
     <Resource Include="Resources\clock.png" />
     <Resource Include="Resources\containership.ico" />
     <Resource Include="Resources\containership.png" />
     <Resource Include="Resources\delete.png" />
+    <Resource Include="Resources\delete2.png" />
     <Resource Include="Resources\emergency_stop_button.png" />
     <Resource Include="Resources\logo_bremen_calling.png" />
     <Resource Include="Resources\ship2.png" />
+    <Resource Include="Resources\sign_warning.png" />
     <Resource Include="Resources\StringResources.de.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Resource>
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 97415e5..49aae06 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -16,7 +16,7 @@ using BreCalClient.misc.Client;
 using BreCalClient.misc.Model;
 
 using static BreCalClient.Extensions;
-using System.Runtime.Serialization;
+using System.Collections.Concurrent;
 
 namespace BreCalClient
 {
@@ -31,11 +31,13 @@ namespace BreCalClient
 
         #region Fields
 
+        private static Int32 _uiUpdateRunning = 0;
+
         private Timer? _timer;
         private Credentials? _credentials;
 
-        private readonly Dictionary<int, ShipcallControlModel> _allShipcallsDict = new();
-        private readonly Dictionary<int, ShipcallControl> _allShipCallsControlDict = new();
+        private readonly ConcurrentDictionary<int, ShipcallControlModel> _allShipcallsDict = new();
+        private readonly ConcurrentDictionary<int, ShipcallControl> _allShipCallsControlDict = new();
         private readonly List<ShipcallControlModel> _visibleControlModels = new();              
 
         private readonly DefaultApi _api;
@@ -412,8 +414,8 @@ namespace BreCalClient
             ShipcallControlModel removeModel = this._allShipcallsDict[shipcallId];
             _visibleControlModels.Remove(removeModel);
 
-            this._allShipCallsControlDict.Remove(shipcallId);
-            this._allShipcallsDict.Remove(shipcallId);                        
+            this._allShipCallsControlDict.Remove(shipcallId, out _);
+            this._allShipcallsDict.Remove(shipcallId, out _);                        
         }
 
         private void FilterShipcalls()
@@ -514,16 +516,29 @@ namespace BreCalClient
 
             this.Dispatcher.Invoke(new Action(() =>
             {
-                this.stackPanel.Children.Clear();
-                foreach(ShipcallControlModel visibleModel in this._visibleControlModels)
+                if (Interlocked.CompareExchange(ref _uiUpdateRunning, 1, 0) == 1) return;
+
+                try
                 {
-                    if (visibleModel.Shipcall == null) continue; // should not happen
-                    if(this._allShipCallsControlDict.ContainsKey(visibleModel.Shipcall.Id))
+                    this.stackPanel.Children.Clear();
+                    foreach (ShipcallControlModel visibleModel in this._visibleControlModels)
                     {
-                        this._allShipCallsControlDict[visibleModel.Shipcall.Id].RefreshData();
-                        this.stackPanel.Children.Add(this._allShipCallsControlDict[visibleModel.Shipcall.Id]);
+                        if (visibleModel.Shipcall == null) continue; // should not happen
+                        if (this._allShipCallsControlDict.ContainsKey(visibleModel.Shipcall.Id))
+                        {
+                            this._allShipCallsControlDict[visibleModel.Shipcall.Id].RefreshData();
+                            this.stackPanel.Children.Add(this._allShipCallsControlDict[visibleModel.Shipcall.Id]);
+                        }
                     }
                 }
+                catch(Exception e) {
+                    _log.ErrorFormat("Exception running ui update: {0}", e.ToString());
+                }
+                finally
+                {
+                    _uiUpdateRunning = 0;
+                }
+
             }));
         }
 
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 5c8f167..66aadc9 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -110,6 +110,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] check {
+            get {
+                object obj = ResourceManager.GetObject("check", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -160,6 +170,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] delete2 {
+            get {
+                object obj = ResourceManager.GetObject("delete2", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -190,6 +210,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] sign_warning {
+            get {
+                object obj = ResourceManager.GetObject("sign_warning", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Agencies.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index 78c37b9..1bad839 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -133,6 +133,9 @@
   <data name="arrow_up_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>arrow_up_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="check" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>check.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="clipboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>clipboard.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -148,6 +151,9 @@
   <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>delete.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="delete2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>delete2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="emergency_stop_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emergency_stop_button.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -157,6 +163,9 @@
   <data name="ship2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>ship2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="sign_warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>sign_warning.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="textAgencies" xml:space="preserve">
     <value>Agencies</value>
   </data>
diff --git a/src/BreCalClient/Resources/check.png b/src/BreCalClient/Resources/check.png
new file mode 100644
index 0000000..5d739b1
Binary files /dev/null and b/src/BreCalClient/Resources/check.png differ
diff --git a/src/BreCalClient/Resources/delete2.png b/src/BreCalClient/Resources/delete2.png
new file mode 100644
index 0000000..d31437a
Binary files /dev/null and b/src/BreCalClient/Resources/delete2.png differ
diff --git a/src/BreCalClient/Resources/sign_warning.png b/src/BreCalClient/Resources/sign_warning.png
new file mode 100644
index 0000000..317ccc8
Binary files /dev/null and b/src/BreCalClient/Resources/sign_warning.png differ
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index d034112..a81e73a 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -2,18 +2,16 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BreCalClient"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:sets="clr-namespace:BreCalClient.Properties"
-             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
-             xmlns:db2="clr-namespace:BreCalClient.misc.Model;assembly=BreCalClient"
+             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient"             
              mc:Ignorable="d" 
              d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width=".1*" />
+                <ColumnDefinition Width=".13*" />
                 <ColumnDefinition Width=".15*" />
                 <ColumnDefinition Width=".15*" />
                 <ColumnDefinition Width=".15*" />
@@ -40,14 +38,35 @@
                     <ColumnDefinition Width=".4*" />
                     <ColumnDefinition Width=".6*" />
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="2">
+                <Grid Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="3">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="30" />
                         <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="32" />
                     </Grid.ColumnDefinitions>
                     <Image Margin="2" Grid.Column="0" PreviewMouseUp="Image_PreviewMouseUp" x:Name="imageShipcallType" />
                     <Label Grid.Column="1" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" PreviewMouseUp="Image_PreviewMouseUp"/>
+                    <Grid Grid.Column="2" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}">
+                        <Image Grid.Column="3" Margin="2" x:Name="imageEvaluation">
+                            <Image.Style>
+                                <Style TargetType="Image">
+                                    <Setter Property="Source" Value="{Binding NotFolderImage}"/>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.GREEN}">
+                                            <Setter Property="Source" Value="./Resources/check.png"/>
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.RED}">
+                                            <Setter Property="Source" Value="./Resources/delete2.png"/>
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.YELLOW}">
+                                            <Setter Property="Source" Value="./Resources/sign_warning.png"/>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Image.Style>
+                        </Image>
+                    </Grid>
                 </Grid>
                 <Viewbox Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="IMO" />
@@ -211,34 +230,6 @@
                     <TextBlock Grid.Row="3" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockTerminalBerthRemarks"  FontSize="10"/>
                 </Grid>
             </Border>
-
-            <!-- Image Margin="2" Grid.Column="3" Grid.Row="0" Grid.RowSpan="3">
-                <Image.Style>
-                    <Style TargetType="Image">
-                        <Setter Property="Source" Value="{Binding NotFolderImage}"/>
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.OFF}">
-                                <Setter Property="Source" Value="./Resources/trafficlight_off.png"/>
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.RED}">
-                                <Setter Property="Source" Value="./Resources/trafficlight_red.png"/>
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.RED_YELLOW}">
-                                <Setter Property="Source" Value="./Resources/trafficlight_red_yellow.png"/>
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.GREEN}">
-                                <Setter Property="Source" Value="./Resources/trafficlight_green.png"/>
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.ALL}">
-                                <Setter Property="Source" Value="./Resources/trafficlight_on.png"/>
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding LightMode}" Value="{x:Static db:ShipcallControlModel+TrafficLightMode.YELLOW}">
-                                <Setter Property="Source" Value="./Resources/trafficlight_yellow.png"/>
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </Image.Style>
-            </Image-->
         </Grid>
     </Border>
 </UserControl>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 00b541c..b0865bd 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -3,13 +3,13 @@
 // 
 
 using BreCalClient.misc.Model;
+using log4net;
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-
 namespace BreCalClient
 {
     /// <summary>
@@ -25,6 +25,7 @@ namespace BreCalClient
         Participant? _terminal;
         Participant? _tug;
         Participant? _port_administration;
+        private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));
 
         #endregion
 
@@ -60,208 +61,242 @@ namespace BreCalClient
 
         public void RefreshData()
         {
-            if (this.ShipcallControlModel != null)
+            try
             {
-                string agentName = "";
-                string? name;
-                _agency = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.AGENCY);
-                name = _agency?.Name;
-                if (name != null) agentName = name;
-                this.labelAgent.Content = name ?? "- / -";
-
-                _mooring = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.MOORING);
-                name = _mooring?.Name;
-                this.labelMooring.Content = name ?? "- / -";
-
-                _pilot = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.PILOT);
-                name = _pilot?.Name;
-                this.labelPilot.Content = name ?? "- / - ";
-
-                _tug = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.TUG);
-                name = _tug?.Name;
-                this.labelTug.Content = name ?? "- / - ";
-
-                _port_administration = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.PORT_ADMINISTRATION);
-                name = _port_administration?.Name;
-                this.labelPortAuthority.Content = name ?? "- / - ";
-
-                _terminal = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.TERMINAL);
-                name = _terminal?.Name;
-                this.labelTerminal.Content = name ?? "- / - ";
-
-                if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.TERMINAL) && (App.Participant.Id == _terminal?.Id))
+                if (this.ShipcallControlModel != null)
                 {
-                    this.labelTerminal.FontWeight = FontWeights.Bold;
-                    this.labelTerminal.Foreground = Brushes.LightYellow;
-                }
+                    string agentName = "";
+                    string? name;
+                    _agency = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.AGENCY);
+                    name = _agency?.Name;
+                    if (name != null) agentName = name;
+                    this.labelAgent.Content = name ?? "- / -";
 
-                if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.PILOT) && (App.Participant.Id == _pilot?.Id))
-                {
-                    this.labelPilot.FontWeight = FontWeights.Bold;
-                    this.labelPilot.Foreground = Brushes.LightYellow;
-                }
+                    _mooring = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.MOORING);
+                    name = _mooring?.Name;
+                    this.labelMooring.Content = name ?? "- / -";
 
-                if ((App.Participant.IsTypeFlagSet(Extensions.ParticipantType.AGENCY) && (App.Participant.Id == _agency?.Id)) ||
-                    (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD) && (_agency != null) && _agency.IsFlagSet(Extensions.ParticipantFlag.ALLOW_BSMD)))
-                {
-                    this.labelAgent.FontWeight = FontWeights.Bold;
-                    this.labelAgent.Foreground = Brushes.LightYellow;
-                }
+                    _pilot = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.PILOT);
+                    name = _pilot?.Name;
+                    this.labelPilot.Content = name ?? "- / - ";
 
-                if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.MOORING) && (App.Participant.Id == _mooring?.Id))
-                {
-                    this.labelMooring.FontWeight = FontWeights.Bold;
-                    this.labelMooring.Foreground = Brushes.LightYellow;
-                }
+                    _tug = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.TUG);
+                    name = _tug?.Name;
+                    this.labelTug.Content = name ?? "- / - ";
 
-                if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.PORT_ADMINISTRATION) && (App.Participant.Id == _port_administration?.Id))
-                {
-                    this.labelPortAuthority.FontWeight = FontWeights.Bold;
-                    this.labelPortAuthority.Foreground = Brushes.LightYellow;
-                }
+                    _port_administration = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.PORT_ADMINISTRATION);
+                    name = _port_administration?.Name;
+                    this.labelPortAuthority.Content = name ?? "- / - ";
 
-                if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.TUG) && (App.Participant.Id == _tug?.Id))
-                {
-                    this.labelTug.FontWeight = FontWeights.Bold;
-                    this.labelTug.Foreground = Brushes.LightYellow;
-                }
+                    _terminal = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.TERMINAL);
+                    name = _terminal?.Name;
+                    this.labelTerminal.Content = name ?? "- / - ";
 
-                if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD))
-                {
-                    this.labelShipName.FontWeight = FontWeights.Bold;
-                    this.labelShipName.Foreground = Brushes.LightYellow;
-                }
-
-                this.labelShipName.Content = this.ShipcallControlModel?.Ship?.Name;
-                switch (this.ShipcallControlModel?.Shipcall?.Type)
-                {
-                    case 1: // incoming
-                        this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png"));
-                        break;
-                    case 2: // outgoing
-                        this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png"));
-                        break;
-                    case 3: // shifting
-                        this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png"));
-                        break;
-                    default:
-                        break;
-                }
-
-                this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
-                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("dd.MM. HH:mm");
-                }
-                if (this.ShipcallControlModel?.Shipcall?.Type == 2)
-                {
-                    this.labelETA.Text = "ETD";
-                    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}";
-
-                // rename labels if this is not an incoming 
-                // must be here because there may not be a times record for each participant (yet)
-
-                if (this.ShipcallControlModel?.Shipcall?.Type != 1)
-                {
-                    this.labelETAETDAgent.Content = "ETD";
-                    this.labelETAETDMooring.Content = "ETD";
-                    this.labelETAETDPilot.Content = "ETD";
-                    this.labelETAETDPortAuthority.Content = "ETD";
-                    this.labelETAETDTug.Content = "ETD";
-                    this.labelETAETDTerminal.Content = BreCalClient.Resources.Resources.textOperationsEnd;
-                }                
-
-                foreach (Times times in this.ShipcallControlModel.Times)
-                {
-                    string? berthText = null;
-                    if ((BreCalLists.Berths != null) && times.BerthId.HasValue)
+                    if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.TERMINAL) && (App.Participant.Id == _terminal?.Id))
                     {
-                        Berth? berth = BreCalLists.Berths.Find((x) => x.Id == times.BerthId);
-                        berthText = berth?.Name;
+                        this.labelTerminal.FontWeight = FontWeights.Bold;
+                        this.labelTerminal.Foreground = Brushes.LightYellow;
                     }
-                    if (berthText == null)
+
+                    if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.PILOT) && (App.Participant.Id == _pilot?.Id))
                     {
-                        if (this.ShipcallControlModel?.Shipcall?.Type == (int)Extensions.TypeEnum.Outgoing)
-                        {
-                            Berth? berth = BreCalLists.Berths?.Find((x) => x.Id == this.ShipcallControlModel.Shipcall?.DepartureBerthId);
-                            berthText = berth?.Name;
-                        }
-                        else
-                        {
-                            Berth? berth = BreCalLists.Berths?.Find((x) => x.Id == this.ShipcallControlModel?.Shipcall?.ArrivalBerthId);
-                            berthText = berth?.Name;
-                        }
+                        this.labelPilot.FontWeight = FontWeights.Bold;
+                        this.labelPilot.Foreground = Brushes.LightYellow;
                     }
 
-                    if (times.ParticipantType == (int)Extensions.ParticipantType.AGENCY)
+                    if ((App.Participant.IsTypeFlagSet(Extensions.ParticipantType.AGENCY) && (App.Participant.Id == _agency?.Id)) ||
+                        (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD) && (_agency != null) && _agency.IsFlagSet(Extensions.ParticipantFlag.ALLOW_BSMD)))
                     {
-                        this.labelAgencyBerth.Content = berthText;
-                        this.labelAgencyETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                        this.textBlockAgencyRemarks.Text = times.Remarks;
-                        this.textBlockAgencyBerthRemarks.Text = times.BerthInfo;
-                        if (this.ShipcallControlModel?.Shipcall?.Type != 1)
-                        {                            
-                            this.labelAgencyETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                        }
+                        this.labelAgent.FontWeight = FontWeights.Bold;
+                        this.labelAgent.Foreground = Brushes.LightYellow;
                     }
 
-                    if (times.ParticipantType == (int)Extensions.ParticipantType.MOORING)
+                    if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.MOORING) && (App.Participant.Id == _mooring?.Id))
                     {
-                        this.labelMooringETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                        this.textBlockMooringRemarks.Text = times.Remarks;
-                        if (this.ShipcallControlModel?.Shipcall?.Type != 1)
-                        {                            
-                            this.labelMooringETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                        this.labelMooring.FontWeight = FontWeights.Bold;
+                        this.labelMooring.Foreground = Brushes.LightYellow;
+                    }
+
+                    if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.PORT_ADMINISTRATION) && (App.Participant.Id == _port_administration?.Id))
+                    {
+                        this.labelPortAuthority.FontWeight = FontWeights.Bold;
+                        this.labelPortAuthority.Foreground = Brushes.LightYellow;
+                    }
+
+                    if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.TUG) && (App.Participant.Id == _tug?.Id))
+                    {
+                        this.labelTug.FontWeight = FontWeights.Bold;
+                        this.labelTug.Foreground = Brushes.LightYellow;
+                    }
+
+                    if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD))
+                    {
+                        this.labelShipName.FontWeight = FontWeights.Bold;
+                        this.labelShipName.Foreground = Brushes.LightYellow;
+                    }
+
+                    this.labelShipName.Content = this.ShipcallControlModel?.Ship?.Name;
+                    switch (this.ShipcallControlModel?.Shipcall?.Type)
+                    {
+                        case 1: // incoming
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png"));
+                            break;
+                        case 2: // outgoing
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png"));
+                            break;
+                        case 3: // shifting
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png"));
+                            break;
+                        default:
+                            break;
+                    }
+
+                    if (this.ShipcallControlModel?.Shipcall?.Evaluation != null)
+                    {
+                        ShipcallControlModel.TrafficLightMode resultColor = (ShipcallControlModel.TrafficLightMode) (this.ShipcallControlModel?.Shipcall?.Evaluation ?? 0); // der nullable Operator hier ist so doof, die VS validation blickts einfach nicht
+                        switch (resultColor)
+                        {
+                            case ShipcallControlModel.TrafficLightMode.GREEN:
+                                this.Background = Brushes.LightGreen;
+                                break;
+                            case ShipcallControlModel.TrafficLightMode.YELLOW:
+                                this.Background= Brushes.LightYellow;
+                                break;
+                            case ShipcallControlModel.TrafficLightMode.RED:
+                                this.Background = new SolidColorBrush(Color.FromArgb(200, 255, 100, 100));
+                                break;
+                            default:
+                                this.Background = Brushes.Transparent;
+                                break;
                         }
                     }
 
-                    if (times.ParticipantType == (int)Extensions.ParticipantType.PORT_ADMINISTRATION)
-                    {                        
-                        this.labelPortAuthorityETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";                        
-                        this.textBlockPortAuthorityRemarks.Text = times.Remarks;
-                        if (this.ShipcallControlModel?.Shipcall?.Type != 1)
-                        {
-                            this.labelPortAuthorityETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                        }
+                    if (!string.IsNullOrEmpty(this.ShipcallControlModel?.Shipcall?.EvaluationMessage))
+                        this.imageEvaluation.ToolTip = this.ShipcallControlModel?.Shipcall?.EvaluationMessage;
+
+                    this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
+                    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("dd.MM. HH:mm");
+                    }
+                    if (this.ShipcallControlModel?.Shipcall?.Type == 2)
+                    {
+                        this.labelETA.Text = "ETD";
+                        this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Etd?.ToString("dd.MM. HH:mm");
                     }
 
-                    if (times.ParticipantType == (int)Extensions.ParticipantType.PILOT)
-                    {                        
-                        this.labelPilotETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";                       
-                        this.textBlockPilotRemarks.Text = times.Remarks;
-                        if (this.ShipcallControlModel?.Shipcall?.Type != 1)
-                        {
-                            this.labelPilotETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                        }
+                    this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
+                    this.textBlockLengthWidth.Text = $"{this.ShipcallControlModel?.Ship?.Length} / {this.ShipcallControlModel?.Ship?.Width}";
+
+                    // rename labels if this is not an incoming 
+                    // must be here because there may not be a times record for each participant (yet)
+
+                    if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                    {
+                        this.labelETAETDAgent.Content = "ETD";
+                        this.labelETAETDMooring.Content = "ETD";
+                        this.labelETAETDPilot.Content = "ETD";
+                        this.labelETAETDPortAuthority.Content = "ETD";
+                        this.labelETAETDTug.Content = "ETD";
+                        this.labelETAETDTerminal.Content = BreCalClient.Resources.Resources.textOperationsEnd;
                     }
 
-                    if (times.ParticipantType == (int)Extensions.ParticipantType.TUG)
-                    {                        
-                        this.labelTugETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";                        
-                        this.textBlockTugRemarks.Text = times.Remarks;
-                        if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                    if (this.ShipcallControlModel != null)
+                    {
+                        foreach (Times times in this.ShipcallControlModel.Times)
                         {
-                            this.labelTugETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                        }
-                    }
+                            string? berthText = null;
+                            if ((BreCalLists.Berths != null) && times.BerthId.HasValue)
+                            {
+                                Berth? berth = BreCalLists.Berths.Find((x) => x.Id == times.BerthId);
+                                berthText = berth?.Name;
+                            }
+                            if (berthText == null)
+                            {
+                                if (this.ShipcallControlModel?.Shipcall?.Type == (int)Extensions.TypeEnum.Outgoing)
+                                {
+                                    Berth? berth = BreCalLists.Berths?.Find((x) => x.Id == this.ShipcallControlModel.Shipcall?.DepartureBerthId);
+                                    berthText = berth?.Name;
+                                }
+                                else
+                                {
+                                    Berth? berth = BreCalLists.Berths?.Find((x) => x.Id == this.ShipcallControlModel?.Shipcall?.ArrivalBerthId);
+                                    berthText = berth?.Name;
+                                }
+                            }
 
-                    if (times.ParticipantType == (int)Extensions.ParticipantType.TERMINAL)
-                    {                       
-                        this.labelOperationsStart.Content = times.OperationsStart.HasValue ? times.OperationsStart.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";                        
-                        this.textBlockTerminalRemarks.Text = times.Remarks;
-                        if (this.ShipcallControlModel?.Shipcall?.Type != 1)
-                        {
-                            this.labelOperationsStart.Content = times.OperationsEnd.HasValue ? times.OperationsEnd.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                            if (times.ParticipantType == (int)Extensions.ParticipantType.AGENCY)
+                            {
+                                this.labelAgencyBerth.Content = berthText;
+                                this.labelAgencyETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockAgencyRemarks.Text = times.Remarks;
+                                this.textBlockAgencyBerthRemarks.Text = times.BerthInfo;
+                                if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                                {
+                                    this.labelAgencyETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                }
+                            }
+
+                            if (times.ParticipantType == (int)Extensions.ParticipantType.MOORING)
+                            {
+                                this.labelMooringETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockMooringRemarks.Text = times.Remarks;
+                                if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                                {
+                                    this.labelMooringETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                }
+                            }
+
+                            if (times.ParticipantType == (int)Extensions.ParticipantType.PORT_ADMINISTRATION)
+                            {
+                                this.labelPortAuthorityETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockPortAuthorityRemarks.Text = times.Remarks;
+                                if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                                {
+                                    this.labelPortAuthorityETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                }
+                            }
+
+                            if (times.ParticipantType == (int)Extensions.ParticipantType.PILOT)
+                            {
+                                this.labelPilotETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockPilotRemarks.Text = times.Remarks;
+                                if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                                {
+                                    this.labelPilotETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                }
+                            }
+
+                            if (times.ParticipantType == (int)Extensions.ParticipantType.TUG)
+                            {
+                                this.labelTugETAETDValue.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockTugRemarks.Text = times.Remarks;
+                                if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                                {
+                                    this.labelTugETAETDValue.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                }
+                            }
+
+                            if (times.ParticipantType == (int)Extensions.ParticipantType.TERMINAL)
+                            {
+                                this.labelOperationsStart.Content = times.OperationsStart.HasValue ? times.OperationsStart.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockTerminalRemarks.Text = times.Remarks;
+                                if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                                {
+                                    this.labelOperationsStart.Content = times.OperationsEnd.HasValue ? times.OperationsEnd.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                }
+                                this.textBlockTerminalBerthRemarks.Text = times.BerthInfo;
+                            }
                         }
-                        this.textBlockTerminalBerthRemarks.Text = times.BerthInfo;
                     }
+                    this.DataContext = this.ShipcallControlModel;
                 }
-            }        
+            }
+            catch (Exception ex)
+            {
+                _log.ErrorFormat("Something went wrong during data refresh: {0}", ex.ToString());
+            }
         }
 
         #endregion
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index f3148d0..5685733 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -55,24 +55,17 @@ namespace BreCalClient
         {
             get
             {
-                if (IsFlagSet(StatusFlags.RED))
+                TrafficLightMode tlm = TrafficLightMode.OFF;
+
+                if (this.Shipcall != null)
                 {
-                    if (IsFlagSet((StatusFlags)StatusFlags.YELLOW))
+                    if(this.Shipcall.Evaluation.HasValue)
                     {
-                        if (IsFlagSet(StatusFlags.GREEN))
-                        {
-                            return TrafficLightMode.ALL;
-                        }
-                        return TrafficLightMode.RED_YELLOW;
+                        tlm = (TrafficLightMode)this.Shipcall.Evaluation;
                     }
-                    return TrafficLightMode.RED;
                 }
-                if (IsFlagSet(StatusFlags.YELLOW))
-                    return TrafficLightMode.YELLOW;
-                if (IsFlagSet(StatusFlags.GREEN))
-                    return TrafficLightMode.GREEN;
-                return TrafficLightMode.OFF;
-            }
+                return tlm;
+            }                
         }
 
         #endregion