diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml
index e23920dad..6edb6a6c7 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml
@@ -597,23 +597,19 @@
 						<Binding ElementName="LeftExpanderButton" Path="ActualWidth" />
 					</MultiBinding>
 				</StackPanel.Width>
-				<Button Style="{x:Null}" Margin="0,1,1,1" Height="24" Width="24" ToolTip="Tagesansicht" Click="ButtonDayView_Click">
+				<Button Margin="0,1,1,1" Height="24" Width="24" ToolTip="Tagesansicht" Click="ButtonDayView_Click">
 					<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar1Day24.png" />
 				</Button>
-				<Button Style="{x:Null}" Margin="1" Height="24" Width="24" ToolTip="Arbeitswoche anzeigen"
-							Click="ButtonWorkWeekView_Click">
-					<!--<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar5Day24.png" />-->
-					<Image Source="../../Ressources/Icons/Calendar5Day24.png" />
+				<Button Margin="1" Height="24" Width="24" ToolTip="Arbeitswoche anzeigen" Click="ButtonWorkWeekView_Click">
+					<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar5Day24.png" />
 				</Button>
-				<Button Style="{x:Null}" Margin="1" Height="24" Width="24" ToolTip="Volle Woche anzeigen"
-							Click="ButtonWeekView_Click">
+				<Button Margin="1" Height="24" Width="24" ToolTip="Volle Woche anzeigen" Click="ButtonWeekView_Click">
 					<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar7Day24.png" />
 				</Button>
-				<Button Style="{x:Null}" Margin="1" Height="24" Width="24" ToolTip="Monat anzeigen" Click="ButtonMonthView_Click">
+				<Button Margin="1" Height="24" Width="24" ToolTip="Monat anzeigen" Click="ButtonMonthView_Click">
 					<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar31Day24.png" />
 				</Button>
-				<Button Style="{x:Null}" Margin="1" Height="24" Width="24" ToolTip="Zeitleiste anzeigen"
-							Click="ButtonTimelineView_Click">
+				<Button Margin="1" Height="24" Width="24" ToolTip="Zeitleiste anzeigen" Click="ButtonTimelineView_Click">
 					<Image Source="/BeWoPlaner;component/Ressources/Icons/History24.png" />
 				</Button>
 				<StackPanel x:Name="DayViewOptions" Orientation="Horizontal" Visibility="Visible">
diff --git a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
index e93d2726b..d224f6613 100644
--- a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
+++ b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
@@ -56,15 +56,15 @@
               
 				          <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" >
                  
-					            <Button Style="{x:Null}" Margin="3,3,3,3" Height="24" Width="24" ToolTip="Tagesansicht" Click="ButtonDayView_Click"  VerticalAlignment="Top">
+					            <Button Margin="3,3,3,3" Height="24" Width="24" ToolTip="Tagesansicht" Click="ButtonDayView_Click"  VerticalAlignment="Top">
 						          <Image Source="/Ressources\Icons\Calendar1Day24.png" />
 					            </Button>
               
-					            <Button Style="{x:Null}" Margin="3,3,3,3" Height="24" Width="24" ToolTip="Wochenansicht" Click="ButtonWorkWeekView_Click"   VerticalAlignment="Top">                                          
+					            <Button Margin="3,3,3,3" Height="24" Width="24" ToolTip="Wochenansicht" Click="ButtonWorkWeekView_Click"   VerticalAlignment="Top">                                          
 						          <Image Source="/Ressources/Icons/Calendar5Day24.png" />
 					            </Button>            
                    
-					            <Button Style="{x:Null}" Margin="3,3,3,3" Height="24" Width="24" ToolTip="Aktualisieren" Click="Aktualisieren_OnClick" VerticalAlignment="Top" >
+					            <Button Margin="3,3,3,3" Height="24" Width="24" ToolTip="Aktualisieren" Click="Aktualisieren_OnClick" VerticalAlignment="Top" >
 						            <Image Source="../Ressources/Icons/SymbolRefresh32.png" />
 					            </Button>
 
@@ -259,14 +259,14 @@
 
               <StackPanel Grid.ColumnSpan="3" Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" >
                 
