diff --git a/TeamViewerADConnector/Internal/Forms/MainWindow.xaml b/TeamViewerADConnector/Internal/Forms/MainWindow.xaml
index 5292daf..dd834de 100644
--- a/TeamViewerADConnector/Internal/Forms/MainWindow.xaml
+++ b/TeamViewerADConnector/Internal/Forms/MainWindow.xaml
@@ -1,16 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
+<?xml version="1.0" encoding="UTF-8" ?><!--
 Copyright (c) 2018-2023 TeamViewer Germany GmbH
 See file LICENSE
 -->
-<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase" Width="620" MinWidth="620" MinHeight="770" WindowStartupLocation="CenterScreen" SizeToContent="Height">
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase" Width="800" MinWidth="800" MinHeight="580" WindowStartupLocation="CenterScreen" SizeToContent="Height">
     <Window.Title>
         <MultiBinding StringFormat="{}{0} {1}">
-            <Binding Path="L.Title" />
-            <Binding Path="ScriptVersion" />
+            <Binding Path="L.Title"/>
+            <Binding Path="ScriptVersion"/>
         </MultiBinding>
     </Window.Title>
     <Window.Resources>
@@ -19,6 +15,11 @@ See file LICENSE
                 <scm:SortDescription PropertyName="Content" Direction="Ascending"/>
             </CollectionViewSource.SortDescriptions>
         </CollectionViewSource>
+        <CollectionViewSource x:Key="ScheduledSyncIntervalViewSource" Source="{Binding ScheduledSyncIntervals}">
+            <CollectionViewSource.SortDescriptions>
+                <scm:SortDescription PropertyName="Content" Direction="Ascending"/>
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
     </Window.Resources>
     <StackPanel Margin="20,10,20,20">
         <GroupBox Header="{Binding L.SectionConfiguration}" Margin="0,0,0,20">
@@ -27,181 +28,237 @@ See file LICENSE
                     <TabItem Header="{Binding L.TabHeaderSynchronization}">
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition SharedSizeGroup="ConfigurationTabHeight" />
+                                <RowDefinition SharedSizeGroup="ConfigurationTabHeight"/>
                             </Grid.RowDefinitions>
-                            <StackPanel Margin="10">
+                            <StackPanel Margin="5">
                                 <Grid VerticalAlignment="Top">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="100" />
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="100" />
-                                    </Grid.ColumnDefinitions>
-                                    <Label Margin="5" Content="{Binding L.LabelApiToken}" HorizontalContentAlignment="Right" />
-                                    <TextBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" Text="{Binding ConfigurationData.ApiToken}" />
-                                    <Button Grid.Column="2" Margin="5" Content="{Binding L.TestToken}" Name="BtnTestToken" />
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Label Grid.Row="0" Margin="3" Content="{Binding L.LabelSyncHeader}" HorizontalContentAlignment="Left" FontSize="12"/>
+                                    <Label Grid.Row="1" Margin="3" Content="{Binding L.LabelADHeader}" HorizontalContentAlignment="Left" FontWeight="Bold" FontSize="12"/>
                                 </Grid>
                                 <Grid VerticalAlignment="Top">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="100" />
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="100" />
+                                        <ColumnDefinition Width="160"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="100"/>
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
                                     </Grid.RowDefinitions>
-                                    <Label Margin="5" Content="{Binding L.LabelADGroups}" HorizontalContentAlignment="Right" />
-                                    <ComboBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" Name="CbxNewADGroup" ItemsSource="{Binding ADGroupsData}" Text="{Binding ADGroupsSelectionData.AddValue}" IsEditable="True" IsTextSearchEnabled="False" />
+                                    <Label Margin="5" Content="{Binding L.LabelADGroups}" HorizontalContentAlignment="Right" FontSize="12"/>
+                                    <ComboBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" Name="CbxNewADGroup" ItemsSource="{Binding ADGroupsData}" Text="{Binding ADGroupsSelectionData.AddValue}" IsEditable="True" IsTextSearchEnabled="False"/>
                                     <Button Grid.Column="2" Margin="5" Content="{Binding L.Add}" Name="BtnAddGroup">
                                         <Button.Style>
                                             <Style TargetType="Button">
-                                                <Setter Property="IsEnabled" Value="true" />
+                                                <Setter Property="IsEnabled" Value="true"/>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding ElementName=CbxNewADGroup, Path=Text}" Value="">
-                                                        <Setter Property="IsEnabled" Value="false" />
+                                                        <Setter Property="IsEnabled" Value="false"/>
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
                                         </Button.Style>
                                     </Button>
