diff --git a/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml b/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml
index 04a6a8a87..d9182186a 100644
--- a/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml
+++ b/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml
@@ -375,26 +375,21 @@
                                                 <ContentControl Content="{Binding}">
                                                     <ContentControl.ContentTemplate>
                                                         <DataTemplate>
-                                                            <StackPanel>
-                                                                <TextBlock FontWeight="Bold" Text="{Binding Path=Row.Employee}" />
+                                                          <StackPanel>
+                                                            <TextBlock FontWeight="Bold" Text="{Binding Path=Row.Customer}" />
 
-                                                                <Separator Visibility="{Binding Path=Row.SchoolString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock FontWeight="Bold" Text="Schule:" Visibility="{Binding Path=Row.SchoolString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock Text="{Binding Row.SchoolString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+                                                            <Separator Visibility="{Binding Path=Row.Customer.AddressString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                            <TextBlock FontWeight="Bold" Text="Wohnort:" Visibility="{Binding Path=Row.Customer.AddressString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                            <TextBlock Text="{Binding Row.Customer.AddressString}" />
 
-                                                                <Separator Visibility="{Binding Row.EmployeeContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock FontWeight="Bold" Text="Kontakt:" Visibility="{Binding Path=Row.EmployeeContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock Text="{Binding Row.EmployeeContactInformationString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+                                                            <Separator Visibility="{Binding Path=Row.CustomerContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                            <TextBlock FontWeight="Bold" Text="Kontakt:" Visibility="{Binding Path=Row.CustomerContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                            <TextBlock Text="{Binding Row.CustomerContactInformationString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
 
-                                                                <Separator Visibility="{Binding Path=Row.LastSubstitutionsString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock FontWeight="Bold" Text="Letzte Vertretungen" Visibility="{Binding Path=Row.LastSubstitutionsString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock Text="{Binding Row.LastSubstitutionsString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
-
-                                                                <!-- TODO: Was kommt hier in den Text? -->
-                                                                <Separator Visibility="{Binding Path=Row.SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock FontWeight="Bold" Text="Schulbegleitender Dienst:" Visibility="{Binding Path=Row.SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock Text="{Binding Row.SchulbegleitenderDienstString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
-                                                            </StackPanel>
+                                                            <Separator Visibility="{Binding Path=Row.SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                            <TextBlock FontWeight="Bold" Text="Schulbegleitender Dienst:" Visibility="{Binding Path=Row.SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                            <TextBlock Text="{Binding Row.SchulbegleitenderDienstString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+                                                          </StackPanel>
                                                         </DataTemplate>
                                                     </ContentControl.ContentTemplate>
                                                 </ContentControl>
@@ -497,17 +492,20 @@
                                                     <ContentControl.ContentTemplate>
                                                         <DataTemplate>
                                                             <StackPanel>
-                                                                <TextBlock FontWeight="Bold" Text="{Binding Path=Row.Customer}" />
+                                                                <TextBlock FontWeight="Bold" Text="{Binding Path=Row.Employee}" />
 
-                                                                <Separator Visibility="{Binding Path=Row.Customer.AddressString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock FontWeight="Bold" Text="Wohnort:" Visibility="{Binding Path=Row.Customer.AddressString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock Text="{Binding Row.Customer.AddressString}" />
+                                                                <Separator Visibility="{Binding Path=Row.SchoolString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                                <TextBlock FontWeight="Bold" Text="Schule:" Visibility="{Binding Path=Row.SchoolString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                                <TextBlock Text="{Binding Row.SchoolString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
 
-                                                                <Separator Visibility="{Binding Path=Row.CustomerContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock FontWeight="Bold" Text="Kontakt:" Visibility="{Binding Path=Row.CustomerContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock Text="{Binding Row.CustomerContactInformationString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+                                                                <Separator Visibility="{Binding Row.EmployeeContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                                <TextBlock FontWeight="Bold" Text="Kontakt:" Visibility="{Binding Path=Row.EmployeeContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                                <TextBlock Text="{Binding Row.EmployeeContactInformationString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+
+                                                                <Separator Visibility="{Binding Path=Row.LastSubstitutionsString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                                <TextBlock FontWeight="Bold" Text="Letzte Vertretungen" Visibility="{Binding Path=Row.LastSubstitutionsString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                                <TextBlock Text="{Binding Row.LastSubstitutionsString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
 
-                                                                <!-- TODO: Was wird hier angezeigt? -->
                                                                 <Separator Visibility="{Binding Path=Row.SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
                                                                 <TextBlock FontWeight="Bold" Text="Schulbegleitender Dienst:" Visibility="{Binding Path=Row.SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
                                                                 <TextBlock Text="{Binding Row.SchulbegleitenderDienstString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
@@ -729,6 +727,29 @@
                                 </dxg:GridColumn.CellStyle>
                             </dxg:GridColumn>
                             <dxg:GridColumn FieldName="ItemDi.Vertreter" Header="Dienstag" ReadOnly="True" AllowEditing="False">
+                              <dxg:GridColumn.CellToolTipTemplate>
+                                <DataTemplate>
+                                  <StackPanel>
+                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Employee}" />
+
+                                    <Separator Visibility="{Binding Path=SchoolString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                    <TextBlock FontWeight="Bold" Text="Schule:" Visibility="{Binding Path=SchoolString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                    <TextBlock Text="{Binding SchoolString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+
+                                    <Separator Visibility="{Binding EmployeeContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                    <TextBlock FontWeight="Bold" Text="Kontakt:" Visibility="{Binding Path=EmployeeContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                    <TextBlock Text="{Binding EmployeeContactInformationString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+
+                                    <Separator Visibility="{Binding Path=LastSubstitutionsString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                    <TextBlock FontWeight="Bold" Text="Letzte Vertretungen" Visibility="{Binding Path=LastSubstitutionsString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                    <TextBlock Text="{Binding LastSubstitutionsString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+
+                                    <Separator Visibility="{Binding Path=SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                    <TextBlock FontWeight="Bold" Text="Schulbegleitender Dienst:" Visibility="{Binding Path=SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                    <TextBlock Text="{Binding SchulbegleitenderDienstString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
+                                  </StackPanel>
+                                </DataTemplate>
+                              </dxg:GridColumn.CellToolTipTemplate>
                                 <dxg:GridColumn.DisplayTemplate>
                                     <ControlTemplate>
                                         <Grid>
@@ -758,32 +779,7 @@
                                         </Style.Triggers>
                                     </Style>
                                 </dxg:GridColumn.CellStyle>
-                                <dxg:GridColumn.CellToolTipTemplate>
-                                    <DataTemplate>
-                                        <StackPanel>
-                                            <TextBlock FontWeight="Bold" Text="{Binding Path=Employee}" />
-                                            <TextBlock FontWeight="Bold" Text="TEST" />
-
-                                            <Separator Visibility="{Binding Path=SchoolString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                            <TextBlock FontWeight="Bold" Text="Schule:" Visibility="{Binding Path=SchoolString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                            <TextBlock Text="{Binding SchoolString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
-
-                                            <Separator Visibility="{Binding EmployeeContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                            <TextBlock FontWeight="Bold" Text="Kontakt:" Visibility="{Binding Path=EmployeeContactInformationString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                            <TextBlock Text="{Binding EmployeeContactInformationString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
-
-                                            <Separator Visibility="{Binding Path=LastSubstitutionsString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                            <TextBlock FontWeight="Bold" Text="Letzte Vertretungen" Visibility="{Binding Path=LastSubstitutionsString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                            <TextBlock Text="{Binding LastSubstitutionsString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
-
-                                            <!-- TODO: Was kommt hier in den Text? -->
-                                            <!-- Wie beim Klientenreiter -->
-                                            <Separator Visibility="{Binding Path=SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                            <TextBlock FontWeight="Bold" Text="Schulbegleitender Dienst:" Visibility="{Binding Path=SchulbegleitenderDienstString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                            <TextBlock Text="{Binding SchulbegleitenderDienstString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </dxg:GridColumn.CellToolTipTemplate>
+                                
                             </dxg:GridColumn>
                             <dxg:GridColumn FieldName="ItemMi.Vertreter" Header="Mittwoch" ReadOnly="True" AllowEditing="False" CellToolTipTemplate="{StaticResource WeekViewEmployeeCellTemplate}">
                                 <dxg:GridColumn.DisplayTemplate>
@@ -1302,31 +1298,6 @@
             <Popup Grid.Row="0" Margin="10" x:Name="popup_KlientVertretung" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Closed="popup_Closed" Opened="popup_Opened">
               <search:CustomerSearchView x:Name="KlientVertretungsearchview" />
             </Popup>
-
-            <Popup Grid.Row="0" Margin="10" x:Name="Popup_CharacteristicsPreview" StaysOpen="True" Placement="Center" Opened="popup_Opened" Width="800" Height="600">
-                <dxp:DocumentPreviewControl x:Name="DocumentPreviewControl" CommandBarStyle="Bars">
-                    <dxp:DocumentPreviewControl.CommandProvider>
-                        <dxp:DocumentCommandProvider>
-                            <dxp:DocumentCommandProvider.Actions>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.ExportCsv}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.ExportMht}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.ExportTxt}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.Open}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.DocumentMap}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.Watermark}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.Scale}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.PrintDirect}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.PageSetup}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.Save}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.Send}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.Parameters}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.Thumbnails}"/>
-                                <dxb:RemoveAction ElementName="{x:Static dxpbars:DefaultPreviewBarItemNames.EditingFields}"/>
-                            </dxp:DocumentCommandProvider.Actions>
-                        </dxp:DocumentCommandProvider>
-                    </dxp:DocumentPreviewControl.CommandProvider>
-                </dxp:DocumentPreviewControl>
-            </Popup>
           </Grid>
 
           <Border Grid.Row="2" Grid.ColumnSpan="3" Height="35" Margin="0,0,0,0" VerticalAlignment="Stretch" Background="#FF000000">