diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index 879d663..4bac332 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -8,7 +8,7 @@
         xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditTimes}" Height="330" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditTimes}" Height="280" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width=".25*" />
@@ -21,8 +21,6 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
             <RowDefinition Height="56" />
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
@@ -31,9 +29,8 @@
         <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDBerth}" HorizontalContentAlignment="Right" />
         <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" />
-        <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
+        
+        <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
 
         <xctk:DateTimePicker IsEnabled="False" Grid.Row="1" Grid.Column="1" Margin="2" Name="datePickerETABerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
@@ -83,30 +80,9 @@
             </xctk:DateTimePicker.ContextMenu>
         </xctk:DateTimePicker>
         <CheckBox IsEnabled="False" Grid.Row="4" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxZoneEntryFixed" VerticalAlignment="Center" />
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="5" Grid.Column="1" Margin="2" Name="datePickerOperationStart" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
-            <xctk:DateTimePicker.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationStart" Click="contextMenuItemClearOperationStart_Click" >
-                        <MenuItem.Icon>
-                            <Image Source="Resources\delete.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </ContextMenu>
-            </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="6" Grid.Column="1" Margin="2" Name="datePickerOperationEnd" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
-            <xctk:DateTimePicker.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationEnd" Click="contextMenuItemClearOperationEnd_Click" >
-                        <MenuItem.Icon>
-                            <Image Source="Resources\delete.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </ContextMenu>
-            </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
-        <TextBox Grid.Row="7" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="True" />
-        <StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
+        
+        <TextBox Grid.Row="5" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="True" />
+        <StackPanel Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <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>
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 23a36a7..c15f1a1 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -11,7 +11,7 @@ namespace BreCalClient
     /// <summary>
     /// Interaction logic for EditTimesControl.xaml
     /// </summary>
