diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml
index 954819e..0bec6be 100644
--- a/Apollon.WPF/MainWindow.xaml
+++ b/Apollon.WPF/MainWindow.xaml
@@ -3,7 +3,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Apollon.WPF" xmlns:views="clr-namespace:Apollon.WPF.Views"
+        xmlns:local="clr-namespace:Apollon.WPF" 
+        xmlns:views="clr-namespace:Apollon.WPF.Views"
+        xmlns:vms="clr-namespace:Apollon.WPF.ViewModels" 
+        xmlns:custom="clr-namespace:ModalControl;assembly=ModalControl"
         mc:Ignorable="d"
         Title="Apollon Auswertung Bogen"
         Height="680"
@@ -13,6 +16,11 @@
         AllowsTransparency="True"
         WindowStyle="None"
         ResizeMode="CanResizeWithGrip">
+    <Window.Resources>
+        <DataTemplate DataType="{x:Type vms:AddTournametViewModel}">
+            <views:AddTournamentView/>
+        </DataTemplate>
+    </Window.Resources>
     <ScrollViewer HorizontalScrollBarVisibility="Auto"
                   VerticalScrollBarVisibility="Auto">
         <Grid>
@@ -20,6 +28,11 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
+
+            <custom:Modal Grid.RowSpan="2" Panel.ZIndex="1" IsOpen="{Binding IsModalOpen}">
+
+                <ContentControl Margin="100 50 100 50" Content="{Binding CurrentModalViewModel}"/>
+            </custom:Modal>
             
             <views:OverviewView Grid.RowSpan="2"
                                 DataContext="{Binding OverviewViewModel}"
diff --git a/Apollon.WPF/Themes/ModalTextblockTheme.xaml b/Apollon.WPF/Themes/ModalTextblockTheme.xaml
index a9bd094..86eedf2 100644
--- a/Apollon.WPF/Themes/ModalTextblockTheme.xaml
+++ b/Apollon.WPF/Themes/ModalTextblockTheme.xaml
@@ -4,7 +4,8 @@
            x:Key="ModalTextBlock">
         <Setter Property="FontFamily" Value="Arial"/>
         <Setter Property="FontWeight" Value="Bold"/>
-        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontSize" Value="18"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Foreground" Value="#0000a0"/>
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Apollon.WPF/ViewModels/MainViewModel.cs b/Apollon.WPF/ViewModels/MainViewModel.cs
index c3d07bf..1609bb1 100644
--- a/Apollon.WPF/ViewModels/MainViewModel.cs
+++ b/Apollon.WPF/ViewModels/MainViewModel.cs
@@ -21,6 +21,8 @@ namespace Apollon.WPF.ViewModels
             OverviewViewModel = overviewViewModel;
 
             _modalNavigationStore.CurrentViewModelChanged += ModalNavigationStore_CurrentViewModelChanged;
+
+            //_modalNavigationStore.CurrentViewModel = new AddTournametViewModel();
         }
 
         protected override void Dispose()
diff --git a/Apollon.WPF/Views/AddTournamentView.xaml b/Apollon.WPF/Views/AddTournamentView.xaml
index 6a8b098..5c67bdb 100644
--- a/Apollon.WPF/Views/AddTournamentView.xaml
+++ b/Apollon.WPF/Views/AddTournamentView.xaml
@@ -3,17 +3,16 @@
              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:components="clr-namespace:Apollon.WPF.Views.Components"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             xmlns:local="clr-namespace:Apollon.WPF.Views" 
+             xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
+             mc:Ignorable="d">
     <Grid>
-        <TextBlock Text="Erstellen eines Tourniers"
+        <TextBlock Text="Turniers erstellen"
                        TextAlignment="Center"
                        FontFamily="Arial"
                        FontWeight="Bold"
                        FontSize="25"
-                       Foreground="#0000a0"
-                       Margin="10"/>
-        <components:AddEditDetails Margin="20 40"/>
+                       Foreground="#0000a0"/>
+        <components:AddEditDetails Margin="0 50 0 0"/>
     </Grid>
 </UserControl>
diff --git a/Apollon.WPF/Views/AddTournamentView.xaml.cs b/Apollon.WPF/Views/AddTournamentView.xaml.cs
index 2a32612..bc14985 100644
--- a/Apollon.WPF/Views/AddTournamentView.xaml.cs
+++ b/Apollon.WPF/Views/AddTournamentView.xaml.cs
@@ -24,5 +24,6 @@ namespace Apollon.WPF.Views
         {
             InitializeComponent();
         }
+       
     }
 }
