diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
index d1ddd57..26ac431 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
@@ -129,7 +129,7 @@
         <CheckBox x:Name="checkBoxReplenishingLock" Grid.Column="2" Grid.Row="9" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
 
         <StackPanel Grid.Row="14" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
+            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
     </Grid>
diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
index f637ecc..9d9fd23 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
@@ -4,20 +4,9 @@
 
 using BreCalClient.misc.Model;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace BreCalClient
 {
@@ -41,11 +30,6 @@ namespace BreCalClient
 
         public Times Times { get; set; } = new();
 
-        /// <summary>
-        /// All berths
-        /// </summary>
-        public List<Berth> Berths { get; set; } = new();
-
         #endregion
 
         #region event handler
@@ -57,7 +41,7 @@ namespace BreCalClient
             this.comboBoxTug.ItemsSource = BreCalLists.Participants_Tug;
             this.comboBoxTerminal.ItemsSource = BreCalLists.Participants_Terminal;
 
-            this.comboBoxArrivalBerth.ItemsSource = this.Berths;
+            this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
             this.CopyToControls();
         }
 
@@ -83,7 +67,7 @@ namespace BreCalClient
             if (this.ShipcallModel.Shipcall != null)
             {
                 this.Times.EtaBerth = this.datePickerETA.Value;
-                this.ShipcallModel.Shipcall.ArrivalBerthId = (int) this.comboBoxArrivalBerth.SelectedItem;
+                this.ShipcallModel.Shipcall.ArrivalBerthId = (int) this.comboBoxArrivalBerth.SelectedValue;
                 if (this.comboBoxPierside.SelectedIndex >= 0)
                 {
                     this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false;
@@ -147,7 +131,7 @@ namespace BreCalClient
                 }
 
                 if (this.ShipcallModel.Shipcall.ArrivalBerthId.HasValue)
-                    this.comboBoxArrivalBerth.SelectedItem = this.ShipcallModel.Shipcall.ArrivalBerthId;
+                    this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
 
                 if (this.ShipcallModel.Shipcall.PierSide.HasValue)
                 {
@@ -183,6 +167,8 @@ namespace BreCalClient
 
         #endregion
 
+        #region context menu handlers
+
         private void contextMenuItemArrivalBerth_Click(object sender, RoutedEventArgs e)
         {
             this.comboBoxArrivalBerth.SelectedIndex = -1;
@@ -212,5 +198,8 @@ namespace BreCalClient
             this.comboBoxTerminal.SelectedIndex = -1;
             this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.TERMINAL);
         }
+
+        #endregion
+
     }
 }
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
index 2f8fba9..6ade5d7 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
@@ -120,7 +120,7 @@
         <CheckBox x:Name="checkBoxRainsensitiveCargo" Grid.Column="3" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,4,0" />
 
         <StackPanel Grid.Row="11" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
