diff --git a/Apollon.WPF/Commands/AddTournamentCommand.cs b/Apollon.WPF/Commands/AddTournamentCommand.cs
index c9b1b56..79e8de9 100644
--- a/Apollon.WPF/Commands/AddTournamentCommand.cs
+++ b/Apollon.WPF/Commands/AddTournamentCommand.cs
@@ -44,7 +44,7 @@ namespace Apollon.WPF.Commands
                 detailsViewModel.StartDate,
                 detailsViewModel.EndDate,
                 detailsViewModel.Location,
-                detailsViewModel.Rounds,
+                detailsViewModel.Groups,
                 detailsViewModel.Targets);
 
             try
@@ -52,7 +52,7 @@ namespace Apollon.WPF.Commands
                 await _tournamentStore.Add(tournament);
 
                 _modalNavigationStore.Close();
-                _navigationStore.CurrentViewModel = new PreparationViewModel(_selectedTournamentsStore, _navigationStore, _modalNavigationStore, _tournamentStore);
+                _navigationStore.CurrentViewModel = new GroupsViewModel(_selectedTournamentsStore, _navigationStore, _modalNavigationStore, _tournamentStore);
 
             }
             catch (Exception)
diff --git a/Apollon.WPF/Commands/EditTournamentCommand.cs b/Apollon.WPF/Commands/EditTournamentCommand.cs
index 26672c9..ba0d449 100644
--- a/Apollon.WPF/Commands/EditTournamentCommand.cs
+++ b/Apollon.WPF/Commands/EditTournamentCommand.cs
@@ -39,7 +39,7 @@ namespace Apollon.WPF.Commands
                 detailsViewModel.StartDate,
                 detailsViewModel.EndDate,
                 detailsViewModel.Location,
-                detailsViewModel.Rounds,
+                detailsViewModel.Groups,
                 detailsViewModel.Targets);
 
             try
diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml
index fdb1bd7..1bc1bc0 100644
--- a/Apollon.WPF/MainWindow.xaml
+++ b/Apollon.WPF/MainWindow.xaml
@@ -46,8 +46,8 @@
                 <DataTemplate DataType="{x:Type vms:OverviewViewModel}">
                     <views:OverviewView/>
                 </DataTemplate>
-                <DataTemplate DataType="{x:Type vms:PreparationViewModel}">
-                    <views:PreparationView/>
+                <DataTemplate DataType="{x:Type vms:GroupsViewModel}">
+                    <views:GroupsView/>
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type vms:NameListViewModel}">
                     <views:RootdatesView/>
diff --git a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
index 2df4dca..ba7d166 100644
--- a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
@@ -135,7 +135,7 @@ namespace Apollon.WPF.ViewModels
 		}
 
 		private int _rounds;
-		public int Rounds
+		public int Groups
 		{
 			get
 			{
@@ -144,7 +144,7 @@ namespace Apollon.WPF.ViewModels
 			set
 			{
 				_rounds = value;
-				OnPropertyChanged(nameof(Rounds));
+				OnPropertyChanged(nameof(Groups));
 			}
 		}
 
diff --git a/Apollon.WPF/ViewModels/EditTournamentViewModel.cs b/Apollon.WPF/ViewModels/EditTournamentViewModel.cs
index 7c19040..2e54ddb 100644
--- a/Apollon.WPF/ViewModels/EditTournamentViewModel.cs
+++ b/Apollon.WPF/ViewModels/EditTournamentViewModel.cs
@@ -32,7 +32,7 @@ namespace Apollon.WPF.ViewModels
                 StartDate = tournament.StartDate,
                 EndDate = tournament.EndDate,
                 Location = tournament.Location,
-                Rounds = tournament.Rounds,
+                Groups = tournament.Rounds,
                 Targets = tournament.Targets,
             };
            
