diff --git a/BeWo/Styles/ControlStyles/DateEditStyles.xaml b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
index be8854fb6..9a7c7a5c7 100644
--- a/BeWo/Styles/ControlStyles/DateEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
@@ -39,4 +39,36 @@
             </DataTemplate>
         </Style.Resources>
     </Style>
+    <Style
+        x:Key="DateEditDateOnly"
+        BasedOn="{StaticResource PrimaryDateEdit}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="MaskType" Value="DateOnlyAdvancingCaret" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="true" />
+    </Style>
+    <Style
+        x:Key="DateEditDateOnlyShort"
+        BasedOn="{StaticResource DateEditDateOnly}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Mask" Value="d" />
+    </Style>
+    <Style
+        x:Key="DateEditDateOnlyLong"
+        BasedOn="{StaticResource DateEditDateOnly}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Mask" Value="D" />
+    </Style>
+    <Style
+        x:Key="DateEditDateTime"
+        BasedOn="{StaticResource PrimaryDateEdit}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="MaskType" Value="DateTimeAdvancingCaret" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="true" />
+    </Style>
+    <Style
+        x:Key="DateEditDateTimeShort"
+        BasedOn="{StaticResource DateEditDateTime}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Mask" Value="F" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextBoxStyles.xaml b/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
index bf44be0ae..65b641174 100644
--- a/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
+++ b/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
@@ -22,11 +22,14 @@
         BasedOn="{StaticResource TextBoxNoticeBase}"
         TargetType="{x:Type TextBox}">
         <Setter Property="MaxHeight" Value="150" />
+        <Setter Property="Height" Value="auto" />
     </Style>
     <Style
         x:Key="TextBoxNoticeLarge"
         BasedOn="{StaticResource TextBoxNoticeBase}"
         TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="58" />
+        <Setter Property="Height" Value="auto" />
         <Setter Property="MaxHeight" Value="300" />
     </Style>
     <Style
diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
index 46f4b48fd..f6c7d656b 100644
--- a/BeWo/Styles/ControlStyles/TextEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
@@ -9,14 +9,6 @@
         <Setter Property="Margin" Value="3" />
         <Setter Property="Height" Value="23" />
     </Style>
-    <Style
-        x:Key="BaseNumberTextEdit"
-        BasedOn="{StaticResource BaseTextEdit}"
-        TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
-        <Setter Property="Mask" Value="N0" />
-    </Style>
     <Style
         x:Key="BaseNumberMaskTextEdit"
         BasedOn="{StaticResource BaseTextEdit}"
@@ -26,6 +18,12 @@
     </Style>
 
     <!--  Special  -->
+    <Style
+        x:Key="TextEditNumber"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="N0" />
+    </Style>
     <Style
         x:Key="TextEditYear"
         BasedOn="{StaticResource BaseNumberMaskTextEdit}"
diff --git a/BeWo/View/BeWoWindowBuilder.cs b/BeWo/View/BeWoWindowBuilder.cs
index 230f13e79..c9ba3016c 100644
--- a/BeWo/View/BeWoWindowBuilder.cs
+++ b/BeWo/View/BeWoWindowBuilder.cs
@@ -37,7 +37,7 @@ namespace BeWo.View
             return beWoWindow;
         }
 
-        public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 800, double width = 900)
+        public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 600, double width = 900)
         {
             var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 400, width, 1600);
 
diff --git a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
index d5ca16487..b7fed8184 100644
--- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
+++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
@@ -11,6 +11,13 @@
     xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
     d:DataContext="{d:DesignInstance Type=viewmodel:GkvAbrechnungVM}"
     mc:Ignorable="d">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
@@ -22,7 +29,7 @@
             <TabItem Header="Allgemein">
                 <Grid
                     MaxWidth="700"
-                    Margin="0"
+                    Margin="3,0,3,10"
                     HorizontalAlignment="Stretch"
                     Background="#eeeeee">
                     <Grid.ColumnDefinitions>
@@ -40,279 +47,284 @@
                         <RowDefinition Height="auto" />
                         <RowDefinition Height="auto" />
                         <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
                     <Label
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="3"
                         Content="GKV-Abrechnung Nr.:" />