-                                    <TextBlock Grid.Column="1" Grid.Row="1" Text="{Binding L.LabelSelectedADGroups}" Margin="5,5,5,0" />
-                                    <ListView Grid.Column="1" Grid.Row="2" Height="120" Margin="5" Name="SelectedADGroups" ItemsSource="{Binding ConfigurationData.ActiveDirectoryGroups}" SelectedValue="{Binding ADGroupsSelectionData.RemoveValue}" SelectionMode="Single" />
+                                    <Label Grid.Column="0" Grid.Row="2" Content="{Binding L.LabelSelectedADGroups}" Margin="5" HorizontalContentAlignment="Right" FontSize="12"/>
+                                    <ListView Grid.Column="1" Grid.Row="2" Height="120" Margin="5" Name="SelectedADGroups" ItemsSource="{Binding ConfigurationData.ActiveDirectoryGroups}" SelectedValue="{Binding ADGroupsSelectionData.RemoveValue}" SelectionMode="Single"/>
                                     <Button Grid.Column="2" Grid.Row="2" Margin="5" Content="{Binding L.Remove}" Padding="4" VerticalAlignment="Top" Name="BtnRemoveGroup">
                                         <Button.Style>
                                             <Style TargetType="Button">
-                                                <Setter Property="IsEnabled" Value="true" />
+                                                <Setter Property="IsEnabled" Value="true"/>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding ElementName=SelectedADGroups, Path=SelectedItems.Count}" Value="0">
-                                                        <Setter Property="IsEnabled" Value="false" />
+                                                        <Setter Property="IsEnabled" Value="false"/>
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
                                         </Button.Style>
                                     </Button>
                                 </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Label Margin="3" Content="{Binding L.LabelOptions}" HorizontalContentAlignment="Left" FontWeight="Bold" FontSize="12"/>
+                                </Grid>
                                 <Grid VerticalAlignment="Top">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="100" />
-                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="5"/>
+                                        <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <Label Margin="5" Content="{Binding L.LabelOptions}" HorizontalContentAlignment="Right" />
                                     <StackPanel Grid.Column="1" Margin="5">
-                                        <CheckBox VerticalAlignment="Top" Margin="0,5,5,5" Content="{Binding L.TestRun}" IsChecked="{Binding ConfigurationData.TestRun}" />
-                                        <CheckBox VerticalAlignment="Top" Margin="0,5,5,5" Content="{Binding L.DeactivateUsers}" IsChecked="{Binding ConfigurationData.DeactivateUsers}" />
-                                        <CheckBox VerticalAlignment="Top" Margin="0,5,5,5" Content="{Binding L.RecursiveGroups}" IsChecked="{Binding ConfigurationData.RecursiveGroups}" />
-                                        <CheckBox VerticalAlignment="Top" Margin="0,5,5,5" Content="{Binding L.UseSecondaryEmails}" IsChecked="{Binding ConfigurationData.UseSecondaryEmails}" />
+                                        <CheckBox VerticalAlignment="Top" Margin="0,5,5,5" Content="{Binding L.RecursiveGroups}" IsChecked="{Binding ConfigurationData.RecursiveGroups}"/>
+                                        <CheckBox VerticalAlignment="Top" Margin="0,5,5,5" Content="{Binding L.EnableUserGroupsSync}" IsChecked="{Binding ConfigurationData.EnableUserGroupsSync}"/>
+                                        <CheckBox VerticalAlignment="Top" Margin="0,5,5,5" Content="{Binding L.UseSecondaryEmails}" IsChecked="{Binding ConfigurationData.UseSecondaryEmails}"/>
+                                        <CheckBox VerticalAlignment="Top" Margin="0,5,5,5" Content="{Binding L.DeactivateUsers}" IsChecked="{Binding ConfigurationData.DeactivateUsers}"/>
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>
                         </Grid>
                     </TabItem>
-                    <TabItem Header="{Binding L.TabHeaderAccounts}">
+                    <TabItem Header="{Binding L.TabHeaderUserSettings}">
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition SharedSizeGroup="ConfigurationTabHeight" />
+                                <RowDefinition SharedSizeGroup="ConfigurationTabHeight"/>
                             </Grid.RowDefinitions>
-                            <StackPanel Margin="10">
+                            <StackPanel Margin="5">
                                 <Grid VerticalAlignment="Top">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="100" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <Label Margin="5" Content="{Binding L.LabelLanguage}" HorizontalContentAlignment="Right" />
