From 56a433876ea3b97005f5e26354622dba3f3a28b1 Mon Sep 17 00:00:00 2001
From: Natlinux <97396587+Natlinux81@users.noreply.github.com>
Date: Sun, 27 Nov 2022 21:52:18 +0100
Subject: [PATCH] Navigation Service and Cleanup UI

---
 Apollon.WPF/Commands/NavigateCommand.cs       |  15 +-
 Apollon.WPF/MainWindow.xaml                   |   6 +
 Apollon.WPF/Services/NavigationService.cs     |  28 +
 Apollon.WPF/ViewModels/ArchersViewModel.cs    |   6 +
 Apollon.WPF/ViewModels/ClassesViewModel.cs    |   6 +
 Apollon.WPF/ViewModels/GroupsViewModel.cs     |   8 +-
 .../ViewModels/NavBarPreparationViewModel.cs  |  14 +-
 .../ViewModels/OverviewDetailsViewModel.cs    |   4 +-
 Apollon.WPF/ViewModels/OverviewViewModel.cs   |  10 +-
 Apollon.WPF/Views/ArchersView.xaml            |  23 +-
 Apollon.WPF/Views/ClassesView.xaml            |  23 +-
 .../Components/NavBarPreparationView.xaml     | 598 +++++++++---------
 .../Views/Components/TournamentDetails.xaml   |   8 +-
 Apollon.WPF/Views/GroupsView.xaml             |  37 +-
 14 files changed, 441 insertions(+), 345 deletions(-)
 create mode 100644 Apollon.WPF/Services/NavigationService.cs

diff --git a/Apollon.WPF/Commands/NavigateCommand.cs b/Apollon.WPF/Commands/NavigateCommand.cs
index 30dc6ec..6a20234 100644
--- a/Apollon.WPF/Commands/NavigateCommand.cs
+++ b/Apollon.WPF/Commands/NavigateCommand.cs
@@ -1,4 +1,5 @@
-using Apollon.WPF.Stores;
+using Apollon.WPF.Services;
+using Apollon.WPF.Stores;
 using Apollon.WPF.ViewModels;
 using System;
 using System.Collections.Generic;
@@ -11,18 +12,16 @@ namespace Apollon.WPF.Commands
     public class NavigateCommand<TViewModel> : CommandBase
         where TViewModel : ViewModelBase
     {
-        private readonly NavigationStore _navigationStore;
-        private readonly Func<TViewModel> _createViewModel;
+        private readonly NavigationService<TViewModel> _navigationService;
 
-        public NavigateCommand(NavigationStore navigationStore, Func<TViewModel> createViewModel)
+        public NavigateCommand(NavigationService<TViewModel> navigationService)
         {
-            _navigationStore = navigationStore;
-            _createViewModel = createViewModel;
+            _navigationService = navigationService;
         }
 
         public override void Execute(object parameter)
-        {            
-            _navigationStore.CurrentViewModel = _createViewModel();
+        {
+            _navigationService.Navigate();
         }
     }
 }
diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml
index 1bc1bc0..c00c74e 100644
--- a/Apollon.WPF/MainWindow.xaml
+++ b/Apollon.WPF/MainWindow.xaml
@@ -49,6 +49,12 @@
                 <DataTemplate DataType="{x:Type vms:GroupsViewModel}">
                     <views:GroupsView/>
                 </DataTemplate>
+                <DataTemplate DataType="{x:Type vms:ClassesViewModel}">
+                    <views:ClassesView/>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type vms:ArchersViewModel}">
+                    <views:ArchersView/>
+                </DataTemplate>
                 <DataTemplate DataType="{x:Type vms:NameListViewModel}">
                     <views:RootdatesView/>
                 </DataTemplate>
