diff --git a/ENI-2/ENI2/ENI2/AnmeldungenControl.xaml b/ENI-2/ENI2/ENI2/AnmeldungenControl.xaml
index 97614ea3..dee60216 100644
--- a/ENI-2/ENI2/ENI2/AnmeldungenControl.xaml
+++ b/ENI-2/ENI2/ENI2/AnmeldungenControl.xaml
@@ -17,7 +17,7 @@
                 <DataGridTextColumn Header="Port" Binding="{Binding Portname}" IsReadOnly="True" />
                 <DataGridTextColumn Header="Id" Binding="{Binding DisplayId}" IsReadOnly="True" />
                 <DataGridTextColumn Header="Status" Binding="{Binding BSMDStatusInternal}" IsReadOnly="True" />
-                <DataGridTextColumn Header="Edited by" Binding="{Binding EditedBy}" IsReadOnly="True" />
+                <DataGridTextColumn Header="Edited by" Binding="{Binding EditedBy}" IsReadOnly="True" Width="*"/>
 
             </DataGrid.Columns>
         </DataGrid>
diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config
index b793453c..85221ef7 100644
--- a/ENI-2/ENI2/ENI2/App.config
+++ b/ENI-2/ENI2/ENI2/App.config
@@ -17,7 +17,7 @@ Sample license text.
     <applicationSettings>
         <ENI2.Properties.Settings>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
+                <value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI-2/ENI2/ENI2/App.xaml b/ENI-2/ENI2/ENI2/App.xaml
index d31823f0..8de76f43 100644
--- a/ENI-2/ENI2/ENI2/App.xaml
+++ b/ENI-2/ENI2/ENI2/App.xaml
@@ -4,6 +4,6 @@
              xmlns:local="clr-namespace:ENI2"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        
     </Application.Resources>
 </Application>
diff --git a/ENI-2/ENI2/ENI2/App.xaml.cs b/ENI-2/ENI2/ENI2/App.xaml.cs
index 22f580d1..f978a99d 100644
--- a/ENI-2/ENI2/ENI2/App.xaml.cs
+++ b/ENI-2/ENI2/ENI2/App.xaml.cs
@@ -1,6 +1,8 @@
 // Copyright (c) 2017 Informatibüro Daniel Schick
 
+using System.Globalization;
 using System.Windows;