+            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
     </Grid>
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index 109be62..e605b81 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -6,16 +6,7 @@ using BreCalClient.misc.Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace BreCalClient
 {
@@ -46,7 +37,13 @@ namespace BreCalClient
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            this.comboBoxMooring.ItemsSource = BreCalLists.Participants_Mooring;
+            this.comboBoxPilot.ItemsSource = BreCalLists.Participants_Pilot;
+            this.comboBoxTug.ItemsSource = BreCalLists.Participants_Tug;
+            this.comboBoxTerminal.ItemsSource = BreCalLists.Participants_Terminal;
 
+            this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
+            this.CopyToControls();
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
@@ -68,39 +65,135 @@ namespace BreCalClient
 
         private void CopyToModel()
         {
+            if (this.ShipcallModel.Shipcall != null)
+            {
+                this.Times.EtaBerth = this.datePickerETD.Value;
+                this.ShipcallModel.Shipcall.DepartureBerthId = (int)this.comboBoxDepartureBerth.SelectedValue;
+                if (this.comboBoxPierside.SelectedIndex >= 0)
+                {
+                    this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false;
+                }
+                this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();
+                this.ShipcallModel.Shipcall.Draft = (float?)this.doubleUpDownDraft.Value;
+                this.ShipcallModel.Shipcall.TidalWindowFrom = this.datePickerTidalWindowFrom.Value;
+                this.ShipcallModel.Shipcall.TidalWindowTo = this.datePickerTidalWindowTo.Value;
+                this.ShipcallModel.Shipcall.Canceled = this.checkBoxCanceled.IsChecked;
+                
+                this.ShipcallModel.Shipcall.TugRequired = this.checkBoxTugRequired.IsChecked;
+                this.ShipcallModel.Shipcall.RecommendedTugs = this.integerUpDownRecommendedTugs.Value;
+                this.ShipcallModel.Shipcall.PilotRequired = this.checkBoxPilotRequired.IsChecked;
+                this.ShipcallModel.Shipcall.MooredLock = this.checkBoxMooredLock.IsChecked;
+                this.ShipcallModel.Shipcall.RainSensitiveCargo = this.checkBoxRainsensitiveCargo.IsChecked;
 
+                Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem;
+                if (participant != null)
+                {
+                    this.ShipcallModel.Shipcall.Participants.Add(participant.Id);
+                    this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.MOORING] = participant;
+                }
+                participant = (Participant?)this.comboBoxPilot.SelectedItem;
+                if (participant != null)
+                {
+                    this.ShipcallModel.Shipcall.Participants.Add(participant.Id);
+                    this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PILOT] = participant;
+                }
+                participant = (Participant?)this.comboBoxTerminal.SelectedItem;
+                if (participant != null)
+                {
+                    this.ShipcallModel.Shipcall.Participants.Add(participant.Id);
+                    this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TERMINAL] = participant;
+                }
+                participant = (Participant?)this.comboBoxTug.SelectedItem;
+                if (participant != null)
+                {
+                    this.ShipcallModel.Shipcall.Participants.Add(participant.Id);
+                    this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TUG] = participant;
+                }
+            }
         }
 
         private void CopyToControls()
         {
+            if (this.ShipcallModel == null) return;
+            if (this.ShipcallModel.Shipcall != null)
+            {
+                if (this.Times.EtdBerth.HasValue)
+                {
+                    this.datePickerETD.Value = this.Times.EtdBerth.Value;
+                }
+                else
+                {
+                    // if not set through times use value of BSMD entry
+                    if (this.ShipcallModel.Shipcall.Etd != DateTime.MinValue)
+                        this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
+                }
 
+                if (this.ShipcallModel.Shipcall.ArrivalBerthId.HasValue)
+                    this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
+
+                if (this.ShipcallModel.Shipcall.PierSide.HasValue)
+                {
+                    if (this.ShipcallModel.Shipcall.PierSide.Value) this.comboBoxPierside.SelectedIndex = 0;
+                    else this.comboBoxPierside.SelectedIndex = 1;
+                }
+                this.textBoxBerthRemarks.Text = this.Times.BerthInfo;
+                this.doubleUpDownDraft.Value = this.ShipcallModel.Shipcall.Draft;
+                this.datePickerTidalWindowFrom.Value = this.ShipcallModel.Shipcall.TidalWindowFrom;
+                this.datePickerTidalWindowTo.Value = this.ShipcallModel.Shipcall.TidalWindowTo;
+                this.checkBoxCanceled.IsChecked = this.ShipcallModel.Shipcall.Canceled;
+                
+                this.checkBoxTugRequired.IsChecked = this.ShipcallModel.Shipcall.TugRequired;
+                this.integerUpDownRecommendedTugs.Value = this.ShipcallModel.Shipcall.RecommendedTugs;
+                this.checkBoxPilotRequired.IsChecked = this.ShipcallModel.Shipcall.PilotRequired;
+
+                this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock;
+                this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo;
+
+                foreach (int participant_id in this.ShipcallModel.Shipcall.Participants)
+                {
+                    if (((List<Participant>)this.comboBoxMooring.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxMooring.SelectedValue = participant_id;
+                    if (((List<Participant>)this.comboBoxPilot.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxPilot.SelectedValue = participant_id;
+                    if (((List<Participant>)this.comboBoxTerminal.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTerminal.SelectedValue = participant_id;
+                    if (((List<Participant>)this.comboBoxTug.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTug.SelectedValue = participant_id;
+                }
+            }
         }
 
         #endregion
 
+        #region context menu handlers
+
         private void contextMenuItemClearTug_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxTug.SelectedIndex = -1;
+            this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.TUG);
         }
 
         private void contextMenuItemClearPilot_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxPilot.SelectedIndex = -1;
+            this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.PILOT);
         }
 
         private void contextMenuItemClearMooring_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxMooring.SelectedIndex = -1;
+            this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.MOORING);
         }
 
         private void contextMenuItemDepartureBerth_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxDepartureBerth.SelectedIndex = -1;
+            this.ShipcallModel.Berth = "";
         }
 
         private void contextMenuItemClearTerminal_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxTerminal.SelectedIndex = -1;
+            this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.TERMINAL);
         }
+
+        #endregion
+
     }
 }
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
index dda0a0f..b144d8b 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
@@ -146,7 +146,7 @@
 
 
         <StackPanel Grid.Row="14" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