diff --git a/Apollon.WPF/Services/NavigationService.cs b/Apollon.WPF/Services/NavigationService.cs
new file mode 100644
index 0000000..8154cbd
--- /dev/null
+++ b/Apollon.WPF/Services/NavigationService.cs
@@ -0,0 +1,28 @@
+using Apollon.WPF.Stores;
+using Apollon.WPF.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Apollon.WPF.Services
+{
+    public class NavigationService<TViewModel>
+        where TViewModel : ViewModelBase
+    {
+        private readonly NavigationStore _navigationStore;
+        private readonly Func<TViewModel> _createViewModel;
+
+        public NavigationService(NavigationStore navigationStore, Func<TViewModel> createViewModel)
+        {
+            _navigationStore = navigationStore;
+            _createViewModel = createViewModel;
+        }
+
+        public void Navigate()
+        {
+            _navigationStore.CurrentViewModel = _createViewModel();
+        }
+    }
+}
diff --git a/Apollon.WPF/ViewModels/ArchersViewModel.cs b/Apollon.WPF/ViewModels/ArchersViewModel.cs
index 6395209..bcc6dc1 100644
--- a/Apollon.WPF/ViewModels/ArchersViewModel.cs
+++ b/Apollon.WPF/ViewModels/ArchersViewModel.cs
@@ -8,5 +8,11 @@ namespace Apollon.WPF.ViewModels
 {
     public class ArchersViewModel : ViewModelBase
     {
+        public NavBarPreparationViewModel NavBarPreparationViewModel { get; }
+
+        public ArchersViewModel(NavBarPreparationViewModel navBarPreparationViewModel)
+        {
+            NavBarPreparationViewModel = navBarPreparationViewModel;
+        }
     }
 }
diff --git a/Apollon.WPF/ViewModels/ClassesViewModel.cs b/Apollon.WPF/ViewModels/ClassesViewModel.cs
index 16480c5..ca180a9 100644
--- a/Apollon.WPF/ViewModels/ClassesViewModel.cs
+++ b/Apollon.WPF/ViewModels/ClassesViewModel.cs
@@ -8,5 +8,11 @@ namespace Apollon.WPF.ViewModels
 {
     public class ClassesViewModel : ViewModelBase
     {
+        public NavBarPreparationViewModel NavBarPreparationViewModel { get; }
+
+        public ClassesViewModel(NavBarPreparationViewModel navBarPreparationViewModel)
+        {
+            NavBarPreparationViewModel = navBarPreparationViewModel;
+        }
     }
 }
diff --git a/Apollon.WPF/ViewModels/GroupsViewModel.cs b/Apollon.WPF/ViewModels/GroupsViewModel.cs
index 2a5c4bc..bbbb639 100644
--- a/Apollon.WPF/ViewModels/GroupsViewModel.cs
+++ b/Apollon.WPF/ViewModels/GroupsViewModel.cs
@@ -1,5 +1,6 @@
 using Apollon.Domain.Models;
 using Apollon.WPF.Commands;
+using Apollon.WPF.Services;
 using Apollon.WPF.Stores;
 using System;
 using System.Collections.Generic;
@@ -14,13 +15,14 @@ namespace Apollon.WPF.ViewModels
     {      
 
         public TournamentDetailsViewModel TournamentDetailsViewModel { get; }
+        public NavBarPreparationViewModel NavBarPreparationViewModel { 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));
+                       
+            NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(new NavigationService<OverviewViewModel>(navigationStore, () => OverviewViewModel.LoadViewModel(selectedTournamentStore, modalNavigationStore, tournamentsStore, navigationStore)));
         }
     }
 }
diff --git a/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs b/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
index 9d3e5be..7579e95 100644
--- a/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
+++ b/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
@@ -1,4 +1,5 @@
 using Apollon.WPF.Commands;
+using Apollon.WPF.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,7 +13,16 @@ namespace Apollon.WPF.ViewModels
     {
         public ICommand NavigateOverviewCommand { get;}
         public ICommand NavigateGroupsCommand { get;}
-        public ICommand NavigateClassesCommand { get;}
-        public ICommand NavigateArchersCommand { get;}       
+        public ICommand NavigateClassesCommand { get;}  
+        public ICommand NavigateArchersCommand { get;}
+
+        public NavBarPreparationViewModel(NavigationService<OverviewViewModel> overviewNavigationService, NavigationService<GroupsViewModel> groupNavigationService, 
+            NavigationService<ClassesViewModel> classNavigationService, NavigationService<ArchersViewModel> archersNavigationService)
+        {
+            NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(overviewNavigationService);
+            NavigateGroupsCommand = new NavigateCommand<GroupsViewModel>(groupNavigationService);
+            NavigateClassesCommand = new NavigateCommand<ClassesViewModel>(classNavigationService);
+            NavigateArchersCommand = new NavigateCommand<ArchersViewModel>(archersNavigationService);
+        }
     }
 }