-                    <TextBox
+                    <dxe:TextEdit
                         Grid.Row="0"
                         Grid.Column="2"
-                        Margin="3"
                         IsEnabled="False"
+                        Style="{StaticResource TextEditNumber}"
                         Text="{Binding GkvAbrechnungOid}" />
                     <Label
-                        Grid.Row="5"
+                        Grid.Row="1"
                         Grid.Column="0"
-                        Margin="3"
                         Content="Abrechnungsbeginn:" />
-                    <TextBox
-                        Grid.Row="5"
+                    <dxe:DateEdit
+                        Grid.Row="1"
                         Grid.Column="2"
-                        Margin="3"
+                        EditValue="{Binding AbrechnungsZeitraumStart}"
                         IsEnabled="False"
-                        Text="{Binding AbrechnungsZeitraumStart}" />
+                        Style="{StaticResource DateEditDateOnlyShort}" />
                     <Label
-                        Grid.Row="6"
+                        Grid.Row="2"
                         Grid.Column="0"
-                        Margin="3"
                         Content="Abrechnungsende:" />
-                    <TextBox
-                        Grid.Row="6"
+                    <dxe:DateEdit
+                        Grid.Row="2"
                         Grid.Column="2"
-                        Margin="3"
+                        EditValue="{Binding AbrechnungsZeitraumEnde}"
                         IsEnabled="False"
-                        Text="{Binding AbrechnungsZeitraumEnde}" />
+                        Style="{StaticResource DateEditDateOnlyShort}" />
                     <Label
-                        Grid.Row="9"
+                        Grid.Row="3"
                         Grid.Column="0"
-                        Margin="3"
                         Content="Erstellt am:" />
-                    <TextBox
-                        Grid.Row="9"
+                    <dxe:DateEdit
+                        Grid.Row="3"
                         Grid.Column="2"
-                        Margin="3"
+                        EditValue="{Binding ErstelltAm}"
                         IsEnabled="False"
-                        Text="{Binding ErstelltAm}" />
+                        Style="{StaticResource DateEditDateTimeShort}" />
                     <Label
-                        Grid.Row="10"
+                        Grid.Row="4"
                         Grid.Column="0"
-                        Margin="3"
                         Content="Verfahrensstufe:" />
 
                     <StackPanel
-                        Grid.Row="10"
+                        Grid.Row="4"
                         Grid.Column="2"
-                        Margin="3"
                         IsEnabled="False"
                         Orientation="Horizontal">
-                        <RadioButton
-                            Margin="3"
-                            GroupName="a"
-                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=0}">
+                        <RadioButton GroupName="a" IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=0}">
                             Test
                         </RadioButton>
-                        <RadioButton
-                            Margin="3"
-                            GroupName="a"
-                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=1}">
+                        <RadioButton GroupName="a" IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=1}">
                             Erprobung
                         </RadioButton>
-                        <RadioButton
-                            Margin="3"
-                            GroupName="a"
-                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=2}">
+                        <RadioButton GroupName="a" IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=2}">
                             Echt
                         </RadioButton>
                     </StackPanel>
 
                     <Label
-                        Grid.Row="13"
+                        Grid.Row="5"
                         Grid.Column="0"
-                        Margin="3"
                         Content="Urbelege Gesendet:" />
                     <CheckBox
                         x:Name="Checkbox_Urbelege"
-                        Grid.Row="13"
+                        Grid.Row="5"
                         Grid.Column="2"
-                        Margin="3"
                         HorizontalAlignment="Left"
                         IsChecked="{Binding UrbelegeGesendet}"
-                        IsEnabled="{Binding IsUrbelegeEditEnabled}"/>
+                        IsEnabled="{Binding IsUrbelegeEditEnabled}" />
                     <Label
-                        Grid.Row="14"
+                        Grid.Row="6"
                         Grid.Column="0"
                         Margin="3"
                         Content="Bezahlt:" />
                     <CheckBox
                         x:Name="Checkbox_Bezahlt"
-                        Grid.Row="14"
+                        Grid.Row="6"
                         Grid.Column="2"
-                        Margin="3"
                         HorizontalAlignment="Left"
                         IsChecked="{Binding Bezahlt}"
-                        IsEnabled="{Binding IsBezahltEditEnabled}"/>
+                        IsEnabled="{Binding IsBezahltEditEnabled}" />
                     <Label