+            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
     </Grid>
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
index c64888f..b004041 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
@@ -6,17 +6,7 @@ using BreCalClient.misc.Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace BreCalClient
 {
@@ -47,7 +37,14 @@ namespace BreCalClient
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            this.comboBoxMooring.ItemsSource = BreCalLists.Participants_Mooring;
+            this.comboBoxPilot.ItemsSource = BreCalLists.Participants_Pilot;
+            this.comboBoxTug.ItemsSource = BreCalLists.Participants_Tug;
+            this.comboBoxTerminal.ItemsSource = BreCalLists.Participants_Terminal;
 
+            this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
+            this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
+            this.CopyToControls();
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
@@ -69,44 +66,155 @@ namespace BreCalClient
 
         private void CopyToModel()
         {
+            if (this.ShipcallModel.Shipcall != null)
+            {
+                this.Times.EtdBerth = this.datePickerETD.Value;
+                this.Times.EtaBerth = this.datePickerETA.Value;
+                this.ShipcallModel.Shipcall.DepartureBerthId = (int)this.comboBoxDepartureBerth.SelectedValue;
+                this.ShipcallModel.Shipcall.ArrivalBerthId = (int)this.comboBoxArrivalBerth.SelectedValue;
+                if (this.comboBoxPiersideArrival.SelectedIndex >= 0)
+                {
+                    this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPiersideArrival.SelectedIndex == 0) ? true : false;
+                }
+                this.Times.BerthInfo = this.textBoxBerthRemarksArrival.Text.Trim();
+                this.ShipcallModel.Shipcall.Draft = (float?)this.doubleUpDownDraft.Value;
+                this.ShipcallModel.Shipcall.TidalWindowFrom = this.datePickerTidalWindowFrom.Value;
+                this.ShipcallModel.Shipcall.TidalWindowTo = this.datePickerTidalWindowTo.Value;
+                this.ShipcallModel.Shipcall.Canceled = this.checkBoxCanceled.IsChecked;
 
+                
+                this.ShipcallModel.Shipcall.TugRequired = this.checkBoxTugRequired.IsChecked;
+                this.ShipcallModel.Shipcall.RecommendedTugs = this.integerUpDownRecommendedTugs.Value;
+                this.ShipcallModel.Shipcall.PilotRequired = this.checkBoxPilotRequired.IsChecked;
+                this.ShipcallModel.Shipcall.MooredLock = this.checkBoxMooredLock.IsChecked;
+                this.ShipcallModel.Shipcall.RainSensitiveCargo = this.checkBoxRainsensitiveCargo.IsChecked;
+
+                Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem;
+                if (participant != null)
+                {
+                    this.ShipcallModel.Shipcall.Participants.Add(participant.Id);
+                    this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.MOORING] = participant;
+                }
+                participant = (Participant?)this.comboBoxPilot.SelectedItem;
+                if (participant != null)
+                {
+                    this.ShipcallModel.Shipcall.Participants.Add(participant.Id);
+                    this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PILOT] = participant;
+                }
+                participant = (Participant?)this.comboBoxTerminal.SelectedItem;
+                if (participant != null)
+                {
+                    this.ShipcallModel.Shipcall.Participants.Add(participant.Id);
+                    this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TERMINAL] = participant;
+                }
+                participant = (Participant?)this.comboBoxTug.SelectedItem;
+                if (participant != null)
+                {
+                    this.ShipcallModel.Shipcall.Participants.Add(participant.Id);
+                    this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TUG] = participant;
+                }
+            }
         }
 
         private void CopyToControls()
         {
+            if (this.ShipcallModel == null) return;
+            if (this.ShipcallModel.Shipcall != null)
+            {
+                if (this.Times.EtaBerth.HasValue)
+                {
+                    this.datePickerETA.Value = this.Times.EtaBerth.Value;
+                }
+                else
+                {
+                    // if not set through times use value of BSMD entry
+                    if (this.ShipcallModel.Shipcall.Eta != DateTime.MinValue)
+                        this.datePickerETA.Value = this.ShipcallModel.Shipcall.Eta;
+                }
+                if(this.Times.EtdBerth.HasValue)
+                {
+                    this.datePickerETD.Value = this.Times.EtdBerth.Value;
+                }
+                else
+                {
+                    if (this.ShipcallModel.Shipcall.Etd != DateTime.MinValue)
+                        this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
+                }
 
+                if (this.ShipcallModel.Shipcall.ArrivalBerthId.HasValue)
+                    this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
+                if (this.ShipcallModel.Shipcall.DepartureBerthId.HasValue)
+                    this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
+
+                if (this.ShipcallModel.Shipcall.PierSide.HasValue)
+                {
+                    if (this.ShipcallModel.Shipcall.PierSide.Value) this.comboBoxPiersideArrival.SelectedIndex = 0;
+                    else this.comboBoxPiersideArrival.SelectedIndex = 1;
+                }
+                this.textBoxBerthRemarksArrival.Text = this.Times.BerthInfo;
+                this.doubleUpDownDraft.Value = this.ShipcallModel.Shipcall.Draft;
+                this.datePickerTidalWindowFrom.Value = this.ShipcallModel.Shipcall.TidalWindowFrom;
+                this.datePickerTidalWindowTo.Value = this.ShipcallModel.Shipcall.TidalWindowTo;
+                this.checkBoxCanceled.IsChecked = this.ShipcallModel.Shipcall.Canceled;
+                
+                this.checkBoxTugRequired.IsChecked = this.ShipcallModel.Shipcall.TugRequired;
+                this.integerUpDownRecommendedTugs.Value = this.ShipcallModel.Shipcall.RecommendedTugs;
+                this.checkBoxPilotRequired.IsChecked = this.ShipcallModel.Shipcall.PilotRequired;
+
+                this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock;
+                this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo;
+
+                foreach (int participant_id in this.ShipcallModel.Shipcall.Participants)
+                {
+                    if (((List<Participant>)this.comboBoxMooring.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxMooring.SelectedValue = participant_id;
+                    if (((List<Participant>)this.comboBoxPilot.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxPilot.SelectedValue = participant_id;
+                    if (((List<Participant>)this.comboBoxTerminal.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTerminal.SelectedValue = participant_id;
+                    if (((List<Participant>)this.comboBoxTug.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTug.SelectedValue = participant_id;
+                }
+            }
         }
 
         #endregion
 
+        #region context menu handlers
+
         private void contextMenuItemDepartureBerth_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxDepartureBerth.SelectedIndex = -1;
+            this.ShipcallModel.Berth = "";
         }
 
         private void contextMenuItemArrivalBerth_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxArrivalBerth.SelectedIndex = -1;
+            this.ShipcallModel.Berth = "";
         }
 
         private void contextMenuItemClearTug_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxTug.SelectedIndex = -1;
+            this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.TUG);
         }
 
         private void contextMenuItemClearPilot_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxPilot.SelectedIndex = -1;
+            this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.PILOT);
         }
 
         private void contextMenuItemClearMooring_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxMooring.SelectedIndex = -1;
+            this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.MOORING);
         }
 
         private void contextMenuItemClearTerminal_Click(object sender, RoutedEventArgs e)
         {
-
+            this.comboBoxTerminal.SelectedIndex = -1;
+            this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.TERMINAL);
         }