diff --git a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
index 3dd5455..d2e91c9 100644
--- a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
@@ -1,5 +1,6 @@
 using Apollon.Domain.Models;
 using Apollon.WPF.Commands;
+using Apollon.WPF.Services;
 using Apollon.WPF.Stores;
 using System;
 using System.Collections.Generic;
@@ -35,7 +36,8 @@ namespace Apollon.WPF.ViewModels
 
             _selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged;
 
-            NavigatePreparationCommand = new NavigateCommand<GroupsViewModel>(navigationStore, () => new GroupsViewModel(selectedTournamentStore, navigationStore, modalNavigationStore, tournamentsStore));
+            NavigatePreparationCommand = new NavigateCommand<GroupsViewModel>(new NavigationService<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 5006320..f38afc2 100644
--- a/Apollon.WPF/ViewModels/OverviewViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewViewModel.cs
@@ -1,12 +1,7 @@
 using Apollon.WPF.Commands;
-using Apollon.Domain.Models;
 using Apollon.WPF.Stores;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Input;
+using Apollon.WPF.Services;
 
 namespace Apollon.WPF.ViewModels
 {
@@ -58,7 +53,8 @@ namespace Apollon.WPF.ViewModels
 
             LoadTournamentsCommand = new LoadTournamentsCommand(this, tournamentStore);
             OpenAddTournamentCommand = new OpenAddTournamentCommand(tournamentStore, modalNavigationStore, navigationStore, selectedTournamentStore);
-            NavigateNameListCommand = new NavigateCommand<NameListViewModel>(navigationStore, () => new NameListViewModel());
+            NavigateNameListCommand = new NavigateCommand<NameListViewModel>(new NavigationService<NameListViewModel>(
+                navigationStore, () => new NameListViewModel()));
 
         }
 
diff --git a/Apollon.WPF/Views/ArchersView.xaml b/Apollon.WPF/Views/ArchersView.xaml
index 96d9aff..2992830 100644
--- a/Apollon.WPF/Views/ArchersView.xaml
+++ b/Apollon.WPF/Views/ArchersView.xaml
@@ -3,10 +3,25 @@
              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:local="clr-namespace:Apollon.WPF.Views"
+             xmlns:local="clr-namespace:Apollon.WPF.Views" xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <TextBlock Text="Teilnehmer" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+             d:DesignHeight="680" d:DesignWidth="1100">
+    <Grid Margin="15, 35">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="80"/>
+            <RowDefinition Height="550"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250"/>
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Border BorderThickness="2" BorderBrush="{StaticResource BrushPrimary1}"
+                Grid.Row="1" Grid.Column="1"
+                CornerRadius="5">
+            <TextBlock Text="Teilnehmer" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        </Border>
+
+        <components:TournamentDetails Grid.Column="1" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
+        <components:NavBarPreparationView Grid.RowSpan="2" DataContext="{Binding NavBarPreparationViewModel}"/>
     </Grid>
 </UserControl>
diff --git a/Apollon.WPF/Views/ClassesView.xaml b/Apollon.WPF/Views/ClassesView.xaml
index a33f8c4..1d5e42d 100644
--- a/Apollon.WPF/Views/ClassesView.xaml
+++ b/Apollon.WPF/Views/ClassesView.xaml
@@ -4,9 +4,26 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Apollon.WPF.Views"
+             xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <TextBlock Text="Klassen" VerticalAlignment="Center" HorizontalAlignment="Center"/>    
+             d:DesignHeight="680" d:DesignWidth="1100">
+    <Grid Margin="1535">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="80"/>
+            <RowDefinition Height="550"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250"/>
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Border BorderThickness="2" BorderBrush="{StaticResource BrushPrimary1}"
+                Grid.Row="1" Grid.Column="1"
+                CornerRadius="5">
+            <TextBlock Text="Klassen" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        </Border>
+
+        <components:TournamentDetails Grid.Column="1" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
+        <components:NavBarPreparationView Grid.RowSpan="2" DataContext="{Binding NavBarPreparationViewModel}"/>
     </Grid>
+
 </UserControl>
diff --git a/Apollon.WPF/Views/Components/NavBarPreparationView.xaml b/Apollon.WPF/Views/Components/NavBarPreparationView.xaml
index 88dc0e3..e36540d 100644
--- a/Apollon.WPF/Views/Components/NavBarPreparationView.xaml
+++ b/Apollon.WPF/Views/Components/NavBarPreparationView.xaml
@@ -6,8 +6,12 @@
              xmlns:local="clr-namespace:Apollon.WPF.Views.Components"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="680" d:DesignWidth="1100">
     <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="80"/>
+            <RowDefinition Height="auto"/>
+        </Grid.RowDefinitions>
         <StackPanel>
             <Button Width="35"
                 Height="35"
@@ -19,15 +23,25 @@
                                         Width="35"
                                         Foreground="#0000a0"/>
             </Button>
-            <Menu Height="450"
+
+            <TextBlock Text="Vorbereitung"
+                       Foreground="#0000a0"
+                           FontFamily="Arial"
+                           FontWeight="Bold"
+                           FontSize="24"
+                       HorizontalAlignment="Center"
+                       Margin="0 15"/>           
+        </StackPanel>
+        <Menu Height="350"
                   Background="Transparent"
-                  Margin="0,20,0,0">
-                <Menu.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <VirtualizingStackPanel Orientation="Vertical"/>
-                    </ItemsPanelTemplate>
-                </Menu.ItemsPanel>
-                <MenuItem Header="Turnierdaten"
+              Grid.Row="1"
+              Margin=" 0 40">
+            <Menu.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <VirtualizingStackPanel Orientation="Vertical"/>
+                </ItemsPanelTemplate>
+            </Menu.ItemsPanel>
+            <MenuItem Header="Turnierdaten"
                           Template="{StaticResource Menu_SubMenu_Template}"
                           Foreground="#0000a0"
                            FontFamily="Arial"
@@ -35,61 +49,64 @@
                            FontSize="16"
                            VerticalAlignment="Center"
                            HorizontalAlignment="Center"
-                          Margin="0 40">
+                          Margin="0 20">
+                <MenuItem.Icon>
+                    <iconPacks:PackIconMaterial Kind="BowArrow"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                </MenuItem.Icon>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}"
+                              Command="{Binding NavigateGroupsCommand}">
                     <MenuItem.Icon>