-                        Grid.Row="15"
+                        Grid.Row="7"
                         Grid.Column="0"
-                        Margin="3"
                         Content="Betrag:" />
-                    <TextBox
-                        Grid.Row="15"
+                    <dxe:TextEdit
+                        Grid.Row="7"
                         Grid.Column="2"
-                        Margin="3"
+                        EditValue="{Binding Betrag}"
                         IsEnabled="False"
-                        Text="{Binding Betrag, StringFormat={}{0:0.00 €}}" />
+                        Style="{StaticResource TextEditCurrency}" />
                     <!--<TextBox    Grid.Row="15" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding Bezahlt}"/>-->
                     <Label
-                        Grid.Row="16"
+                        Grid.Row="8"
                         Grid.Column="0"
-                        Margin="3"
                         Content="Bemerkung:" />
                     <TextBox
-                        x:Name="Textbox_Notice"
-                        Grid.Row="16"
+                        x:Name="txt_Notice"
+                        Grid.Row="8"
                         Grid.Column="2"
-                        Margin="3"
-                        AcceptsReturn="True"
-                        HorizontalScrollBarVisibility="Disabled"
                         MaxLength="1024"
+                        Style="{StaticResource TextBoxNoticeLarge}"
                         Text="{Binding Notice}"
-                        TextWrapping="Wrap"
-                        VerticalScrollBarVisibility="Auto" />
+                        TextWrapping="Wrap" />
                 </Grid>
             </TabItem>
             <TabItem x:Name="tabitem_rechnungen" Header="Enthaltene Rechnungen">