+
+        #endregion
+
     }
 }
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index cc7e277..1f626a1 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -3,19 +3,7 @@
 // 
 
 using BreCalClient.misc.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace BreCalClient
 {
@@ -31,9 +19,7 @@ namespace BreCalClient
 
         #region Properties
 
-        public Times Times { get; set; } = new();    
-        
-        public List<Berth> Berths { get; set; }
+        public Times Times { get; set; } = new();                   
 
         #endregion
 
@@ -41,7 +27,7 @@ namespace BreCalClient
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            this.comboBoxBerth.ItemsSource = this.Berths;
+            this.comboBoxBerth.ItemsSource = BreCalLists.Berths;
             this.CopyToControls();
         }
 
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index f53e6fc..a195279 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -30,8 +30,8 @@ namespace BreCalClient
 
         #region Fields
 
-        private Timer _timer;
-        Credentials _credentials;
+        private Timer? _timer;
+        private Credentials? _credentials;
 
         private readonly Dictionary<int, ShipcallControlModel> _allShipcallsDict = new();
         private readonly Dictionary<int, ShipcallControl> _allShipCallsControlDict = new();
@@ -43,7 +43,7 @@ namespace BreCalClient
         private bool _refreshImmediately = false;
 
         private bool? _showCanceled = null;
-        private Extensions.SortOrder? _sortOrder;
+        private SortOrder? _sortOrder;
         // private bool _filterChanged = false;
         // private bool _sequenceChanged = false;
 
@@ -319,7 +319,7 @@ namespace BreCalClient
                             // update entry
                             _allShipcallsDict[shipcall.Id].Shipcall = shipcall;
                             _allShipcallsDict[shipcall.Id].Times = currentTimes;
-                            this.UpdateShipcall(_allShipcallsDict[shipcall.Id]);
+                            UpdateShipcall(_allShipcallsDict[shipcall.Id]);
                         }                        
                     }                    
 
@@ -376,7 +376,7 @@ namespace BreCalClient
             });
         }                
 
-        private void UpdateShipcall(ShipcallControlModel scm)
+        private static void UpdateShipcall(ShipcallControlModel scm)
         {
             if(scm.Shipcall == null) return;
             Shipcall shipcall = scm.Shipcall;