-                        <iconPacks:PackIconMaterial Kind="BowArrow"
+                        <iconPacks:PackIconMaterial Kind="AccountMultiple"
                                         Height="20"
                                         Width="20"
                                         Foreground="#0000a0"
                                          HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"/>
                     </MenuItem.Icon>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="AccountMultiple"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Klassen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="ArrowProjectileMultiple"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Namenliste"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="BadgeAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Teilnehmer setzen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="ArrowProjectile"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
                 </MenuItem>
-                <MenuItem Header="Daten"
+                <MenuItem Header="Klassen"
+                              Template="{StaticResource Item_Template}"
+                              Command="{Binding NavigateClassesCommand}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="ArrowProjectileMultiple"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Namenliste"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="BadgeAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Teilnehmer setzen"
+                              Template="{StaticResource Item_Template}"
+                              Command="{Binding NavigateArchersCommand}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="ArrowProjectile"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+            <MenuItem Header="Daten"
                           Template="{StaticResource Menu_SubMenu_Template }"
                           Foreground="#0000a0"
                            FontFamily="Arial"
@@ -98,6 +115,16 @@
                            VerticalAlignment="Center"
                            HorizontalAlignment="Center"
                            Margin="0 10">
+                <MenuItem.Icon>
+                    <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                </MenuItem.Icon>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
                     <MenuItem.Icon>
                         <iconPacks:PackIconMaterial Kind="FileAccount"
                                         Height="20"
@@ -106,85 +133,75 @@
                                          HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"/>
                     </MenuItem.Icon>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
                 </MenuItem>
-                <MenuItem Header="Berichte"
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+            <MenuItem Header="Berichte"
                           Template="{StaticResource Menu_SubMenu_Template }"
                           Foreground="#0000a0"
                            FontFamily="Arial"
@@ -192,6 +209,16 @@
                            FontSize="16"
                            VerticalAlignment="Center"
                            HorizontalAlignment="Center">
+                <MenuItem.Icon>
+                    <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                </MenuItem.Icon>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
                     <MenuItem.Icon>
                         <iconPacks:PackIconMaterial Kind="FileAccount"
                                         Height="20"