-    public partial class EditTimesControl : Window
+    public partial class EditTimesControl : Window, IEditTimesControl
     {
 
         #region Construction
@@ -55,10 +55,7 @@ namespace BreCalClient
 
             this.datePickerZoneEntry.IsEnabled = App.Participant.IsTypeFlagSet(Extensions.ParticipantType.AGENCY) ||
                                                  App.Participant.IsTypeFlagSet(Extensions.ParticipantType.PILOT);
-            this.checkBoxZoneEntryFixed.IsEnabled = this.datePickerZoneEntry.IsEnabled;
-
-            this.datePickerOperationStart.IsEnabled = App.Participant.IsTypeFlagSet(Extensions.ParticipantType.TERMINAL);
-            this.datePickerOperationEnd.IsEnabled = App.Participant.IsTypeFlagSet(Extensions.ParticipantType.TERMINAL);
+            this.checkBoxZoneEntryFixed.IsEnabled = this.datePickerZoneEntry.IsEnabled;            
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
@@ -85,8 +82,7 @@ namespace BreCalClient
             this.Times.EtdBerth = this.datePickerETDBerth.Value;
             this.Times.LockTime = this.datePickerLockTime.Value;
             this.Times.ZoneEntry = this.datePickerZoneEntry.Value;
-            this.Times.OperationsStart = this.datePickerOperationStart.Value;
-            this.Times.OperationsEnd = this.datePickerOperationEnd.Value;
+            
             this.Times.EtaBerthFixed = this.checkBoxEtaBerthFixed.IsChecked;
             this.Times.EtdBerthFixed = this.checkBoxEtDBerthFixed.IsChecked;
             this.Times.LockTimeFixed = this.checkBoxLockTimeFixed.IsChecked;
@@ -100,8 +96,7 @@ namespace BreCalClient
             this.datePickerETDBerth.Value = this.Times.EtdBerth;
             this.datePickerLockTime.Value = this.Times.LockTime;
             this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
-            this.datePickerOperationStart.Value = this.Times.OperationsStart;
-            this.datePickerOperationEnd.Value = this.Times.OperationsEnd;
+            
             this.checkBoxEtaBerthFixed.IsChecked = this.Times.EtaBerthFixed;
             this.checkBoxEtDBerthFixed.IsChecked = this.Times.EtdBerthFixed;
             this.checkBoxLockTimeFixed.IsChecked = this.Times.LockTimeFixed;
@@ -130,17 +125,7 @@ namespace BreCalClient
         private void contextMenuItemClearZoneEntry_Click(object sender, RoutedEventArgs e)
         {
             this.datePickerZoneEntry.Value = null;
-        }
-
-        private void contextMenuItemClearOperationStart_Click(object sender, RoutedEventArgs e)
-        {
-            this.datePickerOperationStart.Value = null;
-        }
-
-        private void contextMenuItemClearOperationEnd_Click(object sender, RoutedEventArgs e)
-        {
-            this.datePickerOperationEnd.Value = null;
-        }
+        }        
 
         #endregion
 
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
new file mode 100644
index 0000000..28411fe
--- /dev/null
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -0,0 +1,76 @@
+<Window x:Class="BreCalClient.EditTimesTerminalControl"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:p = "clr-namespace:BreCalClient.Resources"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:local="clr-namespace:BreCalClient"
+        mc:Ignorable="d"
+        Title="{x:Static p:Resources.textEditTimes}" Loaded="Window_Loaded" Height="280" Width="400" >
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width=".4*" />
+            <ColumnDefinition Width=".6*" />
+            
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="56" />
+            <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="2" Grid.Column="0" Content="{x:Static p:Resources.textBerth}" HorizontalAlignment="Right" />
+        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textRotated}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" />
+
+        <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
+
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="0" Grid.Column="1" Margin="2" Name="datePickerOperationStart" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+            <xctk:DateTimePicker.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationStart" Click="contextMenuItemClearOperationStart_Click" >
+                        <MenuItem.Icon>
+                            <Image Source="Resources\delete.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+            </xctk:DateTimePicker.ContextMenu>
+        </xctk:DateTimePicker>
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="1" Grid.Column="1" Margin="2" Name="datePickerOperationEnd" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+            <xctk:DateTimePicker.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationEnd" Click="contextMenuItemClearOperationEnd_Click" >
+                        <MenuItem.Icon>
+                            <Image Source="Resources\delete.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+            </xctk:DateTimePicker.ContextMenu>
+        </xctk:DateTimePicker>
+        <ComboBox Name="comboBoxBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemBerth" Click="contextMenuItemBerth_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+        <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="3" Margin="2" >
+            <ComboBoxItem Content="{x:Static p:Resources.textNotRotated}" />
+            <ComboBoxItem Content="{x:Static p:Resources.textRotated}" />
+        </ComboBox>
+        <TextBox Grid.Row="4" Grid.Column="1" Margin="2" Name="textBoxBerthRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="True" />
+        <TextBox Grid.Row="5" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="True" />
+        <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+            <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>
+</Window>
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
new file mode 100644
index 0000000..3584c05
--- /dev/null
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -0,0 +1,105 @@
+// Copyright (c) 2023 schick Informatik
+// Description: Terminals have all different fields so a different dialog
+// 
+
+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
+{
+    /// <summary>
+    /// Interaction logic for EditTimesTerminalControl.xaml
+    /// </summary>
+    public partial class EditTimesTerminalControl : Window, IEditTimesControl
+    {
+        public EditTimesTerminalControl()
+        {
+            InitializeComponent();
+        }
+
+        #region Properties
+
+        public Times Times { get; set; } = new();    
+        
+        public List<Berth> Berths { get; set; }
+
+        #endregion
+
+        #region event handler
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxBerth.ItemsSource = this.Berths;
+            this.CopyToControls();
+        }
+
+        private void contextMenuItemClearOperationStart_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerOperationStart.Value = null;
+        }
+
+        private void contextMenuItemClearOperationEnd_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerOperationEnd.Value = null;
+        }
+
+        private void contextMenuItemBerth_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxBerth.SelectedIndex -= 1;
+        }
+
+        private void buttonOK_Click(object sender, RoutedEventArgs e)
+        {
+            this.CopyToModel();
+            this.DialogResult = true;
+            this.Close();
+        }
+
+        private void buttonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = false;
+            this.Close();
+        }
+
+        #endregion
+
+        #region private methods
+
+        private void CopyToModel()
+        {
+            switch(this.comboBoxPierside.SelectedIndex)
+            {
+                case 0: this.Times.PierSide = true; break;
+                case 1: this.Times.PierSide= false; break;
+                default: this.Times.PierSide = null; break;
+            }            
+            this.Times.OperationsStart = this.datePickerOperationStart.Value;
+            this.Times.OperationsEnd = this.datePickerOperationEnd.Value;
+
+            this.Times.Remarks = this.textBoxBerthRemarks.Text.Trim();
+            this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();
+        }
+
+        private void CopyToControls()
+        {
+            this.datePickerOperationStart.Value = this.Times.OperationsStart;
+            this.datePickerOperationEnd.Value = this.Times.OperationsEnd;
+        }
+
+        #endregion
+
+        
+    }
+}
diff --git a/src/BreCalClient/IEditTimesControl.cs b/src/BreCalClient/IEditTimesControl.cs
new file mode 100644
index 0000000..b4497f6
--- /dev/null
+++ b/src/BreCalClient/IEditTimesControl.cs
@@ -0,0 +1,17 @@
+using BreCalClient.misc.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BreCalClient
+{
+    internal interface IEditTimesControl
+    {
+        Times Times { get; set; }
+
+        bool? ShowDialog();
+
+    }
+}
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index c2bfb80..971e0f5 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -522,12 +522,17 @@ namespace BreCalClient
         private async void Sc_EditTimesRequested(ShipcallControl obj, Times? times)
         {
             // show a dialog that lets the user create / update times for the given shipcall
-            EditTimesControl etc = new();
+            IEditTimesControl etc = new EditTimesControl();
             bool wasEdit = false;
             if (times != null)
             {
                 etc.Times = times;
                 wasEdit = true;
+
+                // wie bekommen wir hier raus ob terminal oder agent gemeint ist?
+
+                // if(_participantLookupDict[times.ParticipantId].Type == 
+                
             }
             if(etc.ShowDialog() ?? false)
             {
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index da52d12..5554f58 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -235,6 +235,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Berth remarks.
+        /// </summary>
+        public static string textBerthRemarks {
+            get {
+                return ResourceManager.GetString("textBerthRemarks", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Berths.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 64c1608..7bfc44a 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -376,4 +376,7 @@
   <data name="textShowCancelledShipcalls" xml:space="preserve">
     <value>Stornierte anzeigen</value>
   </data>
+  <data name="textBerthRemarks" xml:space="preserve">
+    <value>Liegeplatz Informationen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index b80541f..8618bb3 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -172,6 +172,9 @@
   <data name="textBerth" xml:space="preserve">
     <value>Berth</value>
   </data>
+  <data name="textBerthRemarks" xml:space="preserve">
+    <value>Berth remarks</value>
+  </data>
   <data name="textBerths" xml:space="preserve">
     <value>Berths</value>
   </data>
diff --git a/src/BreCalClient/ShipcallExtraControl.xaml b/src/BreCalClient/ShipcallExtraControl.xaml
deleted file mode 100644
index c81f640..0000000
--- a/src/BreCalClient/ShipcallExtraControl.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<UserControl x:Class="BreCalClient.ShipcallExtraControl"
-             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"
-             mc:Ignorable="d" 
-             d:DesignHeight="100" d:DesignWidth="800">
-    <Grid>
-        <Button x:Name="buttonCloseDropDown" Click="buttonCloseDropDown_Click" Grid.Column="2" Background="Transparent" ToolTip="Close extra info" Margin="1" BorderThickness="0" HorizontalAlignment="Left">
-            <Image Source="./Resources/arrow_up_red.png" />
-        </Button>
-    </Grid>
-</UserControl>
diff --git a/src/BreCalClient/ShipcallExtraControl.xaml.cs b/src/BreCalClient/ShipcallExtraControl.xaml.cs
deleted file mode 100644
index 8f76d6f..0000000
--- a/src/BreCalClient/ShipcallExtraControl.xaml.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2023 schick Informatik
-// Description: Extra shipcall info shown in drop down
-// 
-
-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.Navigation;
-using System.Windows.Shapes;
-
-namespace BreCalClient
-{
-    /// <summary>
-    /// Interaction logic for ShipcallExtraControl.xaml
-    /// </summary>
-    public partial class ShipcallExtraControl : UserControl
-    {
-        public ShipcallExtraControl()
-        {
-            InitializeComponent();
-        }
-
-        #region events
-
-        public event Action<ShipcallExtraControl>? CloseExtraRequested;
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// this is our datasource
-        /// </summary>
-        public ShipcallControlModel? ShipcallControlModel { get; set; }
-
-        #endregion
-
-        private void buttonCloseDropDown_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.CloseExtraRequested != null)
-            {
-                this.CloseExtraRequested(this);
-            }
-        }
-    }
-}