-                <dxg:GridControl
-                    x:Name="datagrid_invoices"
-                    Margin="3"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    DataSource="{Binding InvoiceBases2}">
-                    <dxg:GridControl.Columns>
-                        <dxg:GridColumn
-                            x:Name="ColumnChecked"
-                            MinWidth="30"
-                            FieldName="IsChecked"
-                            Header=" " />
-                        <dxg:GridColumn
-                            x:Name="ColumnButtons"
-                            AllowEditing="False"
-                            FieldName="ReportLink"
-                            Header=" ">
-                            <dxg:GridColumn.DisplayTemplate>
-                                <ControlTemplate>
-                                    <StackPanel Orientation="Horizontal">
-                                        <Button
-                                            x:Name="btn_report"
-                                            Width="20"
-                                            Height="20"
-                                            Margin="1"
-                                            VerticalAlignment="Center"
-                                            ToolTip="Formular anzeigen">
-                                            <TextBlock Padding="0">
-                                                <Hyperlink
-                                                    NavigateUri="{Binding DisplayText, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                                    RequestNavigate="Hyperlink_OnRequestNavigate"
-                                                    TextDecorations="None"
-                                                    TargetName="_NewWindow">
-                                                    <TextBlock
-                                                        Width="16"
-                                                        Height="17"
-                                                        Padding="0"
-                                                        HorizontalAlignment="Left"
-                                                        VerticalAlignment="Center"
-                                                        FontFamily="Webdings"
-                                                        FontSize="15"
-                                                        Foreground="#FFFFFF"
-                                                        Text="Â¥" />
-                                                </Hyperlink>
-                                            </TextBlock>
-                                        </Button>
-                                    </StackPanel>
-                                </ControlTemplate>
-                            </dxg:GridColumn.DisplayTemplate>
-                        </dxg:GridColumn>
-                        <dxg:GridColumn
-                            Width="150"
-                            AllowEditing="False"
-                            FieldName="TypeString"
-                            Header="Art der Rechnung"
-                            ReadOnly="True" />
-                        <dxg:GridColumn
-                            Width="100"
-                            AllowEditing="False"
-                            FieldName="CustomerName"
-                            Header="{markup:Translate Klient/in}"
-                            ReadOnly="True" />
-                        <dxg:GridColumn
-                            Width="100"
-                            AllowEditing="False"
-                            FieldName="AccountingPeriodString"
-                            Header="Zeitraum"
-                            ReadOnly="True"
-                            SortFieldName="AccountingPeriodStart" />
-                        <dxg:GridColumn
-                            AllowEditing="False"
-                            FieldName="InvoiceNumber"
-                            Header="Nummer"
-                            ReadOnly="True" />
-                        <dxg:GridColumn
-                            MinWidth="70"
-                            AllowEditing="False"
-                            EditSettings="{dxe:DateSettings DisplayFormat=d}"
-                            FieldName="InvoiceDate"
-                            Header="Datum"
-                            ReadOnly="True" />
-                        <dxg:GridColumn
-                            AllowEditing="False"
-                            FieldName="RecipientString"
-                            Header="{markup:Translate EmpfängerSingular}"
-                            ReadOnly="True" />
-                        <!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />-->
-                        <dxg:GridColumn
-                            MinWidth="70"
-                            AllowEditing="False"
-                            FieldName="TotalAmount"
-                            Header="Betrag"
-                            ReadOnly="True">
-                            <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings
-                                    DisplayFormat="c"
-                                    Mask="c"
-                                    MaskType="Numeric" />
-                            </dxg:GridColumn.EditSettings>
-                        </dxg:GridColumn>
-                        <dxg:GridColumn
-                            MinWidth="200"
-                            AllowEditing="False"
-                            FieldName="Notice"
-                            Header="Bemerkung"
-                            ReadOnly="True" />
-                        <dxg:GridColumn
-                            x:Name="PaidColumn"
-                            AllowEditing="False"
-                            FieldName="IsPaid"
-                            Header="Bezahlt"
-                            IsEnabledBinding="{Binding Source=false}" />
-                    </dxg:GridControl.Columns>
-                    <dxg:GridControl.View>
-                        <dxg:TableView
-                            x:Name="gridView"
-                            Margin="3,22,3,3"
-                            AllowBestFit="True"
-                            BestFitMode="Smart"
-                            Loaded="gridView_Loaded"
-                            NavigationStyle="Cell"
-                            ScrollingMode="Smart"
-                            ShowGroupPanel="False"
-                            SnapsToDevicePixels="True" />
-                    </dxg:GridControl.View>
-                </dxg:GridControl>
+                <Grid Margin="0,0,0,3">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="auto" />
+                    </Grid.RowDefinitions>
+                    <dxg:GridControl
+                        x:Name="datagrid_invoices"
+                        Margin="0,0,0,3"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        DataSource="{Binding InvoiceBases2}">
+                        <dxg:GridControl.Columns>
+                            <dxg:GridColumn
+                                x:Name="ColumnChecked"
+                                MinWidth="30"
+                                FieldName="IsChecked"
+                                Header=" " />
+                            <dxg:GridColumn
+                                x:Name="ColumnButtons"
+                                AllowEditing="False"
+                                FieldName="ReportLink"
+                                Header=" ">
+                                <dxg:GridColumn.DisplayTemplate>
+                                    <ControlTemplate>
+                                        <StackPanel Orientation="Horizontal">
+                                            <Button
+                                                x:Name="btn_report"
+                                                Width="20"
+                                                Height="20"
+                                                Margin="1"
+                                                VerticalAlignment="Center"
+                                                ToolTip="Formular anzeigen">
+                                                <TextBlock Padding="0">
+                                                    <Hyperlink
+                                                        NavigateUri="{Binding DisplayText, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                        RequestNavigate="Hyperlink_OnRequestNavigate"
+                                                        TextDecorations="None"
+                                                        TargetName="_NewWindow">
+                                                        <TextBlock
+                                                            Width="16"
+                                                            Height="17"
+                                                            Padding="0"
+                                                            HorizontalAlignment="Left"
+                                                            VerticalAlignment="Center"
+                                                            FontFamily="Webdings"
+                                                            FontSize="15"
+                                                            Foreground="#FFFFFF"
+                                                            Text="Â¥" />
+                                                    </Hyperlink>
+                                                </TextBlock>
+                                            </Button>
+                                        </StackPanel>
+                                    </ControlTemplate>
+                                </dxg:GridColumn.DisplayTemplate>
+                            </dxg:GridColumn>
+                            <dxg:GridColumn
+                                Width="150"
+                                AllowEditing="False"
+                                FieldName="TypeString"
+                                Header="Art der Rechnung"
+                                ReadOnly="True" />
+                            <dxg:GridColumn
+                                Width="100"
+                                AllowEditing="False"
+                                FieldName="CustomerName"
+                                Header="{markup:Translate Klient/in}"
+                                ReadOnly="True" />
+                            <dxg:GridColumn
+                                Width="100"
+                                AllowEditing="False"
+                                FieldName="AccountingPeriodString"
+                                Header="Zeitraum"
+                                ReadOnly="True"
+                                SortFieldName="AccountingPeriodStart" />
+                            <dxg:GridColumn
+                                AllowEditing="False"
+                                FieldName="InvoiceNumber"
+                                Header="Nummer"
+                                ReadOnly="True" />
+                            <dxg:GridColumn
+                                MinWidth="70"
+                                AllowEditing="False"
+                                EditSettings="{dxe:DateSettings DisplayFormat=d}"
+                                FieldName="InvoiceDate"
+                                Header="Datum"
+                                ReadOnly="True" />
+                            <dxg:GridColumn
+                                AllowEditing="False"
+                                FieldName="RecipientString"
+                                Header="{markup:Translate EmpfängerSingular}"
+                                ReadOnly="True" />
+                            <!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />-->
+                            <dxg:GridColumn
+                                MinWidth="70"
+                                AllowEditing="False"
+                                FieldName="TotalAmount"
+                                Header="Betrag"
+                                ReadOnly="True">
+                                <dxg:GridColumn.EditSettings>
+                                    <dxe:TextEditSettings
+                                        DisplayFormat="c"
+                                        Mask="c"
+                                        MaskType="Numeric" />
+                                </dxg:GridColumn.EditSettings>
+                            </dxg:GridColumn>
+                            <dxg:GridColumn
+                                MinWidth="200"
+                                AllowEditing="False"
+                                FieldName="Notice"
+                                Header="Bemerkung"
+                                ReadOnly="True" />
+                            <dxg:GridColumn
+                                x:Name="PaidColumn"
+                                AllowEditing="False"
+                                FieldName="IsPaid"
+                                Header="Bezahlt"
+                                IsEnabledBinding="{Binding Source=false}" />
+                        </dxg:GridControl.Columns>
+                        <dxg:GridControl.View>
+                            <dxg:TableView
+                                x:Name="gridView"
+                                Margin="3"
+                                AllowBestFit="True"
+                                BestFitMode="Smart"
+                                CellValueChanging="gridView_CellValueChanging"
+                                Loaded="gridView_Loaded"
+                                NavigationStyle="Cell"
+                                ScrollingMode="Smart"
+                                ShowGroupPanel="False"
+                                SnapsToDevicePixels="True"
+                                VerticalScrollbarVisibility="Auto" />
+                        </dxg:GridControl.View>
+                    </dxg:GridControl>
+
+                    <StackPanel Grid.Row="1" Orientation="Horizontal">
+                        <Button
+                            Name="button_checkAllInvoiceBases"
+                            Margin="10,3,0,0"
+                            HorizontalAlignment="Left"
+                            Command="{Binding CheckAllInvoiceBasesCommand}"
+                            Style="{StaticResource PrimaryButton}">
+                            Alle auswählen
+                        </Button>
+                        <Button
+                            Name="button_uncheckAllInvoiceBases"
+                            Margin="10,3,0,0"
+                            HorizontalAlignment="Left"
+                            Command="{Binding UncheckAllInvoiceBasesCommand}"
+                            Style="{StaticResource PrimaryButton}">
+                            Alle abwählen
+                        </Button>
+                        <Button
+                            Name="button_printSelectedInvoiceBases"
+                            Margin="40,3,0,0"
+                            HorizontalAlignment="Left"
+                            Command="{Binding PrintSelectedInvoiceBasesCommand}"
+                            Style="{StaticResource PrimaryButton}">
+                            Ausgewählte drucken
+                        </Button>
+                    </StackPanel>
+                </Grid>
             </TabItem>
             <TabItem Header="Protokoll">
                 <dxg:GridControl
                     x:Name="datagrid_transfer"