-                                    <ComboBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" ItemsSource="{Binding Source={StaticResource LanguagesViewSource}}" SelectedValuePath="Tag" DisplayMemberPath="Content" SelectedValue="{Binding ConfigurationData.UserLanguage}" />
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Label Grid.Row="0" Margin="3" Content="{Binding L.LabelUserSettingsHeader}" HorizontalContentAlignment="Left" FontSize="12"/>
+                                    <Label Grid.Row="1" Margin="3" Content="{Binding L.LabelAccountType}" HorizontalContentAlignment="Left" FontWeight="Bold" FontSize="12"/>
                                 </Grid>
                                 <Grid VerticalAlignment="Top">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="100" />
-                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <Label Margin="5" Content="{Binding L.LabelAccountType}" HorizontalContentAlignment="Right" />
-                                    <StackPanel Grid.Column="1" Margin="5">
-                                        <RadioButton Name="RdBtnAccountTypePassword" Margin="0,7,5,10" VerticalAlignment="Top" HorizontalContentAlignment="Stretch" GroupName="AccountTypeGroup" IsChecked="{Binding ConfigurationData.UseDefaultPassword}">
-                                            <StackPanel>
-                                                <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0,0,0,5" Text="{Binding L.AccountTypeDefaultPassword}" />
-                                                <TextBox VerticalContentAlignment="Center" Padding="4" Text="{Binding ConfigurationData.DefaultPassword}" IsEnabled="{Binding ElementName=RdBtnAccountTypePassword, Path=IsChecked}" />
-                                            </StackPanel>
+                                    <StackPanel Grid.Column="0" Margin="5">
+                                        <RadioButton Name="RdBtnAccountTypeGeneratedPassword" Margin="0,10,5,5" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" GroupName="AccountTypeGroup" IsChecked="{Binding ConfigurationData.UseGeneratedPassword}">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" Text="{Binding L.AccountTypeGeneratedPassword}" FontSize="12"/>
+                                            </Grid>
                                         </RadioButton>
-                                        <RadioButton Name="RdBtnAccountTypeGeneratedPassword" Margin="0,10,5,5" VerticalAlignment="Top" HorizontalContentAlignment="Stretch" GroupName="AccountTypeGroup" IsChecked="{Binding ConfigurationData.UseGeneratedPassword}">
-                                            <StackPanel>
-                                                <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="{Binding L.AccountTypeGeneratedPassword}" />
-                                            </StackPanel>
+                                        <RadioButton Name="RdBtnAccountTypePassword" Margin="0,10,5,5" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" GroupName="AccountTypeGroup" IsChecked="{Binding ConfigurationData.UseDefaultPassword}">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="160"/>
+                                                    <ColumnDefinition Width="*"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,0,5" Text="{Binding L.AccountTypeDefaultPassword}" FontSize="12"/>
+                                                <TextBox Grid.Column="1" VerticalContentAlignment="Center" Padding="4" Text="{Binding ConfigurationData.DefaultPassword}" IsEnabled="{Binding ElementName=RdBtnAccountTypePassword, Path=IsChecked}"/>
+                                            </Grid>
                                         </RadioButton>
-                                        <RadioButton Name="RdBtnAccountTypeSso" Margin="0,10,5,5" VerticalAlignment="Top" HorizontalContentAlignment="Stretch" GroupName="AccountTypeGroup" IsChecked="{Binding ConfigurationData.UseSsoCustomerId}">
-                                            <StackPanel>
-                                                <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="{Binding L.AccountTypeSso}" />
-                                                <Label Margin="0,10,0,5" Padding="0" Content="{Binding L.LabelCustomerId}" IsEnabled="{Binding ElementName=TxtBxSsoCustomerId, Path=IsEnabled}" />
-                                                <TextBox Name="TxtBxSsoCustomerId" VerticalContentAlignment="Center" Padding="4" Text="{Binding ConfigurationData.SsoCustomerId}" IsEnabled="{Binding ElementName=RdBtnAccountTypeSso, Path=IsChecked}" />
-                                            </StackPanel>
+                                        <RadioButton Name="RdBtnAccountTypeSso" Margin="0,10,5,5" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" GroupName="AccountTypeGroup" IsChecked="{Binding ConfigurationData.UseSsoCustomerId}">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="160"/>
+                                                    <ColumnDefinition Width="*"/>
+                                                </Grid.ColumnDefinitions>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition/>
+                                                    <RowDefinition/>
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Grid.Column="0" Grid.Row="0" VerticalAlignment="Top" HorizontalAlignment="Left" Text="{Binding L.AccountTypeSso}" FontSize="12"/>
+                                                <Label Grid.Column="0" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Padding="0" Content="{Binding L.LabelCustomerId}" IsEnabled="{Binding ElementName=TxtBxSsoCustomerId, Path=IsEnabled}" Margin="0,10,0,0"/>
+                                                <TextBox Grid.Column="1" Grid.Row="1" Name="TxtBxSsoCustomerId" VerticalContentAlignment="Center" Padding="4" Text="{Binding ConfigurationData.SsoCustomerId}" IsEnabled="{Binding ElementName=RdBtnAccountTypeSso, Path=IsChecked}" Margin="0,10,0,0"/>
+                                            </Grid>
                                         </RadioButton>
                                     </StackPanel>
                                 </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Label Margin="5" Content="{Binding L.LabelOtherUserSettings}" HorizontalContentAlignment="Left" FontWeight="Bold" FontSize="12"/>