@@ -200,85 +227,75 @@
                                          HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"/>
                     </MenuItem.Icon>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
                 </MenuItem>
-                <MenuItem Header="Klassenprüfung"
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+            <MenuItem Header="Klassenprüfung"
                           Template="{StaticResource Menu_SubMenu_Template }"
                           Foreground="#0000a0"
                            FontFamily="Arial"
@@ -287,6 +304,16 @@
                            VerticalAlignment="Center"
                            HorizontalAlignment="Center"
                            Margin="0 40">
+                <MenuItem.Icon>
+                    <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                </MenuItem.Icon>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
                     <MenuItem.Icon>
                         <iconPacks:PackIconMaterial Kind="FileAccount"
                                         Height="20"
@@ -295,85 +322,74 @@
                                          HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"/>
                     </MenuItem.Icon>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Gruppen"
-                              Template="{StaticResource Item_Template}">
-                        <MenuItem.Icon>
-                            <iconPacks:PackIconMaterial Kind="FileAccount"
-                                        Height="20"
-                                        Width="20"
-                                        Foreground="#0000a0"
-                                         HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
                 </MenuItem>
-            </Menu>
-        </StackPanel>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Gruppen"
+                              Template="{StaticResource Item_Template}">
+                    <MenuItem.Icon>
+                        <iconPacks:PackIconMaterial Kind="FileAccount"
+                                        Height="20"
+                                        Width="20"
+                                        Foreground="#0000a0"
+                                         HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+        </Menu>
     </Grid>
 </UserControl>
diff --git a/Apollon.WPF/Views/Components/TournamentDetails.xaml b/Apollon.WPF/Views/Components/TournamentDetails.xaml
index 271cb1d..ec5e921 100644
--- a/Apollon.WPF/Views/Components/TournamentDetails.xaml
+++ b/Apollon.WPF/Views/Components/TournamentDetails.xaml
@@ -5,8 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Apollon.WPF.Views.Components"
              mc:Ignorable="d" 
-             d:DesignHeight="100" d:DesignWidth="800">
-    <Grid>
+             d:DesignHeight="680" d:DesignWidth="1100">
+    <Grid Height="80">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="auto"/>
             <ColumnDefinition Width="600"/>
@@ -14,7 +14,8 @@
         </Grid.ColumnDefinitions>
         <Image Grid.Column="0"
                Source="{Binding Logo}"
-               Width="80"
+               Width="70"
+               Height="70"
                VerticalAlignment="Center"/>
         <StackPanel Grid.Column="1">            
             <WrapPanel HorizontalAlignment="Center">
@@ -81,6 +82,7 @@
         <Image Grid.Column="2"
                Source="{Binding CompetitionImage}"
                Width="70"
+               Height="70"
                VerticalAlignment="Center"/>
     </Grid>
 </UserControl>
diff --git a/Apollon.WPF/Views/GroupsView.xaml b/Apollon.WPF/Views/GroupsView.xaml
index a147938..84b0275 100644
--- a/Apollon.WPF/Views/GroupsView.xaml
+++ b/Apollon.WPF/Views/GroupsView.xaml
@@ -3,34 +3,25 @@
              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"
+             xmlns:components="clr-namespace:Apollon.WPF.Views.Components" 
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-
-
-    <Grid Margin="20" >
+             d:DesignHeight="680" d:DesignWidth="1100">
+    <Grid Margin="15,35">
         <Grid.RowDefinitions>
-            <RowDefinition Height="120"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="80"/>
+            <RowDefinition Height="550"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="250"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Border Grid.Column="2" Grid.Row="2"
-                BorderBrush="#0000a0"
-                BorderThickness="1"
-                CornerRadius="2">
-            <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                <TextBlock Text="Gruppen" />
-                <!--<TextBlock Text="{Binding Groups}"/>-->
-            </StackPanel>
-            
-        </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"/>
+        <Border BorderThickness="2" BorderBrush="{StaticResource BrushPrimary1}"
+                Grid.Row="1" Grid.Column="1"
+                CornerRadius="5">
+            <TextBlock Text="Groups" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        </Border>
+                 
+        <components:TournamentDetails Grid.Column="1" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
+        <components:NavBarPreparationView Grid.RowSpan="2" DataContext="{Binding NavBarPreparationViewModel}"/>
     </Grid>
 </UserControl>