-                    Margin="3"
+                    Margin="0,0,0,3"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     DataSource="{Binding TransferProtokolle}">
@@ -494,14 +506,15 @@
                     <dxg:GridControl.View>
                         <dxg:TableView
                             x:Name="gridView2"
-                            Margin="3,22,3,3"
+                            Margin="3"
                             AllowBestFit="True"
                             BestFitMode="Smart"
                             Loaded="gridView_Loaded"
                             NavigationStyle="Cell"
                             ScrollingMode="Smart"
                             ShowGroupPanel="False"
-                            SnapsToDevicePixels="True" />
+                            SnapsToDevicePixels="True"
+                            VerticalScrollbarVisibility="Auto" />
                     </dxg:GridControl.View>
                 </dxg:GridControl>
             </TabItem>
diff --git a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
index 149ffbe0b..651210f38 100644
--- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
+++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
@@ -77,6 +77,30 @@ namespace BeWo.View.Controls
             window.Owner = Window;
 
             window.ShowDialog();
+        }
+
+		private void button_checkAll_Click(object sender, RoutedEventArgs e)
+		{
+
+		}
+
+		private void button_uncheckAll_Click(object sender, RoutedEventArgs e)
+		{
+
+		}
+
+        private void gridView_CellValueChanging(object sender, CellValueChangedEventArgs e)
+        {
+            if (e.Column is null)
+                return;
+
+            if (e.Column.FieldName == nameof(InvoiceBaseVM.IsChecked))
+            {
+                if (e.Value is bool b && e.Row is InvoiceBaseVM vm)
+                {
+                    vm.IsChecked = b;
+                }
+            }
         }
     }
 }
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index 55b8c0cfa..a84797244 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -113,7 +113,7 @@
                         Grid.Column="2"
                         EditValue="{Binding Path=AlterAmStichtag, UpdateSourceTrigger=PropertyChanged}"
                         IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