+                                </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="160"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Label Margin="5" Content="{Binding L.LabelLanguage}" HorizontalContentAlignment="Left" FontSize="12"/>
+                                    <ComboBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" ItemsSource="{Binding Source={StaticResource LanguagesViewSource}}" SelectedValuePath="Tag" DisplayMemberPath="Content" SelectedValue="{Binding ConfigurationData.UserLanguage}"/>
+                                </Grid>
                             </StackPanel>
                         </Grid>
                     </TabItem>
-                    <TabItem Header="{Binding L.TabHeaderGroups}">
+                    <TabItem Header="{Binding L.TabHeaderSettings}">
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition SharedSizeGroup="ConfigurationTabHeight" />
+                                <RowDefinition SharedSizeGroup="ConfigurationTabHeight"/>
                             </Grid.RowDefinitions>
-                            <StackPanel Margin="10">
-                                <CheckBox VerticalAlignment="Top" Margin="5" Content="{Binding L.EnableUserGroupsSync}" IsChecked="{Binding ConfigurationData.EnableUserGroupsSync}" />
+                            <StackPanel Margin="5">
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Label Grid.Row="0" Margin="3" Content="{Binding L.LabelADConnectorSettings}" HorizontalContentAlignment="Left" FontSize="12"/>
+                                    <Label Grid.Row="1" Margin="3" Content="{Binding L.LabelAuthentication}" HorizontalContentAlignment="Left" FontWeight="Bold" FontSize="12"/>
+                                </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="100"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Label Margin="5" Content="{Binding L.LabelApiToken}" HorizontalContentAlignment="Right"/>
+                                    <TextBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" Text="{Binding ConfigurationData.ApiToken}"/>
+                                    <Button Grid.Column="2" Margin="5" Content="{Binding L.TestToken}" Name="BtnTestToken"/>
+                                </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Label Grid.Row="0" Margin="3" Content="{Binding L.SectionScheduledSync}" HorizontalContentAlignment="Left" FontWeight="Bold" FontSize="12"/>
+                                    <Label Grid.Row="1" Margin="3" Content="{Binding L.LabelScheduledTaskHeader}" HorizontalContentAlignment="Left" FontSize="12"/>
+                                </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Label Margin="5" Content="{Binding L.LabelStatus}" HorizontalContentAlignment="Right" FontSize="12"/>
+                                    <Label Grid.Column="1" Margin="0,5,5,5" Content="{Binding ScheduledSyncData.StatusMessage}" FontSize="12"/>
+                                </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="70"/>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="100"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Label Margin="5" Content="{Binding L.LabelInterval}" HorizontalContentAlignment="Right" FontSize="12"/>
+                                    <ComboBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" ItemsSource="{Binding Source={StaticResource ScheduledSyncIntervalViewSource}}" SelectedValuePath="Tag" DisplayMemberPath="Content" SelectedValue="{Binding ScheduledSyncData.Interval}" IsEnabled="{Binding ScheduledSyncData.IsNotEnabled}"/>
+                                    <Label Grid.Column="2" Margin="3" Content="{Binding L.IntervalUnit}" FontSize="12"/>
+                                    <Button Grid.Column="3" Margin="5" Padding="4" IsEnabled="{Binding ScheduledSyncData.IsNotEnabled}" Content="{Binding L.Install}" Name="BtnInstallSched"/>
+                                    <Button Grid.Column="4" Margin="5" Padding="4" IsEnabled="{Binding ScheduledSyncData.IsEnabled}" Content="{Binding L.Uninstall}" Name="BtnUninstallSched"/>
+                                </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Label Grid.Row="0" Margin="3" Content="{Binding L.LabelLogging}" HorizontalContentAlignment="Left" FontWeight="Bold" FontSize="12"/>
+                                    <Label Grid.Row="1" Margin="3" Content="{Binding L.LabelLogDirectoryHeader}" HorizontalContentAlignment="Left" FontSize="12"/>
+                                </Grid>
+                                <Grid VerticalAlignment="Top">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="100"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Label Margin="5" Content="{Binding L.LabelLogDirectory}" HorizontalContentAlignment="Right"/>
+                                    <TextBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" Text="{Binding ScheduledSyncData.LogDirectory}" IsEnabled="{Binding ScheduledSyncData.IsNotEnabled}"/>
+                                    <Button Grid.Column="2" Margin="5" Name="BtnChangeLogDirectory" IsEnabled="{Binding ScheduledSyncData.IsNotEnabled}">...</Button>
+                                </Grid>
                             </StackPanel>
                         </Grid>
                     </TabItem>
                 </TabControl>
                 <Grid VerticalAlignment="Top" Margin="0,20,0,0">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="100" />