diff --git a/Apollon.WPF/Views/Components/AddEditDetails.xaml b/Apollon.WPF/Views/Components/AddEditDetails.xaml
index cebf2d3..2750de6 100644
--- a/Apollon.WPF/Views/Components/AddEditDetails.xaml
+++ b/Apollon.WPF/Views/Components/AddEditDetails.xaml
@@ -4,85 +4,113 @@
              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.Components"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid Height="450">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="auto"/>
-            <ColumnDefinition Width="*" MaxWidth="250"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0">            
+             mc:Ignorable="d">
+    <Grid>        
+            <Grid.RowDefinitions>
+                <RowDefinition Height="55"/>
+                <RowDefinition Height="55"/>
+                <RowDefinition Height="55"/>
+                <RowDefinition Height="55"/>
+                <RowDefinition Height="55"/>
+                <RowDefinition Height="55"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="180"/>
+                <ColumnDefinition Width="400"/>
+            </Grid.ColumnDefinitions>
+            
             <TextBlock Text="Veranstalter: "                       
-                       Style="{StaticResource ModalTextBlock}"
-                       Margin="0 20 0 0"/>                        
-            <TextBlock Text="Tourniername: "
-                       Style="{StaticResource ModalTextBlock}"
-                       Margin="0 20 0 0"/>
-            <TextBlock Text="Kategorie: "                       
-                       Style="{StaticResource ModalTextBlock}"
-                       Margin="0 20 0 0"/>
-            <TextBlock Text="Startdatum: "
-                       Style="{StaticResource ModalTextBlock}"
-                       Margin="0 20 0 0"/>
-            <TextBlock Text="Enddatum: "
-                       Style="{StaticResource ModalTextBlock}"
-                       Margin="0 20 0 0"/>
-            <TextBlock Text="Veranstaltungsort: "
-                       Style="{StaticResource ModalTextBlock}"
-                       Margin="0 20 0 0"/>
-        </StackPanel>
-        
-        <StackPanel Grid.Column="1">
-            <TextBox Text="{Binding Organisation}"
-                     FontFamily="Arial"
-                     FontSize="14"                     
-                     Margin="0 15 0 0"
-                     Padding="2"/>            
-            <TextBox Text="{Binding Tournamentname}"
-                     TextAlignment="Center"
-                     FontFamily="Arial"                     
-                     FontSize="14"                     
-                     Margin="0 20 0 0"
-                     Padding="2"
-                     />
-            <ComboBox ItemsSource="{Binding Category}"                     
-                      Margin="0 20 0 15"/>
+                       Style="{StaticResource ModalTextBlock}"/>
+            <TextBlock Grid.Row="1"
+                       Text="Turniername: "
+                       Style="{StaticResource ModalTextBlock}"/>
+            <TextBlock Grid.Row="2"
+                       Text="Kategorie: "                       
+                       Style="{StaticResource ModalTextBlock}"/>
+            <TextBlock Grid.Row="3"
+                       Text="Startdatum: "
+                       Style="{StaticResource ModalTextBlock}"/>
+            <TextBlock Grid.Row="4"
+                       Text="Enddatum: "
+                       Style="{StaticResource ModalTextBlock}"/>
+            <TextBlock Grid.Row="5"
+                       Text="Veranstaltungsort: "
+                       Style="{StaticResource ModalTextBlock}"/>
 
-            <DatePicker MaxWidth="150"
-                        HorizontalAlignment="Center"/>
-            
-            <DatePicker MaxWidth="150"
-                        HorizontalAlignment="Center"/>
-            
-            <TextBox Text="{Binding Location}"
-                     TextAlignment="Center"
+            <TextBox Grid.Column="1"
+                     Text="{Binding Organisation}"
+                     FontFamily="Arial"
+                     FontSize="16"
+                     Height="30"
+                     Background="LightGray"
+                     VerticalContentAlignment="Center"/>
+            <TextBox Grid.Row="1"
+                     Grid.Column="1"
+                     Text="{Binding Tournamentname}"
                      FontFamily="Arial"                     