-                        Style="{StaticResource BaseNumberTextEdit}" />
+                        Style="{StaticResource TextEditNumber}" />
 
                     <Label Grid.Row="3" Grid.Column="0">B1040 Haushaltsgröße</Label>
                     <dxe:TextEdit
@@ -121,7 +121,7 @@
                         Grid.Column="2"
                         EditValue="{Binding Path=Haushaltsgrosse, UpdateSourceTrigger=PropertyChanged}"
                         IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
-                        Style="{StaticResource BaseNumberTextEdit}" />
+                        Style="{StaticResource TextEditNumber}" />
 
                     <Label Grid.Row="4" Grid.Column="0">B1050 BerichtseinheitID</Label>
                     <dxe:TextEdit
@@ -391,7 +391,7 @@
                         Grid.Column="1"
                         EditValue="{Binding Path=BetreuungsdauerInTagen, UpdateSourceTrigger=PropertyChanged}"
                         IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
-                        Style="{StaticResource BaseNumberTextEdit}" />
+                        Style="{StaticResource TextEditNumber}" />
 
                     <Label Grid.Row="6" Grid.Column="0">G7010 Art der Beendigung</Label>
                     <ComboBox
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index edc46c34b..b2791d849 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -223,8 +223,10 @@ namespace BeWo.View.Detail.Accounting
 
             var vm = detail_control.DataContext as GkvAbrechnungVM;
 
+            vm.CheckAllInvoiceBases();
+
             var checkbox_checked = detail_control.Checkbox_Bezahlt.IsChecked;
-            var textbox_text = detail_control.Textbox_Notice.Text;
+            var textbox_text = detail_control.txt_Notice.Text;
 
             vm.Notice = textbox_text;
 
diff --git a/BeWo/ViewModel/GkvAbrechnungVM.cs b/BeWo/ViewModel/GkvAbrechnungVM.cs
index 15c0c090d..0c1f84c66 100644
--- a/BeWo/ViewModel/GkvAbrechnungVM.cs
+++ b/BeWo/ViewModel/GkvAbrechnungVM.cs
@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Threading;
+using BeWo.Core;
 using BeWo.ServiceProxy;
 using BeWo.Validation;
 using BS.Shared;
@@ -14,6 +15,7 @@ using BS.Shared.DataContracts.GkvAbrechnung;
 using BS.Shared.Extensions;
 using BS.Shared.Interface;
 using BS.Shared.ReportRequests;
+using DevExpress.Mvvm;
 using DevExpress.Xpf.Core;
 
 namespace BeWo.ViewModel