-                  <Button Click="PfeilLinksDatumRunter_OnClick" Margin="3,3,3,3" Height="24" Width="24" ToolTip="Vorheriges Datum" Style="{x:Null}">
+                  <Button Click="PfeilLinksDatumRunter_OnClick" Margin="3,3,3,3" Height="24" Width="24" ToolTip="Vorheriges Datum">
                    <Image Source="/BeWoPlaner;component/Ressources/Icons/ArrowLeft.png"  />
                   </Button>
                 
                    <Label  x:Name="Datelbl" HorizontalAlignment="Center" VerticalAlignment="Bottom" Content="PlaceHolder" FontSize="16" Margin="3,3,3,3" />
 
-                  <Button Click="PfeilRechtsDatumHoch_OnClick"  Margin="3,3,3,3" Height="24" Width="24" ToolTip="Nächstes Datum" Style="{x:Null}" >                                 
-                      <Image Source="/BeWoPlaner;component/Ressources/Icons/ArrowRight.png" Visibility="Visible" />                          
+                  <Button Click="PfeilRechtsDatumHoch_OnClick"  Margin="3,3,3,3" Height="24" Width="24" ToolTip="Nächstes Datum">
+                      <Image Source="/BeWoPlaner;component/Ressources/Icons/ArrowRight.png" Visibility="Visible" />
                   </Button>      
               
               </StackPanel>
diff --git a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
index d69e63a32..d192f4f33 100644
--- a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
@@ -1,54 +1,21 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 
-using BeWo.Annotations;
 using BeWo.Core;
-using BeWo.Core.Service;
-using BeWo.Scheduler.Converter;
-using BeWo.Scheduler.ViewModel;
 using BeWo.ServiceProxy;
 using BeWo.View;
-using BeWo.View.Detail;
 using BeWo.ViewModel;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
-using DevExpress.Utils;
 using DevExpress.Xpf.Bars;
-using DevExpress.Xpf.Core;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Grid;
-using DevExpress.Xpf.Scheduler;
-using DevExpress.Xpf.Scheduler.Drawing;
-using DevExpress.Xpf.Scheduler.Reporting;
-using DevExpress.XtraScheduler;
-using Appointment    = DevExpress.XtraScheduler.Appointment;
-using Button = System.Windows.Controls.Button;
-using CheckBox = System.Windows.Controls.CheckBox;
-using ColorConverter = System.Windows.Media.ColorConverter;
-using DragDropEffects = System.Windows.DragDropEffects;
-using DragEventArgs = System.Windows.DragEventArgs;
-using Image = System.Windows.Controls.Image;
 using MessageBox = System.Windows.MessageBox;
-using Point = System.Windows.Point;
-using SchedulerControl = DevExpress.Xpf.Scheduler.SchedulerControl;
 
 
 namespace BeWo.SchulbegleitenderDienst
@@ -117,11 +84,11 @@ namespace BeWo.SchulbegleitenderDienst
 	        KrankMeldungKlientDatepicker.DateTime = dt;
 	    }
 
-	    private void GetAllVertretungenOnLoad(DateTime AusgewähltesDatum)
+	    private void GetAllVertretungenOnLoad(DateTime AusgewaehltesDatum)
 	    {
             _items.Clear();
        
-            ServiceFacade.DoOperationsServiceAsync(s => s.VertretungsListe(AusgewähltesDatum),r =>{ 
+            ServiceFacade.DoOperationsServiceAsync(s => s.VertretungsListe(AusgewaehltesDatum),r =>{ 
                            
                 foreach (var item in r)
                 {
@@ -133,7 +100,7 @@ namespace BeWo.SchulbegleitenderDienst
                 { 
                     GridDataControlTagesansicht.RefreshData();
                     GridDataControlTagesansicht.RefreshUI();
-                    GetWochenDienstFromItems(AusgewähltesDatum);
+                    GetWochenDienstFromItems(AusgewaehltesDatum);
                 });
                 #endregion
             });
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 0dbc1e890..fd60e17e9 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -128,7 +128,7 @@ namespace BS.Shared
         Vertretung                                = 121,
         Employee2Token                            = 122,
         QuittierungsCheck                         = 123,
-		CustomerTeam                              = 124,
+		CustomerTeam                              = 124
 	}
 
     public enum SystemEntryID