-                     FontSize="14"                     
-                     Margin="0 20 0 0"/>
-        </StackPanel>
-        <WrapPanel Grid.Row="1"
-                   Grid.ColumnSpan="2"
-                   HorizontalAlignment="Center"
-                   Margin="20">
+                     FontSize="16"
+                     Height="30"
+                     VerticalContentAlignment="Center"
+                     Background="LightGray"/>
+            <ComboBox Grid.Row="2"
+                      Grid.Column="1"
+                      ItemsSource="{Binding Category}"
+                      Height="30"
+                      FontSize="16"
+                      HorizontalContentAlignment="Center"
+                      VerticalContentAlignment="Center"/>
+
+            <DatePicker Grid.Row="3"
+                        Grid.Column="1"                        
+                        Height="30"
+                        FontSize="16"
+                        Width="160"
+                        HorizontalAlignment="Left"/>
+
+            <DatePicker Grid.Row="4"
+                        Grid.Column="1"                        
+                        Height="30"
+                        FontSize="16"
+                        Width="160"
+                        HorizontalAlignment="Left"/>
+
+        <TextBox Grid.Row="5"
+                     Grid.Column="1"
+                     Text="{Binding Location}"
+                     FontFamily="Arial"                     
+                     FontSize="16"
+                     Height="30"
+                     VerticalContentAlignment="Center"
+                     Background="LightGray"/>
+
+        <Grid Grid.Row="6"
+              Grid.ColumnSpan="2"
+              Margin="0 30 0 0"
+              Width="450"
+              HorizontalAlignment="Center">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
             <Button Content="Speichern"
                     Command="{Binding SubmitCommand}"
                     Style="{StaticResource ModernButton}"
-                    Width="100"
-                    Height="25"
-                    HorizontalAlignment="Left"
-                    Margin="0 0 80 0"
-                    IsEnabled="{Binding CanSubmit}">                
+                    Width="120"
+                    Height="35" 
+                    FontSize="16"
+                    IsEnabled="{Binding CanSubmit}">
             </Button>
             <Button Content="Abbrechen"
                     Command="{Binding CancelCommand}"
                     Style="{StaticResource ModernButton}"
-                    Width="100"
-                    Height="25"/>
-        </WrapPanel>
-        
-    </Grid>
+                    Width="120"
+                    Height="35"
+                    FontSize="16"
+                    Grid.Column="1"/>            
+        </Grid>
+
+            
+        </Grid> 
+    
 </UserControl>
diff --git a/Apollon.WPF/Views/Components/OverViewListing.xaml b/Apollon.WPF/Views/Components/OverViewListing.xaml
index 7058379..7c9ee73 100644
--- a/Apollon.WPF/Views/Components/OverViewListing.xaml
+++ b/Apollon.WPF/Views/Components/OverViewListing.xaml
@@ -37,6 +37,7 @@
                                     Background="Transparent"
                                     BorderThickness="0"
                                     Cursor="Hand"
+                                    ToolTip="Löschen"
                                     Command="{Binding DeleteCommand}">
                                 <iconPacks:PackIconMaterial Kind="TrashCan"
                                                         VerticalAlignment="Center"
diff --git a/Apollon.WPF/Views/Components/OverviewDetails.xaml b/Apollon.WPF/Views/Components/OverviewDetails.xaml
index eae35d9..ab69274 100644
--- a/Apollon.WPF/Views/Components/OverviewDetails.xaml
+++ b/Apollon.WPF/Views/Components/OverviewDetails.xaml
@@ -12,7 +12,7 @@
                 CornerRadius="10">
         </Border>
 
-        <TextBlock Text="erstelle eine neues Tournier oder wähle ein vorhandenes Tournier um es zu bearbeiten!"
+        <TextBlock Text="klicke auf neues Turnier erstellen oder wähle ein vorhandenes Turnier um es zu bearbeiten!"
                        TextAlignment="Center"
                        VerticalAlignment="Center"
                        FontFamily="Arial"
diff --git a/Apollon.WPF/Views/EditTournamentView.xaml b/Apollon.WPF/Views/EditTournamentView.xaml
new file mode 100644
index 0000000..39d6739
--- /dev/null
+++ b/Apollon.WPF/Views/EditTournamentView.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="Apollon.WPF.Views.EditTournamentView"
+             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:local="clr-namespace:Apollon.WPF.Views"
+             xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
+             mc:Ignorable="d">
+    <Grid>
+        <TextBlock Text="Turniers Bearbeiten"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="25"
+                       Foreground="#0000a0"/>
+        <components:AddEditDetails Margin="0 50 0 0"/>
+    </Grid>
+</UserControl>
diff --git a/Apollon.WPF/Views/EditTournamentView.xaml.cs b/Apollon.WPF/Views/EditTournamentView.xaml.cs
new file mode 100644
index 0000000..7023f44
--- /dev/null
+++ b/Apollon.WPF/Views/EditTournamentView.xaml.cs
@@ -0,0 +1,28 @@
+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 EditTournamentView.xaml
+    /// </summary>
+    public partial class EditTournamentView : UserControl
+    {
+        public EditTournamentView()
+        {
+            InitializeComponent();
+        }
+    }
+}