@@ -53,8 +55,16 @@ namespace BeWo.ViewModel
 		public GkvAbrechnungVM(GkvAbrechnungDC pDC) : base(pDC, !pDC.GkvAbrechnungOid.HasValue)
 		{
 			_InvoiceBases = new BindingList<InvoiceBaseVM>();
+
+			CheckAllInvoiceBasesCommand = new DelegateCommand(CheckAllInvoiceBases, HasAnyInvoiceBases);
+			UncheckAllInvoiceBasesCommand = new DelegateCommand(UncheckAllInvoicesBases, HasAnyInvoiceBases);
+			PrintSelectedInvoiceBasesCommand = new DelegateCommand(PrintSelectedInvoiceBases, HasAnySelectedInvoiceBases);
 		}
 
+		public DelegateCommand CheckAllInvoiceBasesCommand { get; set; }
+		public DelegateCommand UncheckAllInvoiceBasesCommand { get; set; }
+		public DelegateCommand PrintSelectedInvoiceBasesCommand { get; set; }
+
 		#region
 
 		public string AbrechnungsZeitraum => $"{AbrechnungsZeitraumStart.Value.ToShortDateString()} - {AbrechnungsZeitraumEnde.Value.ToShortDateString()}";
@@ -476,5 +486,52 @@ namespace BeWo.ViewModel
 				MessageBox.Show(Application.Current.MainWindow, "Ihre Sendung wurde korrekt übertragen");
 			}
 		}
+
+		public bool HasAnyInvoiceBases()
+		{
+			return InvoiceBases2 is object && InvoiceBases2.Any();
+		}
+
+		public void CheckAllInvoiceBases()
+		{
+			if (!HasAnyInvoiceBases())
+				return;
+
+			foreach (var invoice_base in InvoiceBases2)
+			{
+				invoice_base.IsChecked = true;
+			}
+		}
+
+		internal void UncheckAllInvoicesBases()
+		{
+			if (!HasAnyInvoiceBases())
+				return;
+
+			foreach (var invoice_base in InvoiceBases2)
+			{
+				invoice_base.IsChecked = false;
+			}
+		}
+
+		public bool HasAnySelectedInvoiceBases()
+		{
+			return HasAnyInvoiceBases() && getSelectedInvoiceBases().Any();
+		}
+
+		internal void PrintSelectedInvoiceBases()
+		{
+			var selected = new List<long>(getSelectedInvoiceBases());
+
+			if (!selected.Any())
+				return;
+
+			ServiceFacade.DoReportServiceAsync(s => s.CreateInvoiceListReport(selected), ms => BeWoApp.MainControl.Dispatch(() => BeWoUtils.ShowReportWindow(ms, "Rechnungen")));
+		}
+
+		private IEnumerable<long> getSelectedInvoiceBases()
+		{
+			return InvoiceBases2.Where(x => x.IsChecked).Select(x => x.DataContract.InvoiceBaseOid.Value);
+		}
 	}
 }
\ No newline at end of file
diff --git a/Host/GkvAbrechnungServer.aspx.cs b/Host/GkvAbrechnungServer.aspx.cs
index 2aeecca49..c6413a3d1 100644
--- a/Host/GkvAbrechnungServer.aspx.cs
+++ b/Host/GkvAbrechnungServer.aspx.cs
@@ -106,7 +106,7 @@ namespace Host
 			var loginurl = string.Format(LOGINSERVER_URL, $"https://{server}/service");
 
 #if DEBUG
-			if (server.IndexOf("localhost") > 0)
+			if (server.IndexOf("localhost") >= 0)
 				loginurl = string.Format(LOGINSERVER_URL, $"http://{server}/Host");
 #endif
 
diff --git a/Shared/AppSender/AppRequestSender.cs b/Shared/AppSender/AppRequestSender.cs
index 2334b08f8..c89969c39 100644
--- a/Shared/AppSender/AppRequestSender.cs
+++ b/Shared/AppSender/AppRequestSender.cs
@@ -17,7 +17,7 @@ namespace BS.Shared.AppSender
 		public static string GetServerFromTenant(string tenant)
 		{
 #if DEBUG
-			// return "localhost:3777";
+			return "localhost:3777";
 #endif
 			try
 			{