diff --git a/Apollon.WPF/ViewModels/GroupsViewModel.cs b/Apollon.WPF/ViewModels/GroupsViewModel.cs
index ee2094e..8bedc9e 100644
--- a/Apollon.WPF/ViewModels/GroupsViewModel.cs
+++ b/Apollon.WPF/ViewModels/GroupsViewModel.cs
@@ -1,12 +1,24 @@
-using System;
+using Apollon.WPF.Commands;
+using Apollon.WPF.Stores;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace Apollon.WPF.ViewModels
 {
     public class GroupsViewModel : ViewModelBase
     {
+        public TournamentDetailsViewModel TournamentDetailsViewModel { get; }
+        public ICommand NavigateOverviewCommand { get; }
+
+        public GroupsViewModel(SelectedTournamentsStore selectedTournamentStore, NavigationStore navigationStore, ModalNavigationStore modalNavigationStore, TournamentsStore tournamentsStore)
+        {
+            TournamentDetailsViewModel = new TournamentDetailsViewModel(selectedTournamentStore);
+
+            NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(navigationStore, () => OverviewViewModel.LoadViewModel(selectedTournamentStore, modalNavigationStore, tournamentsStore, navigationStore));
+        }
     }
 }
diff --git a/Apollon.WPF/ViewModels/NavBarTournamentDetailsViewModel.cs b/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
similarity index 85%
rename from Apollon.WPF/ViewModels/NavBarTournamentDetailsViewModel.cs
rename to Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
index 5ddadd7..1e0254d 100644
--- a/Apollon.WPF/ViewModels/NavBarTournamentDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
@@ -8,7 +8,7 @@ using System.Windows.Input;
 
 namespace Apollon.WPF.ViewModels
 {
-    public class NavBarTournamentDetailsViewModel : ViewModelBase
+    public class NavBarPreparationViewModel : ViewModelBase
     {
         public ICommand NavigateArchersCommand { get;}
         public ICommand NavigateGroupsCommand { get;}
diff --git a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
index 9e94e47..3dd5455 100644
--- a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
@@ -27,7 +27,7 @@ namespace Apollon.WPF.ViewModels
         public int Rounds => SelectedTournament?.Rounds ?? 0;
         public int Targets => SelectedTournament?.Targets ?? 0;
 
-        public ICommand NavigateTournamentDetailsCommand { get; }
+        public ICommand NavigatePreparationCommand { get; }
 
         public OverviewDetailsViewModel(SelectedTournamentsStore selectedTournamentStore, NavigationStore navigationStore, ModalNavigationStore modalNavigationStore,TournamentsStore tournamentsStore)
         {
@@ -35,7 +35,7 @@ namespace Apollon.WPF.ViewModels
 
             _selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged;
 
-            NavigateTournamentDetailsCommand = new NavigateCommand<PreparationViewModel>(navigationStore, () => new PreparationViewModel(_selectedTournamentStore,navigationStore, modalNavigationStore, tournamentsStore));
+            NavigatePreparationCommand = new NavigateCommand<GroupsViewModel>(navigationStore, () => new GroupsViewModel(selectedTournamentStore, navigationStore, modalNavigationStore, tournamentsStore));
         }
 
         protected override void Dispose()
diff --git a/Apollon.WPF/ViewModels/OverviewViewModel.cs b/Apollon.WPF/ViewModels/OverviewViewModel.cs
index 7374a5e..5006320 100644
--- a/Apollon.WPF/ViewModels/OverviewViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewViewModel.cs
@@ -46,7 +46,7 @@ namespace Apollon.WPF.ViewModels
 
         public bool HasErrorMessage => !string.IsNullOrEmpty(ErrorMessage);
 
-        public ICommand AddTournamentCommand { get; }
+        public ICommand OpenAddTournamentCommand { get; }
         public ICommand LoadTournamentsCommand { get; } 
         public ICommand NavigateNameListCommand { get; }
 
@@ -57,7 +57,7 @@ namespace Apollon.WPF.ViewModels
             OverviewDetailsViewModel = new OverviewDetailsViewModel(selectedTournamentStore ,navigationStore, modalNavigationStore,tournamentStore);
 
             LoadTournamentsCommand = new LoadTournamentsCommand(this, tournamentStore);
-            AddTournamentCommand = new OpenAddTournamentCommand(tournamentStore, modalNavigationStore, navigationStore, selectedTournamentStore);
+            OpenAddTournamentCommand = new OpenAddTournamentCommand(tournamentStore, modalNavigationStore, navigationStore, selectedTournamentStore);
             NavigateNameListCommand = new NavigateCommand<NameListViewModel>(navigationStore, () => new NameListViewModel());
 
         }
diff --git a/Apollon.WPF/ViewModels/PreparationViewModel.cs b/Apollon.WPF/ViewModels/PreparationViewModel.cs
deleted file mode 100644
index 5a9ac41..0000000
--- a/Apollon.WPF/ViewModels/PreparationViewModel.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Apollon.Domain.Models;
-using Apollon.WPF.Commands;
-using Apollon.WPF.Stores;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace Apollon.WPF.ViewModels
-{
-    public class PreparationViewModel : ViewModelBase
-
-    {
-        public TournamentDetailsViewModel TournamentDetailsViewModel { get; }
-
-        public ICommand NavigateOverviewCommand { get; }
-
-        public PreparationViewModel(SelectedTournamentsStore selectedTournamentStore, NavigationStore navigationStore, ModalNavigationStore modalNavigationStore, TournamentsStore tournamentsStore)
-        {
-            TournamentDetailsViewModel = new TournamentDetailsViewModel(selectedTournamentStore);
-
-            NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(navigationStore, () => OverviewViewModel.LoadViewModel(selectedTournamentStore, modalNavigationStore, tournamentsStore, navigationStore));
-        }
-        
-    }
-}
diff --git a/Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml b/Apollon.WPF/Views/Components/NavBarPreparationView.xaml
similarity index 96%
rename from Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml
rename to Apollon.WPF/Views/Components/NavBarPreparationView.xaml
index 6c41de3..88dc0e3 100644
--- a/Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml
+++ b/Apollon.WPF/Views/Components/NavBarPreparationView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Apollon.WPF.Views.Components.NavBarView"
+<UserControl x:Class="Apollon.WPF.Views.Components.NavBarPreparationView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -7,7 +7,18 @@
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>  
+    <Grid>
+        <StackPanel>
+            <Button Width="35"
+                Height="35"
+                Background="Transparent"
+                BorderThickness="0"
+                Command="{Binding NavigateOverviewCommand}">
+                <iconPacks:PackIconMaterial Kind="ArrowLeft"
+                                        Height="25"
+                                        Width="35"
+                                        Foreground="#0000a0"/>
+            </Button>
             <Menu Height="450"
                   Background="Transparent"
                   Margin="0,20,0,0">
@@ -65,7 +76,7 @@
                                          HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"/>
                         </MenuItem.Icon>
-                    </MenuItem>                    
+                    </MenuItem>
                     <MenuItem Header="Teilnehmer setzen"
                               Template="{StaticResource Item_Template}">
                         <MenuItem.Icon>
@@ -76,7 +87,7 @@
                                          HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"/>
                         </MenuItem.Icon>
-                    </MenuItem>   
+                    </MenuItem>
                 </MenuItem>
                 <MenuItem Header="Daten"
                           Template="{StaticResource Menu_SubMenu_Template }"
@@ -362,7 +373,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuItem>
-            </Menu>            
-           
+            </Menu>
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml.cs b/Apollon.WPF/Views/Components/NavBarPreparationView.xaml.cs
similarity index 85%
rename from Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml.cs
rename to Apollon.WPF/Views/Components/NavBarPreparationView.xaml.cs
index f975869..9e40269 100644
--- a/Apollon.WPF/Views/Components/NavBarTournamentDetailsView.xaml.cs
+++ b/Apollon.WPF/Views/Components/NavBarPreparationView.xaml.cs
@@ -18,9 +18,9 @@ namespace Apollon.WPF.Views.Components
     /// <summary>
     /// Interaction logic for NavBarView.xaml
     /// </summary>
-    public partial class NavBarView : UserControl
+    public partial class NavBarPreparationView : UserControl
     {
-        public NavBarView()
+        public NavBarPreparationView()
         {
             InitializeComponent();
         }
diff --git a/Apollon.WPF/Views/Components/OverviewDetails.xaml b/Apollon.WPF/Views/Components/OverviewDetails.xaml
index f9cfa6b..4419b1c 100644
--- a/Apollon.WPF/Views/Components/OverviewDetails.xaml
+++ b/Apollon.WPF/Views/Components/OverviewDetails.xaml
@@ -289,7 +289,7 @@
                     Width="150"
                     Margin="10"
                     Cursor="Hand"
-                    Command="{Binding NavigateTournamentDetailsCommand}">
+                    Command="{Binding NavigatePreparationCommand}">
                  <Button.Style>                     
                         <Style TargetType="Button" BasedOn="{StaticResource ModernButton}">
                             <Setter Property="Visibility" Value="Hidden"/>
diff --git a/Apollon.WPF/Views/GroupsView.xaml b/Apollon.WPF/Views/GroupsView.xaml
index 2b81534..4d247a8 100644
--- a/Apollon.WPF/Views/GroupsView.xaml
+++ b/Apollon.WPF/Views/GroupsView.xaml
@@ -3,10 +3,30 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
+             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:local="clr-namespace:Apollon.WPF.Views"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <TextBlock Text="Gruppen" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+
+
+    <Grid Margin="20" >
+        <Grid.RowDefinitions>
+            <RowDefinition Height="120"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Border Grid.Column="2" Grid.Row="2"
+                BorderBrush="#0000a0"
+                BorderThickness="1"
+                CornerRadius="2">
+            <TextBlock Text="Gruppen" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        </Border>    
+
+        <components:TournamentDetails Grid.Column="1" Margin="0,35,0,10" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
+        <components:NavBarPreparationView Grid.Row="1" Margin="0 ,0 ,2, 30"/>
     </Grid>
 </UserControl>
diff --git a/Apollon.WPF/Views/OverviewView.xaml b/Apollon.WPF/Views/OverviewView.xaml
index 10d1742..7433400 100644
--- a/Apollon.WPF/Views/OverviewView.xaml
+++ b/Apollon.WPF/Views/OverviewView.xaml
@@ -61,7 +61,7 @@
                     Width="210"
                     Margin="40"
                     Cursor="Hand"
-                    Command="{Binding AddTournamentCommand}"/>
+                    Command="{Binding OpenAddTournamentCommand}"/>
 
             <Button Style="{StaticResource ModernButton}"
                     Content="Namenliste pflegen"
diff --git a/Apollon.WPF/Views/PreparationView.xaml b/Apollon.WPF/Views/PreparationView.xaml
deleted file mode 100644
index e6ca4f1..0000000
--- a/Apollon.WPF/Views/PreparationView.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<UserControl x:Class="Apollon.WPF.Views.PreparationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
-             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             xmlns:local="clr-namespace:Apollon.WPF.Views"
-             mc:Ignorable="d">
-    <Grid Margin="20" >
-        <Grid.RowDefinitions>
-            <RowDefinition Height="120"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="250"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-        <Border Grid.Column="2" Grid.Row="2"
-                BorderBrush="#0000a0"
-                BorderThickness="1"
-                CornerRadius="2"></Border>
-
-        <Button Width="35"
-                Height="35"
-                Background="Transparent"
-                BorderThickness="0"
-                HorizontalAlignment="Left"
-                Margin="5"
-                Command="{Binding NavigateOverviewCommand}">
-            <iconPacks:PackIconMaterial Kind="ArrowLeft"
-                                        Height="25"
-                                        Width="35"
-                                        Foreground="#0000a0"/>
-        </Button>
-
-        <components:TournamentDetails Grid.Column="1" Margin="0,35,0,10" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
-        <components:NavBarView Grid.Row="1" Margin="0 ,0 ,2, 30"/>
-    </Grid>
-</UserControl>
diff --git a/Apollon.WPF/Views/PreparationView.xaml.cs b/Apollon.WPF/Views/PreparationView.xaml.cs
deleted file mode 100644
index 5cef8ea..0000000
--- a/Apollon.WPF/Views/PreparationView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Apollon.WPF.Views
-{
-    /// <summary>
-    /// Interaction logic for TournamentDetailsView.xaml
-    /// </summary>
-    public partial class PreparationView : UserControl
-    {
-        public PreparationView()
-        {
-            InitializeComponent();
-        }
-    }
-}