diff --git a/BeWo/View/Detail/OrganisationView.xaml b/BeWo/View/Detail/OrganisationView.xaml
index 888197a1d..bc1ab6704 100644
--- a/BeWo/View/Detail/OrganisationView.xaml
+++ b/BeWo/View/Detail/OrganisationView.xaml
@@ -599,12 +599,13 @@
                                                     Leistungserbringergruppe
                                                 </Label>
                                                 <Button
+                                                    x:Name="btn_ik"
                                                     Grid.Row="2"
                                                     Grid.Column="1"
-                                                        IsEnabled="{Binding IsIKNumberValid}"
-                                                        Click="IKNumber_Button_Click"
-                                                        Style="{StaticResource PrimaryButtonSmall}"
-                                                        Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    Click="IKNumber_Button_Click"
+                                                    IsEnabled="{Binding IsIKNumberValid}"
+                                                    Style="{StaticResource PrimaryButtonSmall}"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
                                                     Weitere IK's ermitteln
                                                 </Button>
                                                 <TextBox
@@ -654,10 +655,8 @@
                                                 <CheckBox
                                                     Grid.Row="6"
                                                     Grid.Column="1"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" 
-                                                    IsChecked="{Binding Echtverfahren}">
-                                                    
-                                                </CheckBox>
+                                                    IsChecked="{Binding Echtverfahren}"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
                                                 <Label
                                                     x:Name="label_verfahrensstufe"
                                                     Grid.Row="7"
@@ -679,9 +678,10 @@
                                             </Grid>
                                         </GroupBox>
                                         <GroupBox
-                                            Grid.Row="3" Grid.ColumnSpan="4"
-                                            Header="Notizen"
+                                            Grid.Row="3"
+                                            Grid.ColumnSpan="4"
                                             Margin="0,8,0,0"
+                                            Header="Notizen"
                                             Style="{StaticResource ObjectEditGroupBox}">
                                             <TextBox
                                                 Grid.Row="2"
@@ -1165,18 +1165,27 @@
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <ResourceDictionary>
+                                <ResourceDictionary.MergedDictionaries>
+                                    <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
+                                </ResourceDictionary.MergedDictionaries>
+                            </ResourceDictionary>
+                        </StackPanel.Resources>
                         <Button
                             x:Name="btnSave"
                             Height="25"
                             Margin="0,0,2,0"
                             Command="ApplicationCommands.Save"
-                            Content="Speichern" />
+                            Content="Speichern"
+                            Style="{StaticResource PrimaryButton}" />
                         <Button
                             x:Name="btnClose"
                             Height="25"
                             Margin="0,0,3,0"
                             Command="ApplicationCommands.Close"
-                            Content="Schließen" />
+                            Content="Schließen"
+                            Style="{StaticResource PrimaryButton}" />
                     </StackPanel>
                 </Grid>
             </GroupBox>
diff --git a/BeWo/View/Detail/OrganisationView.xaml.cs b/BeWo/View/Detail/OrganisationView.xaml.cs
index 07eca4ed7..1369a59a0 100644
--- a/BeWo/View/Detail/OrganisationView.xaml.cs
+++ b/BeWo/View/Detail/OrganisationView.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Navigation;
 
 using BeWo.Core;
@@ -61,9 +62,7 @@ namespace BeWo.View.Detail
 				tabitem_documents.Visibility = Visibility.Collapsed;
 			}
 
-#if DEBUG
-            
-#else
+#if !DEBUG
             label_verfahrensstufe.Visibility = Visibility.Collapsed;
             radiobuttons_verfahrensstufe.Visibility = Visibility.Collapsed;
 #endif
@@ -336,6 +335,8 @@ namespace BeWo.View.Detail
             ViewModel.BezDatenannahmestelle = response.BezDatenannahmestelle;
             ViewModel.IKKostentrager = response.IKKostentrager;
             ViewModel.IKDatenannahmestelle = response.IKDatenannahmestelle;
-		}
+
+            CommandManager.InvalidateRequerySuggested();
+        }
 	}
 }
\ No newline at end of file
diff --git a/BeWo/View/Master/FinanceView.xaml.cs b/BeWo/View/Master/FinanceView.xaml.cs
index a57851c3b..e27a797e4 100644
--- a/BeWo/View/Master/FinanceView.xaml.cs
+++ b/BeWo/View/Master/FinanceView.xaml.cs
@@ -96,6 +96,9 @@ namespace BeWo.View.Master
             pTabItem.Content = pView;
         }
 
+        private void RemoveView(TabItem pTabItem)
+            => AddView(pTabItem, null);
+
         private void InitRights()
         {
             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.AccountingTransactionView_View))