-                    </Grid.ColumnDefinitions>
-                    <Button Grid.Column="1" Margin="5" Padding="4" Content="{Binding L.Save}" Name="BtnSave" />
-                    <Button Grid.Column="2" Margin="5" Padding="4" Content="{Binding L.SaveAndRun}" Name="BtnSaveAndRun" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-        <GroupBox Header="{Binding L.SectionScheduledSync}">
-            <StackPanel Margin="5">
-                <Grid VerticalAlignment="Top">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Label Margin="5" Content="{Binding L.LabelStatus}" HorizontalContentAlignment="Right" />
-                    <Label Grid.Column="1" Margin="0,5,5,5" Content="{Binding ScheduledSyncData.StatusMessage}" />
-                </Grid>
-                <Grid VerticalAlignment="Top">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="100" />
-                    </Grid.ColumnDefinitions>
-                    <Label Margin="5" Content="{Binding L.LabelInterval}" HorizontalContentAlignment="Right" />
-                    <TextBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" TextAlignment="Right" Text="{Binding ScheduledSyncData.Interval}" IsEnabled="{Binding ScheduledSyncData.IsNotEnabled}" />
-                    <Label Grid.Column="2" Margin="0,5,5,5" Content="{Binding L.IntervalUnit}" />
-                </Grid>
-                <Grid VerticalAlignment="Top">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="100" />
-                    </Grid.ColumnDefinitions>
-                    <Label Margin="5" Content="{Binding L.LabelLogDirectory}" HorizontalContentAlignment="Right" />
-                    <TextBox Grid.Column="1" Margin="5" VerticalContentAlignment="Center" Text="{Binding ScheduledSyncData.LogDirectory}" IsEnabled="{Binding ScheduledSyncData.IsNotEnabled}"/>
-                    <Button Grid.Column="2" Margin="5" Name="BtnChangeLogDirectory" IsEnabled="{Binding ScheduledSyncData.IsNotEnabled}">...</Button>
-                </Grid>
-                <Grid VerticalAlignment="Top" Margin="0,20,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="100" />
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition Width="120"/>
                     </Grid.ColumnDefinitions>
-                    <Button Grid.Column="1" Margin="5" Padding="4" IsEnabled="{Binding ScheduledSyncData.IsNotEnabled}" Content="{Binding L.Install}" Name="BtnInstallSched" />
-                    <Button Grid.Column="2" Margin="5" Padding="4" IsEnabled="{Binding ScheduledSyncData.IsEnabled}" Content="{Binding L.Uninstall}" Name="BtnUninstallSched" />
+                    <Button Grid.Column="1" Margin="5" Padding="4" Content="{Binding L.Save}" Name="BtnSave" Command="{Binding SaveCommand}"/>
+                    <Button Grid.Column="2" Margin="5" Padding="4" Content="{Binding L.TestRun}" Name="BtnSaveAndTestRun" Command="{Binding SaveAndTestRunCommand}"/>
+                    <Button Grid.Column="3" Margin="5" Padding="4" Content="{Binding L.SaveAndRun}" Name="BtnSaveAndRun" Command="{Binding SaveAndRunCommand}"/>
                 </Grid>
             </StackPanel>
         </GroupBox>
     </StackPanel>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/TeamViewerADConnector/Internal/GraphicalUserInterface.ps1 b/TeamViewerADConnector/Internal/GraphicalUserInterface.ps1
index 51bea85..a558f76 100644
--- a/TeamViewerADConnector/Internal/GraphicalUserInterface.ps1
+++ b/TeamViewerADConnector/Internal/GraphicalUserInterface.ps1
@@ -10,6 +10,10 @@ function Get-GraphicalUserInterfaceSupportedLocale() {
         'nl', 'no', 'pl', 'pt', 'ro', 'ru', 'sk', 'sr', 'sv', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW')
 }
 
+function Get-SupportedScheduledSyncIntervals() {
+    return @(4, 8, 16, 24)
+}
+
 function Get-GraphicalUserInterfaceLocale([string] $culture = 'en') {
     $locales = @{}
 
@@ -144,6 +148,13 @@ function Invoke-GraphicalUserInterfaceConfiguration($configuration, [string] $cu
                 Content = $locale."UserLanguage_$_"
             } })
 
