diff --git a/BeWo/BeWoApp.xaml b/BeWo/BeWoApp.xaml
index 124299fd0..5fc88da26 100644
--- a/BeWo/BeWoApp.xaml
+++ b/BeWo/BeWoApp.xaml
@@ -437,7 +437,6 @@
         <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
         <Setter Property="FontSize" Value="11" />
       </Style>
-      <!--####################  Neuer Style #############################################-->
             
       <Style x:Key="PopUpWindowStyle" TargetType="{x:Type GroupBox}">
 				<Setter Property="Template">
diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
index b96b909cc..2ec9def54 100644
--- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
+++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
@@ -225,7 +225,7 @@
 			<Popup Grid.Column="1" Grid.Row="4" Margin="10" Name="PopupEmployee" StaysOpen="False" Placement="MousePoint" Width="370" Height="300" >
 				<search:MultiEmployeeSearch x:Name="MultiEmployeeSearch" ResultListBackground="{StaticResource EmployeeListBrush}" SelectionChanged="MultiEmployeeSearch_OnSelectionChanged" SelectedEmployees="{Binding Controller.EmployeeList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
 			</Popup>
-			<Button x:Name="MitarbeiterPopUpOeffnenBtn" Grid.Column="4" Grid.Row="4" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="Popupedit_employee_PopUpClick">
+			<Button x:Name="MitarbeiterPopUpOeffnenBtn" Grid.Column="4" Grid.Row="4" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="EmployeePopupClick">
 				<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
 					<Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
 					<Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
@@ -257,7 +257,7 @@
 				<TextBox IsReadOnly="True" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding CountSelectedCustomers, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
 				<ToggleButton Grid.Column="1" x:Name="KlientenToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="Ausgewählte Klienten anzeigen" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
 			</Grid>
-			<Button x:Name="KlientenPopUpOeffnenBtn" Grid.Column="4" Grid.Row="6" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="Popupedit_customer_PopUpClick">
+			<Button x:Name="KlientenPopUpOeffnenBtn" Grid.Column="4" Grid.Row="6" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="CustomerPopUpEditClick">
 				<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
 					<Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
 					<Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
@@ -292,7 +292,7 @@
 				<TextBox IsReadOnly="True" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding CountSelectedResources, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
 				<ToggleButton Grid.Column="1" x:Name="RessourcenToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="Ausgewählte Ressourcen anzeigen" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
 			</Grid>
-			<Button x:Name="RessourcenPopUpOeffnenBtn" Grid.Column="4" Grid.Row="8" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="Popupedit_resource_PopUpClick">
+			<Button x:Name="RessourcenPopUpOeffnenBtn" Grid.Column="4" Grid.Row="8" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="ResourcePopUpClick">
 				<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
 					<Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
 					<Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
@@ -368,10 +368,10 @@
 
 			<!-- Region Buttons -->
 			<UniformGrid Grid.Column="0" Grid.Row="14" Grid.ColumnSpan="5" Columns="3" Rows="1" HorizontalAlignment="Right">
-				<Button Margin="3" Click="Button_ok_Click" x:Name="OKButton" Content="OK" Height="25" Width="80" />
-				<Button Margin="3" Click="Button_cancel_Click" Content="Abbrechen" Height="25" Width="80" />
+				<Button Margin="3" Click="OkButtonClick" x:Name="OKButton" Content="OK" Height="25" Width="80" />
+				<Button Margin="3" Click="CancelButtonClick" Content="Abbrechen" Height="25" Width="80" />
                 <!--<Button Margin="3" Click="button_CreatZeiterfassung_Click" x:Name="ZeiterfassButton" Content="Zeiterfassung" Height="25" Width="80" />-->
-                <Button Margin="3" Click="Button_delete_Click" x:Name="DeleteButton" Content="Löschen" Height="25" Width="80" />
+                <Button Margin="3" Click="DeleteButtonClick" x:Name="DeleteButton" Content="Löschen" Height="25" Width="80" />
             </UniformGrid>
 			<!-- Endregion -->
 		</Grid>
diff --git a/Model/Changes_2017_08_31.txt b/Model/Changes_2017_08_31.txt
index 178288783..91c85370c 100644
--- a/Model/Changes_2017_08_31.txt
+++ b/Model/Changes_2017_08_31.txt
@@ -1,2 +1,4 @@
 ALTER TABLE textbaustein ADD COLUMN `ParentOid` BIGINT(19);
-ALTER TABLE textbaustein ADD CONSTRAINT FK_TEXTBAUSTEIN2PARENT FOREIGN KEY (ParentOid) REFERENCES textbaustein(Oid) ON DELETE NO ACTION ON UPDATE NO ACTION;
\ No newline at end of file
+ALTER TABLE textbaustein ADD CONSTRAINT FK_TEXTBAUSTEIN2PARENT FOREIGN KEY (ParentOid) REFERENCES textbaustein(Oid) ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+ALTER TABLE textbaustein ADD COLUMN `IsParent` TINYINT(1);
\ No newline at end of file