diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 735aaff..9032c1a 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -182,8 +182,8 @@ namespace BreCalClient
                 this.ShipcallModel.Shipcall.Eta = this.datePickerETA.Value;
                 this.ShipcallModel.Shipcall.Etd = this.datePickerETD.Value;
 
-                this.ShipcallModel.Shipcall.ShipId = ((Ship)this.comboBoxShip.SelectedItem).Id;
-                this.ShipcallModel.Ship = (Ship)this.comboBoxShip.SelectedItem;
+                this.ShipcallModel.Shipcall.ShipId = ((ShipModel)this.comboBoxShip.SelectedItem).Ship.Id;
+                this.ShipcallModel.Ship = ((ShipModel)this.comboBoxShip.SelectedItem).Ship;
                 this.ShipcallModel.Shipcall.Canceled = this.checkBoxCancelled.IsChecked;
 
                 if (this.ShipcallModel.Shipcall.Type != 3) // incoming, outgoing
diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
index 3a32e57..8b60a7f 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
@@ -43,15 +43,11 @@
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_down_red.png" />
         </Grid>
         
-        <Label Content="ETA" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right"/>
+        <Label Content="ETA" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
-        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-            <ComboBox.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemArrivalBerth" Click="contextMenuItemArrivalBerth_Click" />
-                </ContextMenu>
-            </ComboBox.ContextMenu>
+            
         </ComboBox>
         <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" />
         <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="3" Margin="2" >
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
index 2a181b6..5448fc4 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
@@ -39,15 +39,10 @@
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_up_blue.png" />
         </Grid>
         
-        <Label Content="ETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right"/>
+        <Label Content="ETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
-        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" />
+        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
-            <ComboBox.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemDepartureBerth" Click="contextMenuItemDepartureBerth_Click" />
-                </ContextMenu>
-            </ComboBox.ContextMenu>
         </ComboBox>
         <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" />
         <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="3" Margin="2" >
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
index e01f531..c5b703b 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
@@ -44,7 +44,7 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingFrom}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right"/>
+        <Label Content="ETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
         
         <Label Content="{x:Static p:Resources.textTerminal}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right"/>
@@ -55,14 +55,9 @@
                 </ContextMenu>
             </ComboBox.ContextMenu>
         </ComboBox>
-        
-        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" />
+
+        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right"  FontWeight="Bold"/>
         <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="3" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
-            <ComboBox.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemDepartureBerth" Click="contextMenuItemDepartureBerth_Click" />
-                </ContextMenu>
-            </ComboBox.ContextMenu>
         </ComboBox>
         
         <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" />
@@ -80,16 +75,11 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingTo}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETA" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right"/>
+        <Label Content="ETA" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="1" Grid.Row="9" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
 
-        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="10"  HorizontalContentAlignment="Right"/>
+        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="10"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="10" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-            <ComboBox.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemArrivalBerth" Click="contextMenuItemArrivalBerth_Click" />
-                </ContextMenu>
-            </ComboBox.ContextMenu>
         </ComboBox>
         <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="11" HorizontalContentAlignment="Right" />
         <ComboBox x:Name="comboBoxPiersideArrival" Grid.Column="1" Grid.Row="11" Margin="2" >
diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index dfb6b31..bb2d400 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -25,8 +25,8 @@
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <!-- Label Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textFixed}" /-->
-        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textETABerth}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDBerth}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textETABerth}" HorizontalContentAlignment="Right" x:Name="labelETA" />
+        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDBerth}" HorizontalContentAlignment="Right" x:Name="labelETD" />
         <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" HorizontalContentAlignment="Right" />
         <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textZoneEntryTime}" HorizontalContentAlignment="Right" />
         
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 20845f1..7746904 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -63,11 +63,6 @@ namespace BreCalClient
             this.Times.EtdBerth = this.datePickerETDBerth.Value;
             this.Times.LockTime = this.datePickerLockTime.Value;
             this.Times.ZoneEntry = this.datePickerZoneEntry.Value;
-            
-            //this.Times.EtaBerthFixed = this.checkBoxEtaBerthFixed.IsChecked;
-            //this.Times.EtdBerthFixed = this.checkBoxEtDBerthFixed.IsChecked;
-            //this.Times.LockTimeFixed = this.checkBoxLockTimeFixed.IsChecked;
-            //this.Times.ZoneEntryFixed = this.checkBoxZoneEntryFixed.IsChecked;
         }
 
         private void CopyToControls()
@@ -77,11 +72,19 @@ namespace BreCalClient
             this.datePickerETDBerth.Value = this.Times.EtdBerth;
             this.datePickerLockTime.Value = this.Times.LockTime;
             this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
-            
-            //this.checkBoxEtaBerthFixed.IsChecked = this.Times.EtaBerthFixed;
-            //this.checkBoxEtDBerthFixed.IsChecked = this.Times.EtdBerthFixed;
-            //this.checkBoxLockTimeFixed.IsChecked = this.Times.LockTimeFixed;
-            //this.checkBoxZoneEntryFixed.IsChecked = this.Times.ZoneEntryFixed;
+
+            switch (CallType)
+            {
+                case Extensions.TypeEnum.Incoming:
+                    this.labelETA.FontWeight = FontWeights.Bold; 
+                    this.datePickerETABerth.ContextMenu.IsEnabled = false; 
+                    break;
+                case Extensions.TypeEnum.Outgoing:
+                case Extensions.TypeEnum.Shifting:
+                    this.labelETD.FontWeight = FontWeights.Bold;
+                    this.datePickerETDBerth.ContextMenu.IsEnabled = false;
+                    break;
+            }                       
         }
 
         private void EnableControls()
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index 456cd04..bf69e38 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -24,8 +24,8 @@
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
 
-        <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" HorizontalContentAlignment="Right" x:Name="labelStart" />
+        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" x:Name="labelEnd" />
         <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textBerth}" HorizontalAlignment="Right" />
         <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textPierside}" HorizontalContentAlignment="Right" />
         <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" />
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index 4d9549f..f8c8220 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -90,6 +90,20 @@ namespace BreCalClient
             this.comboBoxBerth.SelectedValue = this.Times.BerthId;
             this.textBoxRemarks.Text = this.Times.Remarks;
             this.textBoxBerthRemarks.Text = this.Times.BerthInfo;
+
+            switch (CallType)
+            {
+                case Extensions.TypeEnum.Incoming:
+                    this.labelStart.FontWeight = FontWeights.Bold;
+                    this.datePickerOperationStart.ContextMenu.IsEnabled = false;
+                    break;
+                case Extensions.TypeEnum.Outgoing:
+                case Extensions.TypeEnum.Shifting:
+                    this.labelEnd.FontWeight = FontWeights.Bold;
+                    this.datePickerOperationEnd.ContextMenu.IsEnabled = false;
+                    break;
+            }
+
         }
 
         private void EnableControls()