+
+    $scheduledSyncIntervalsData = (Get-SupportedScheduledSyncIntervals | ForEach-Object {
+            New-Object PSObject -Prop @{
+                Tag     = "$_"
+                Content = $_
+            }
+        })
     # Scheduled sync view model
     $scheduledSyncData = (New-Object PSObject -Prop @{
             IsEnabled     = $false
@@ -169,13 +180,14 @@ function Invoke-GraphicalUserInterfaceConfiguration($configuration, [string] $cu
     # Main Window
     $mainWindow = (Get-GraphicalUserInterfaceWindow "$PSScriptRoot\Forms\MainWindow.xaml")
     $mainWindow.DataContext = (New-Object PSObject -Prop @{
-            L                     = $locale
-            LanguagesData         = $languagesData
-            ConfigurationData     = $configuration
-            ScheduledSyncData     = $scheduledSyncData
-            ADGroupsData          = $adGroups
-            ADGroupsSelectionData = $adGroupsSelection
-            ScriptVersion         = $ScriptVersion
+            L                      = $locale
+            LanguagesData          = $languagesData
+            ScheduledSyncIntervals = $scheduledSyncIntervalsData
+            ConfigurationData      = $configuration
+            ScheduledSyncData      = $scheduledSyncData
+            ADGroupsData           = $adGroups
+            ADGroupsSelectionData  = $adGroupsSelection
+            ScriptVersion          = $ScriptVersion
         })
 
     # AD Groups ComboBox filtering
@@ -230,11 +242,19 @@ function Invoke-GraphicalUserInterfaceConfiguration($configuration, [string] $cu
 
     # Click Handler Button "Save & Run"
     $mainWindow.FindName('BtnSaveAndRun').Add_Click( {
+            $mainWindow.DataContext.ConfigurationData.TestRun = $false
             Save-Configuration $mainWindow.DataContext.ConfigurationData
 
             Invoke-GraphicalUserInterfaceSync -configuration $mainWindow.DataContext.ConfigurationData -culture $culture -owner $mainWindow
         })
 
+
+    $mainWindow.FindName('BtnSaveAndTestRun').Add_Click({
+            $mainWindow.DataContext.ConfigurationData.TestRun = $true
+            Save-Configuration $mainWindow.DataContext.ConfigurationData
+            Invoke-GraphicalUserInterfaceSync -configuration $mainWindow.DataContext.ConfigurationData -culture $culture -owner $mainWindow
+        })
+
     # Click Handler Button "Add" (Group)
     $mainWindow.FindName('BtnAddGroup').Add_Click( {
             $group = $mainWindow.DataContext.ADGroupsSelectionData.AddValue
diff --git a/TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.de.json b/TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.de.json
index 8d7d6ee..591017b 100644
--- a/TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.de.json
+++ b/TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.de.json
@@ -1,7 +1,7 @@
 {
-    "AccountTypeDefaultPassword": "Konten mit vorgegebenem Passwort erstellen:",
-    "AccountTypeGeneratedPassword": "Konten mit generiertem Passwort erstellen",
-    "AccountTypeSso": "Single Sign-On verwenden (benötigt Tensor Lizenz)",
+    "AccountTypeDefaultPassword": "Vorgegebenes Passwort:",
+    "AccountTypeGeneratedPassword": "Zufällig generiertes Passwort",
+    "AccountTypeSso": "Single Sign-On(SSO):",
     "Add": "Hinzufügen",
     "Apply": "Übernehmen",
     "Cancel": "Abbrechen",
@@ -12,18 +12,27 @@
     "InstallError": "Geplante Aufgabe konnte nicht eingerichtet werden!",
     "IntervalUnit": "Stunden",
     "LabelADGroups": "AD Gruppen:",
-    "LabelAccountType": "Kontotyp:",
+    "LabelADHeader": "Active Directory Gruppen:",
+    "LabelAccountType": "Anmeldeverfahren:",
+    "LabelADConnectorSettings": "Einstellungen des Active Directory Connectors",
     "LabelApiToken": "API Token:",
+    "LabelAuthentication": "Authentifizierung:",
     "LabelCustomerId": "Customer ID:",
     "LabelDefaultPassword": "Init. Passwort:",
     "LabelInterval": "Intervall:",
     "LabelLanguage": "Sprache:",
     "LabelLogDirectory": "Logverzeichnis:",
-    "LabelOptions": "Optionen:",
+    "LabelLogDirectoryHeader": "Definieren Sie den Ordner, in dem Protokolle gespeichert werden.",
+    "LabelLogging": "Protokollierung:",
+    "LabelOptions": "Synchronisierungseinstellungen:",
+    "LabelOtherUserSettings": "Andere:",
+    "LabelScheduledTaskHeader": "Fügt eine geplante Aufgabe hinzu, die den Active Directory Connector regelmäßig mit der gespeicherten Konfiguration ausführt.",
     "LabelSelectedADGroups": "Ausgewählte AD Gruppen:",
     "LabelStatus": "Status:",
+    "LabelSyncHeader": "Synchronisierungseinstellungen festlegen",
+    "LabelUserSettingsHeader": "Die Einstellungen definieren, die für alle exportierten Benutzer innerhalb von TeamViewer vorgegeben werden.",
     "LoadingADGroups": "Lade Active Directory Gruppen ...",
-    "LogDirectoryWarning": "Der angegebene Ordner existiert nicht. Bitte erstellen sie den Ordner.",
+    "LogDirectoryWarning": "Der angegebene Ordner existiert nicht. Bitte erstellen Sie den Ordner.",
     "OK": "OK",
     "RecursiveGroups": "Benutzer verschachtelter AD Gruppen einschließen",
     "Remove": "Entfernen",
@@ -32,24 +41,26 @@
     "ScheduledSyncDisabled": "Geplante Aufgabe ist nicht konfiguriert",
     "ScheduledSyncEnabled": "Geplante Aufgabe ist konfiguriert",
     "SectionConfiguration": "Konfiguration",
-    "SectionScheduledSync": "Geplante Aufgabe",
-    "SyncCompleted": "Fertig",
-    "SyncCreateUpdateUser": "Erstelle/aktualisiere Benutzer",
-    "SyncDeactivateUser": "Deaktiviere Benutzer",
-    "SyncError": "Synchronisierung der Benutzer fehlgeschlagen!",
+    "SectionScheduledSync": "Geplante Aufgabe:",
+    "SyncCompleted": "Abgeschlossen",
+    "SyncCreateUpdateUser": "Benutzer erstellen/aktualisieren",
+    "SyncDeactivateUser": "Benutzer deaktivieren",
+    "SyncError": "Benutzersynchronisierung war nicht erfolgreich!",
     "SyncGetActiveDirectoryGroupMembers": "Mitglieder der Active Directory Gruppen werden abgerufen",
-    "SyncGetTeamViewerUserGroups": "TeamViewer User Gruppen werden abgerufen",
-    "SyncGetTeamViewerUsers": "Benutzer der TeamViewer Company werden abgerufen",
-    "SyncUserGroups": "Synchronisiere TeamViewer User Gruppen",
+    "SyncGetTeamViewerUserGroups": "TeamViewer-Benutzergruppen werden abgerufen",
+    "SyncGetTeamViewerUsers": "Benutzer der TeamViewer-Firma werden abgerufen",
+    "SyncUserGroups": "Synchronisiere TeamViewer-Benutzergruppen",
     "TabHeaderAccounts": "TeamViewer Konten",
     "TabHeaderGroups": "Gruppen",
+    "TabHeaderUserSettings": "Benutzereinstellungen",
+    "TabHeaderSettings": "Einstellungen",
     "TabHeaderSynchronization": "Synchronisierung",
     "TestRun": "Testlauf",
     "TestToken": "Token prüfen",
     "TestTokenFailure": "Das Token ist ungültig!",
-    "TestTokenSuccess": "Token erfolgreicht geprüft!",
+    "TestTokenSuccess": "Token erfolgreich geprüft!",
     "Title": "TeamViewer AD Connector",
-    "Uninstall": "Entfernen",
+    "Uninstall": "Deinstallieren",
     "UninstallError": "Geplante Aufgabe konnte nicht entfernt werden!",
     "UseSecondaryEmails": "Sekundäre E-Mail-Adressen ebenfalls berücksichtigen",
     "UserLanguage_bg": "Bulgarisch (bg)",
@@ -62,7 +73,7 @@
     "UserLanguage_fi": "Finnisch (fi)",
     "UserLanguage_fr": "Französisch (fr)",
     "UserLanguage_hr": "Kroatisch (hr)",
-    "UserLanguage_hu": "Ungarsich (hu)",
+    "UserLanguage_hu": "Ungarisch (hu)",
     "UserLanguage_id": "Indonesisch (id)",
     "UserLanguage_it": "Italienisch (it)",
     "UserLanguage_ja": "Japanisch (ja)",
diff --git a/TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.en.json b/TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.en.json
index 6f7d679..c985755 100644
--- a/TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.en.json
+++ b/TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.en.json
@@ -1,37 +1,46 @@
 {
-    "AccountTypeDefaultPassword": "Create accounts with predefined password:",
-    "AccountTypeGeneratedPassword": "Create accounts with generated password",
-    "AccountTypeSso": "Use Single Sign-On (only available with Tensor license)",
+    "AccountTypeDefaultPassword": "Predefined password:",
+    "AccountTypeGeneratedPassword": "Random password:",
+    "AccountTypeSso": "Single Sign-On (SSO):",
     "Add": "Add",
     "Apply": "Apply",
     "Cancel": "Cancel",
-    "DeactivateUsers": "Deactivate TeamViewer users that are not member of the AD group",
-    "EnableUserGroupsSync": "Enable TeamViewer user groups synchronization",
+    "DeactivateUsers": "Deactivate TeamViewer users that are not member of selected Active Directory groups",
+    "EnableUserGroupsSync": "Synchronize user groups (Tensor license only)",
     "FilterLogFiles": "Log files (*.log)|*.log|All files (*.*)|*.*",
     "Install": "Install",
     "InstallError": "Failed to install scheduled task!",
     "IntervalUnit": "hours",
-    "LabelADGroups": "AD groups:",
-    "LabelAccountType": "Account Type:",
+    "LabelADGroups": "Search for AD groups:",
+    "LabelADHeader": "Active Directory Groups:",
+    "LabelAccountType": "Login Method:",
+    "LabelADConnectorSettings": "Active Directory Connector Settings",
     "LabelApiToken": "API token:",
+    "LabelAuthentication": "Authentication:",
     "LabelCustomerId": "Customer Identifier:",
     "LabelInterval": "Interval:",
     "LabelLanguage": "Language:",
-    "LabelLogDirectory": "Log directory:",
-    "LabelOptions": "Options:",
+    "LabelLogDirectory": "Folder:",
+    "LabelLogDirectoryHeader": "Define the folder where logs/protocols are stored.",
+    "LabelLogging": "Logging:",
+    "LabelOptions": "Synchronization Settings:",
+    "LabelOtherUserSettings": "Other:",
+    "LabelScheduledTaskHeader": "Adds a scheduled task which runs the Active Directory connector regularly with saved configuration.",
     "LabelSelectedADGroups": "Selected AD groups:",
     "LabelStatus": "Status:",
+    "LabelSyncHeader": "Define general synchronization settings as well as which and how users will be synchronized from Active Directory.",
+    "LabelUserSettingsHeader": "Define the settings which will be predefined for all exported users within TeamViewer",
     "LoadingADGroups": "Loading Active Directory groups ...",
     "LogDirectoryWarning": "The specified log directory does not exist. Please make sure to create the directory.",
     "OK": "OK",
-    "RecursiveGroups": "Include users of nested AD groups",
+    "RecursiveGroups": "Include users of nested Active Directory groups",
     "Remove": "Remove",
     "Save": "Save",
     "SaveAndRun": "Save & run",
     "ScheduledSyncDisabled": "Scheduled task is not configured",
     "ScheduledSyncEnabled": "Scheduled task is configured",
     "SectionConfiguration": "Configuration",
-    "SectionScheduledSync": "Scheduled task",
+    "SectionScheduledSync": "Scheduled Task:",
     "SyncCompleted": "Completed",
     "SyncCreateUpdateUser": "Creating/updating users",
     "SyncDeactivateUser": "Deactivating users",
@@ -40,17 +49,17 @@
     "SyncGetTeamViewerUserGroups": "Fetching TeamViewer user groups",
     "SyncGetTeamViewerUsers": "Fetching TeamViewer company users",
     "SyncUserGroups": "Synchronizing TeamViewer user groups",
-    "TabHeaderAccounts": "TeamViewer Accounts",
-    "TabHeaderGroups": "Groups",
+    "TabHeaderUserSettings": "User Settings",
+    "TabHeaderSettings": "Settings",
     "TabHeaderSynchronization": "Synchronization",
-    "TestRun": "Test run",
+    "TestRun": "Save & Try run",
     "TestToken": "Test token",
     "TestTokenFailure": "The specified token is invalid!",
     "TestTokenSuccess": "Successfully validated token!",
     "Title": "TeamViewer AD Connector",
     "Uninstall": "Uninstall",
     "UninstallError": "Failed to uninstall scheduled task!",
-    "UseSecondaryEmails": "Include secondary email addresses for synchronization",
+    "UseSecondaryEmails": "Compare secondary email addresses",
     "UserLanguage_bg": "Bulgarian (bg)",
     "UserLanguage_cs": "Czech (cs)",
     "UserLanguage_da": "Danish (da)",