+using System.Windows.Markup;
 
 namespace ENI2
 {
@@ -13,6 +15,10 @@ namespace ENI2
         public App() : base()
         {
             this.Dispatcher.UnhandledException += Dispatcher_UnhandledException;
+
+            FrameworkElement.LanguageProperty.OverrideMetadata(typeof(FrameworkElement),
+                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
+
         }
 
         private void Dispatcher_UnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
diff --git a/ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs b/ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs
index 7d7267b0..1745be6e 100644
--- a/ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs
+++ b/ENI-2/ENI2/ENI2/Controls/ENIDataGrid.cs
@@ -124,14 +124,14 @@ namespace ENI2.Controls
 
         protected void deleteItem(object sender, RoutedEventArgs e)
         {
-            if((this.SelectedItems != null) && (this.SelectedItems.Count > 0))
+            if((this.SelectedItems != null) && (this.SelectedItems.Count == 1))
             {
-                // TODO: ask confirmation message box
-
-                foreach(object deleteItem in this.SelectedItems)
+                MessageBoxResult result = MessageBox.Show(Properties.Resources.textAreYouSure, Properties.Resources.textCaptionDeleteConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
+                if (result == MessageBoxResult.Yes)
                 {
-                    if (deleteItem is DatabaseEntity) {
-                        this.DeleteRequested?.Invoke(deleteItem as DatabaseEntity);
+                    DatabaseEntity deleteItem = this.SelectedItems[0] as DatabaseEntity;                    
+                    if (deleteItem != null) {
+                        this.DeleteRequested?.Invoke(deleteItem);
                     }
                 }
             }
diff --git a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
index 0ebc6f4e..606b318f 100644
--- a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
+++ b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
@@ -16,6 +16,10 @@ namespace ENI2.Controls
     [TemplatePart(Name = "buttonCancel", Type = typeof(Button))]
     public class EditWindowBase : Window
     {
+
+        public event Action OKClicked;
+        public event Action CancelClicked;
+
         static EditWindowBase()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(EditWindowBase), new FrameworkPropertyMetadata(typeof(EditWindowBase)));
@@ -27,8 +31,8 @@ namespace ENI2.Controls
                     {
                         var okButton = (Button)Template.FindName("buttonOK", this);
                         var cancelButton = (Button)Template.FindName("buttonCancel", this);
-                        okButton.Click += (s, e) => DialogResult = true;
-                        cancelButton.Click += (s, e) => DialogResult = false;
+                        okButton.Click += (s, e) => { DialogResult = true; OKClicked?.Invoke(); };
+                        cancelButton.Click += (s, e) => { DialogResult = false; CancelClicked?.Invoke(); };
                     };
         }
 
diff --git a/ENI-2/ENI2/ENI2/Controls/LocodeControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/LocodeControl.xaml.cs
index 522ab672..66be34c6 100644
--- a/ENI-2/ENI2/ENI2/Controls/LocodeControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/Controls/LocodeControl.xaml.cs
@@ -89,14 +89,21 @@ namespace ENI2.Controls
 
         private void ComboBox_TextChanged(object sender, RoutedEventArgs e)
         {            
-            if (this.comboBoxLocode.Text.Length > 3)
+            if (this.comboBoxLocode.Text.Length > 4)
             {
                 // check if actual locode
-                bool isLocode = !LocodeDB.PortNameFromLocode(this.comboBoxLocode.Text).IsNullOrEmpty();
-                if (isLocode)
+                if (this.comboBoxLocode.Text.Length == 5)
                 {
-                    this.SetLocodeStateImage(this.imageLocodeState, LocodeState.OK);
-                    return;
+                    string directLocode = this.comboBoxLocode.Text.Trim().ToUpper();
+                    bool isLocode = !LocodeDB.PortNameFromLocode(directLocode).IsNullOrEmpty();
+                    if (isLocode)
+                    {
+                        this.comboBoxLocode.Text = directLocode;
+                        this.LocodeList.Clear();
+                        this.LocodeList.Add(directLocode);
+                        this.SetLocodeStateImage(this.imageLocodeState, LocodeState.OK);
+                        return;
+                    }
                 }
 
                 // assume this is a harbour name typed out..                
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
index f6be5f4a..f8830056 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
@@ -40,12 +40,12 @@
                     <Label Grid.Row="2" Grid.Column="2" Content="ETD last port" Name="label_ETDFromLastport" />
                     <Label Grid.Row="3" Grid.Column="2" Content="ETA next port" Name="label_ETAToNextPort" />
                     <Label Grid.Row="4" Grid.Column="0" Content="Anchored" Name="label_IsAnchored" />
-                    <xctk:DateTimePicker Grid.Column="1" Grid.Row="0" Value="{Binding ETAToPortOfCall, Mode=TwoWay}" Name="dateTimePicker_ETAToPortOfCall" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2"/>
-                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="0" Value="{Binding ETDFromPortOfCall, Mode=TwoWay}" Name="dateTimePicker_ETDFromPortOfCall" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2"/>
-                    <xctk:DateTimePicker Grid.Column="1" Grid.Row="1" Value="{Binding ETAToKielCanal, Mode=TwoWay}" Name="dateTimePicker_ETAToKielCanal" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2"/>
-                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="1" Value="{Binding ETDFromKielCanal, Mode=TwoWay}" Name="dateTimePicker_ETDFromKielCanal" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2"/>
-                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="3" Value="{Binding ETAToNextPort, Mode=TwoWay}" Name="dateTimePicker_ETAToNextPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2"/>
-                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="2" Value="{Binding ETDFromLastPort, Mode=TwoWay}" Name="dateTimePicker_ETDFromLastPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2"/>
+                    <xctk:DateTimePicker Grid.Column="1" Grid.Row="0" Value="{Binding ETAToPortOfCall, Mode=TwoWay}" Name="dateTimePicker_ETAToPortOfCall" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False"/>
+                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="0" Value="{Binding ETDFromPortOfCall, Mode=TwoWay}" Name="dateTimePicker_ETDFromPortOfCall" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False"/>
+                    <xctk:DateTimePicker Grid.Column="1" Grid.Row="1" Value="{Binding ETAToKielCanal, Mode=TwoWay}" Name="dateTimePicker_ETAToKielCanal" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False"/>
+                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="1" Value="{Binding ETDFromKielCanal, Mode=TwoWay}" Name="dateTimePicker_ETDFromKielCanal" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False"/>
+                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="3" Value="{Binding ETAToNextPort, Mode=TwoWay}" Name="dateTimePicker_ETAToNextPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False"/>
+                    <xctk:DateTimePicker Grid.Column="3" Grid.Row="2" Value="{Binding ETDFromLastPort, Mode=TwoWay}" Name="dateTimePicker_ETDFromLastPort" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="False"/>
 
                     <enictrl:LocodeControl Grid.Column="1" Grid.Row="2" Width="Auto" x:Name="locodeControl_LastPort" LocodeValue="{Binding LastPort, Mode=TwoWay}"/>
                     <enictrl:LocodeControl Grid.Column="1" Grid.Row="3" Width="Auto" x:Name="locodeControl_NextPort" LocodeValue="{Binding NextPort, Mode=TwoWay}"/>
@@ -55,8 +55,8 @@
                         <enictrl:ENIDataGrid x:Name="dataGridCallPurposes" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
                             <DataGrid.Columns>
-                                <DataGridTextColumn Header="Code" Binding="{Binding CallPurposeCode}" IsReadOnly="True" />
-                                <DataGridTextColumn Header="Description" Binding="{Binding CallPurposeDescription}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="Code" Binding="{Binding CallPurposeCode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                                <DataGridTextColumn Header="Description" Binding="{Binding CallPurposeDescription, Mode=TwoWay}" IsReadOnly="True" Width="0.9*" />
                             </DataGrid.Columns>
                         </enictrl:ENIDataGrid>
                     </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
index 3b6e15c4..84d1f3b0 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
@@ -90,29 +90,40 @@ namespace ENI2.DetailViewControls
 
         private void DataGridCallPurposes_DeleteRequested(DatabaseEntity obj)
         {
-         //   throw new NotImplementedException();
+            CallPurpose cp = obj as CallPurpose;
+            if (cp != null)
+            {
+                // are you sure dialog is in base class
+                _noa_nod.CallPurposes.Remove(cp);
+                // DBManager.Instance.Delete(cp); // not yet
+                this.dataGridCallPurposes.Items.Refresh();
+            }
         }
 
         private void DataGridCallPurposes_CreateRequested()
         {
-            //throw new NotImplementedException();
+            CallPurpose cp = new CallPurpose();
+            EditCallPurposeDialog ecpd = new EditCallPurposeDialog();
+            ecpd.CallPurpose = cp;
+            if(ecpd.ShowDialog() ?? false)
+            {
+                _noa_nod.CallPurposes.Add(cp);
+                this.dataGridCallPurposes.Items.Refresh();
+            }
         }
 
         private void DataGridCallPurposes_AddingNewItem(object sender, AddingNewItemEventArgs e)
         {
-            //throw new NotImplementedException();
+            this.DataGridCallPurposes_CreateRequested();
         }
 
         private void DataGridCallPurposes_EditRequested(DatabaseEntity obj)
         {
             EditCallPurposeDialog ecpd = new EditCallPurposeDialog();
+            ecpd.CallPurpose = obj as CallPurpose;
             if(ecpd.ShowDialog() ?? false)
             {
-                // Edit successful
-            }
-            else
-            {
-                // cancelled out..
+                this.dataGridCallPurposes.Items.Refresh();
             }
         }
     }
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index d9a09cb3..e63b8986 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -35,7 +35,7 @@
     <MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>6</ApplicationRevision>
+    <ApplicationRevision>7</ApplicationRevision>
     <ApplicationVersion>3.5.6.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -333,6 +333,9 @@
     <Content Include="x86\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="Properties\Resources.de.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <Resource Include="Resources\printer.png" />
     <Resource Include="Resources\floppy_disk_blue.png" />
     <Resource Include="Resources\document_plain.png" />
@@ -340,8 +343,9 @@
     <Resource Include="Resources\delete.png" />
     <Resource Include="Resources\add.png" />
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <Content Include="..\..\..\nsw\Source\misc\db.sqlite">
       <Link>db.sqlite</Link>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml
index 7f18ce7a..d4758a9b 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml
@@ -18,7 +18,7 @@
         </Grid.ColumnDefinitions>
         <Label Grid.Row="0" Grid.Column="0" Content="Code" />
         <Label Grid.Row="1" Grid.Column="0" Content="Description" />
-        <ComboBox Grid.Row="0" Grid.Column="1" Width="auto" Name="comboBoxCode" Margin="2" TextBlock.TextAlignment="Center"/>
+        <ComboBox Grid.Row="0" Grid.Column="1" Width="auto" Name="comboBoxCode" Margin="2" TextBlock.TextAlignment="Center" SelectionChanged="comboBoxCode_Selected"/>
         <TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxDescription" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="100" />
 
     </Grid>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml.cs
index 07d99b0c..c8a6276d 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml.cs
@@ -13,6 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
 using ENI2.Controls;
+using bsmd.database;
 
 namespace ENI2.EditControls
 {
@@ -20,10 +21,84 @@ namespace ENI2.EditControls
     /// Interaction logic for EditCallPurposeDialog.xaml
     /// </summary>
     public partial class EditCallPurposeDialog : EditWindowBase
-    {
+    {        
+
+        private static string[] edifact8025Codes =
+        {
+            "",
+            "Cargo operations",
+            "Passenger movement",
+            "Taking bunkers",
+            "Changing crew",
+            "Goodwill visit",
+            "Taking supplies",
+            "Repair",
+            "Laid-up",
+            "Awaiting orders",
+            "Miscellaneous",
+            "Crew movement",
+            "Cruise, leisure and recreation",
+            "Under government order",
+            "Quarantine inspection",
+            "Refuge",
+            "Unloading cargo",
+            "Loading cargo",
+            "Repair in dry dock",
+            "Repair in wet dock",
+            "Cargo tank cleaning",
+            "Means of transport customs clearance",
+            "De-gassing",
+            "Waste disposal"
+        };
+
+        private List<string> itemList = null;
+
         public EditCallPurposeDialog()
         {
             InitializeComponent();
+
+            Loaded += EditCallPurposeDialog_Loaded;
+
+        }
+
+        public CallPurpose CallPurpose { get; set; }        
+
+        public List<string> EdiCodes
+        {
+            get
+            {
+                if(itemList == null)
+                {
+                    this.itemList = new List<string>();
+                    for (int i = 0; i < edifact8025Codes.Length; i++)
+                        this.itemList.Add(string.Format("{0} - {1}", i, edifact8025Codes[i]));
+                }
+                return itemList;
+            }
+        }
+
+        private void EditCallPurposeDialog_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.OKClicked += EditCallPurposeDialog_OKClicked;
+
+            this.comboBoxCode.ItemsSource = this.EdiCodes;
+            if(this.CallPurpose != null)
+            {
+                this.comboBoxCode.SelectedIndex = this.CallPurpose.CallPurposeCode;
+                this.textBoxDescription.Text = this.CallPurpose.CallPurposeDescription;
+            }
+        }
+
+        private void EditCallPurposeDialog_OKClicked()
+        {
+            // copy selected values back into entity
+            this.CallPurpose.CallPurposeCode = this.comboBoxCode.SelectedIndex;
+            this.CallPurpose.CallPurposeDescription = this.textBoxDescription.Text;
+        }
+
+        private void comboBoxCode_Selected(object sender, RoutedEventArgs e)
+        {
+            this.textBoxDescription.Text = edifact8025Codes[this.comboBoxCode.SelectedIndex];
         }
     }
 }
diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml b/ENI-2/ENI2/ENI2/MainWindow.xaml
index cb39e3e1..24e9b168 100644
--- a/ENI-2/ENI2/ENI2/MainWindow.xaml
+++ b/ENI-2/ENI2/ENI2/MainWindow.xaml
@@ -3,16 +3,18 @@
         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:ENI2.Properties"
         xmlns:local="clr-namespace:ENI2"
         mc:Ignorable="d"
         Title="ENI 2" Height="350" Width="525" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" 
         SourceInitialized="Window_SourceInitialized">
+
     <DockPanel>
         <Grid DockPanel.Dock="Top" Height="80" Background="#FFE8F6FF">
             <Image x:Name="logoImage" HorizontalAlignment="Left" Height="80" Width="80" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp"/>
-            <Button x:Name="buttonAnmeldungen" Content="Declarations" HorizontalAlignment="Left" Margin="101,25,0,0" VerticalAlignment="Top" Width="95" Height="23" Click="buttonAnmeldungen_Click" Background="Transparent" />
-            <Button x:Name="buttonVorgaenge" Content="Operations" HorizontalAlignment="Left" Margin="201,25,0,0" VerticalAlignment="Top" Width="95" Height="23" Click="buttonVorgaenge_Click" Background="Transparent" />
-            <Button x:Name="buttonSuche" Content="Search    " HorizontalAlignment="Left" Margin="301,25,0,0" VerticalAlignment="Top" Width="95" Height="23" Click="buttonSuche_Click" Background="Transparent" />
+            <Button x:Name="buttonAnmeldungen" Content="{x:Static p:Resources.textDeclarations}" HorizontalAlignment="Left" Margin="101,25,0,0" VerticalAlignment="Top" Width="95" Height="23" Click="buttonAnmeldungen_Click" Background="Transparent" />
+            <Button x:Name="buttonVorgaenge" Content="{x:Static p:Resources.textOperations}" HorizontalAlignment="Left" Margin="201,25,0,0" VerticalAlignment="Top" Width="95" Height="23" Click="buttonVorgaenge_Click" Background="Transparent" />
+            <Button x:Name="buttonSuche" Content="{x:Static p:Resources.textSearch}" HorizontalAlignment="Left" Margin="301,25,0,0" VerticalAlignment="Top" Width="95" Height="23" Click="buttonSuche_Click" Background="Transparent" />
         </Grid>
 
         <Grid DockPanel.Dock="Bottom" Height="20" Background="#FFE8F6FF">
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
index a1d8ec17..1d28156e 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
@@ -22,7 +22,7 @@ namespace ENI2.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ namespace ENI2.Properties {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ENI2.Properties.Resources", typeof(Resources).Assembly);
@@ -51,7 +51,7 @@ namespace ENI2.Properties {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -63,7 +63,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap add {
+        public static System.Drawing.Bitmap add {
             get {
                 object obj = ResourceManager.GetObject("add", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -73,7 +73,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap alarmclock {
+        public static System.Drawing.Bitmap alarmclock {
             get {
                 object obj = ResourceManager.GetObject("alarmclock", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -83,7 +83,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap anchor {
+        public static System.Drawing.Bitmap anchor {
             get {
                 object obj = ResourceManager.GetObject("anchor", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -93,7 +93,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap arrow_down_right_red {
+        public static System.Drawing.Bitmap arrow_down_right_red {
             get {
                 object obj = ResourceManager.GetObject("arrow_down_right_red", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -103,7 +103,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap arrow_up_right_green {
+        public static System.Drawing.Bitmap arrow_up_right_green {
             get {
                 object obj = ResourceManager.GetObject("arrow_up_right_green", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -113,7 +113,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap bullet_ball_green {
+        public static System.Drawing.Bitmap bullet_ball_green {
             get {
                 object obj = ResourceManager.GetObject("bullet_ball_green", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -123,7 +123,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap bullet_ball_grey {
+        public static System.Drawing.Bitmap bullet_ball_grey {
             get {
                 object obj = ResourceManager.GetObject("bullet_ball_grey", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -133,7 +133,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap bullet_ball_red {
+        public static System.Drawing.Bitmap bullet_ball_red {
             get {
                 object obj = ResourceManager.GetObject("bullet_ball_red", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -143,7 +143,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap bullet_ball_yellow {
+        public static System.Drawing.Bitmap bullet_ball_yellow {
             get {
                 object obj = ResourceManager.GetObject("bullet_ball_yellow", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -153,7 +153,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon containership {
+        public static System.Drawing.Icon containership {
             get {
                 object obj = ResourceManager.GetObject("containership", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
@@ -163,7 +163,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap containership1 {
+        public static System.Drawing.Bitmap containership1 {
             get {
                 object obj = ResourceManager.GetObject("containership1", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -173,7 +173,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap delete {
+        public static System.Drawing.Bitmap delete {
             get {
                 object obj = ResourceManager.GetObject("delete", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -183,7 +183,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap document_plain {
+        public static System.Drawing.Bitmap document_plain {
             get {
                 object obj = ResourceManager.GetObject("document_plain", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -193,7 +193,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap documents {
+        public static System.Drawing.Bitmap documents {
             get {
                 object obj = ResourceManager.GetObject("documents", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -203,7 +203,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap edit {
+        public static System.Drawing.Bitmap edit {
             get {
                 object obj = ResourceManager.GetObject("edit", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -213,7 +213,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap ef_logo {
+        public static System.Drawing.Bitmap ef_logo {
             get {
                 object obj = ResourceManager.GetObject("ef_logo", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -223,7 +223,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap EUREPORT {
+        public static System.Drawing.Bitmap EUREPORT {
             get {
                 object obj = ResourceManager.GetObject("EUREPORT", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -233,7 +233,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap eye_blue {
+        public static System.Drawing.Bitmap eye_blue {
             get {
                 object obj = ResourceManager.GetObject("eye_blue", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -243,7 +243,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap floppy_disk_blue {
+        public static System.Drawing.Bitmap floppy_disk_blue {
             get {
                 object obj = ResourceManager.GetObject("floppy_disk_blue", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -253,7 +253,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap garbage {
+        public static System.Drawing.Bitmap garbage {
             get {
                 object obj = ResourceManager.GetObject("garbage", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -263,7 +263,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon logo_schwarz {
+        public static System.Drawing.Icon logo_schwarz {
             get {
                 object obj = ResourceManager.GetObject("logo_schwarz", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
@@ -273,7 +273,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap medical_bag {
+        public static System.Drawing.Bitmap medical_bag {
             get {
                 object obj = ResourceManager.GetObject("medical_bag", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -283,7 +283,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap policeman_german {
+        public static System.Drawing.Bitmap policeman_german {
             get {
                 object obj = ResourceManager.GetObject("policeman_german", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -293,7 +293,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap printer {
+        public static System.Drawing.Bitmap printer {
             get {
                 object obj = ResourceManager.GetObject("printer", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -303,7 +303,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap shield_yellow {
+        public static System.Drawing.Bitmap shield_yellow {
             get {
                 object obj = ResourceManager.GetObject("shield_yellow", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -313,7 +313,7 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap ship2 {
+        public static System.Drawing.Bitmap ship2 {
             get {
                 object obj = ResourceManager.GetObject("ship2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -323,11 +323,56 @@ namespace ENI2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap sign_warning_radiation {
+        public static System.Drawing.Bitmap sign_warning_radiation {
             get {
                 object obj = ResourceManager.GetObject("sign_warning_radiation", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Are you sure?.
+        /// </summary>
+        public static string textAreYouSure {
+            get {
+                return ResourceManager.GetString("textAreYouSure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Confirm deletion.
+        /// </summary>
+        public static string textCaptionDeleteConfirm {
+            get {
+                return ResourceManager.GetString("textCaptionDeleteConfirm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Declarations.
+        /// </summary>
+        public static string textDeclarations {
+            get {
+                return ResourceManager.GetString("textDeclarations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Operations.
+        /// </summary>
+        public static string textOperations {
+            get {
+                return ResourceManager.GetString("textOperations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Search.
+        /// </summary>
+        public static string textSearch {
+            get {
+                return ResourceManager.GetString("textSearch", resourceCulture);
+            }
+        }
     }
 }
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.de.resx b/ENI-2/ENI2/ENI2/Properties/Resources.de.resx
new file mode 100644
index 00000000..a4cb1961
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.de.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="textDeclarations" xml:space="preserve">
+    <value>Anmeldungen</value>
+  </data>
+  <data name="textOperations" xml:space="preserve">
+    <value>Vorgänge</value>
+  </data>
+  <data name="textSearch" xml:space="preserve">
+    <value>Suche</value>
+  </data>
+  <data name="textAreYouSure" xml:space="preserve">
+    <value>Sind Sie sicher?</value>
+  </data>
+  <data name="textCaptionDeleteConfirm" xml:space="preserve">
+    <value>Löschen bestätigen</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.resx b/ENI-2/ENI2/ENI2/Properties/Resources.resx
index fe4073aa..a7784746 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.resx
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.resx
@@ -199,4 +199,19 @@
   <data name="printer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="textDeclarations" xml:space="preserve">
+    <value>Declarations</value>
+  </data>
+  <data name="textOperations" xml:space="preserve">
+    <value>Operations</value>
+  </data>
+  <data name="textSearch" xml:space="preserve">
+    <value>Search</value>
+  </data>
+  <data name="textAreYouSure" xml:space="preserve">
+    <value>Are you sure?</value>
+  </data>
+  <data name="textCaptionDeleteConfirm" xml:space="preserve">
+    <value>Confirm deletion</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml b/ENI-2/ENI2/ENI2/SucheControl.xaml
index fdaa3b98..01819373 100644
--- a/ENI-2/ENI2/ENI2/SucheControl.xaml
+++ b/ENI-2/ENI2/ENI2/SucheControl.xaml
@@ -67,7 +67,7 @@
                 <DataGridTextColumn Header="Hafen" Binding="{Binding Portname}" IsReadOnly="True" />
                 <DataGridTextColumn Header="Id" Binding="{Binding DisplayId}" IsReadOnly="True" />
                 <DataGridTextColumn Header="Status" Binding="{Binding BSMDStatusInternal}" IsReadOnly="True" />
-                <DataGridTextColumn Header="Edited by" Binding="{Binding EditedBy}" IsReadOnly="True" />
+                <DataGridTextColumn Header="Edited by" Binding="{Binding EditedBy}" IsReadOnly="True" Width="*" />
 
             </DataGrid.Columns>
         </DataGrid>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index b46fc104..caf852d3 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/CallPurpose.cs b/nsw/Source/bsmd.database/CallPurpose.cs
index c52d84a0..f0ca6e5e 100644
--- a/nsw/Source/bsmd.database/CallPurpose.cs
+++ b/nsw/Source/bsmd.database/CallPurpose.cs
@@ -100,5 +100,14 @@ namespace bsmd.database
 
         #endregion
 
+        #region public overrides
+
+        public override string ToString()
+        {
+            return string.Format("{0} - {1}", this.CallPurposeCode, this.CallPurposeDescription ?? "");
+        }
+
+        #endregion
+
     }
 }