diff --git a/Apollon.WPF/Images/Scheibe.png b/Apollon.WPF/Images/Scheibe.png
deleted file mode 100644
index 528c07e..0000000
Binary files a/Apollon.WPF/Images/Scheibe.png and /dev/null differ
diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml
index 782603e..3eb2f42 100644
--- a/Apollon.WPF/MainWindow.xaml
+++ b/Apollon.WPF/MainWindow.xaml
@@ -31,8 +31,8 @@
             </Grid.RowDefinitions>
 
             <custom:Modal Grid.RowSpan="2" Panel.ZIndex="1" IsOpen="{Binding IsModalOpen}">
-
-                <ContentControl Margin="100 50 100 50" Content="{Binding CurrentModalViewModel}"/>
+            
+                <ContentControl Margin="30" Content="{Binding CurrentModalViewModel}"/>
             </custom:Modal>
             
             <views:OverviewView Grid.RowSpan="2"
diff --git a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
index 6f622b0..0d45cf3 100644
--- a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
@@ -27,18 +27,20 @@ namespace Apollon.WPF.ViewModels
         {
            _selectedTournamentStore = selectedTournamentStore;
 
-            _selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged;
+            _selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged;           
         }
 
         protected override void Dispose()
         {
+           
             _selectedTournamentStore.SelectedTournamentChanged -= SelectedTournamentStore_SelectedTournamentChanged; 
+
             base.Dispose();
         }
 
         private void SelectedTournamentStore_SelectedTournamentChanged()
         {
-            OnPropertyChanged(nameof(HasSelectedTournament));
+            //OnPropertyChanged(nameof(HasSelectedTournament));
             OnPropertyChanged(nameof(Organisation));
             OnPropertyChanged(nameof(TournamentName));
             OnPropertyChanged(nameof(Competition));
diff --git a/Apollon.WPF/Views/Components/AddEditDetails.xaml b/Apollon.WPF/Views/Components/AddEditDetails.xaml
index 8669a12..411ed70 100644
--- a/Apollon.WPF/Views/Components/AddEditDetails.xaml
+++ b/Apollon.WPF/Views/Components/AddEditDetails.xaml
@@ -22,86 +22,109 @@
         </Grid.ColumnDefinitions>
 
         <TextBlock Text="Veranstalter: "                       
-                       Style="{StaticResource ModalTextBlock}"/>
+                   Style="{StaticResource ModalTextBlock}"/>
+        
         <TextBlock Grid.Row="1"
-                       Text="Turniername: "
-                       Style="{StaticResource ModalTextBlock}"/>
-        <TextBlock Grid.Row="2"
-                       Text="Wettkampfart: "                       
-                       Style="{StaticResource ModalTextBlock}"/>
+                   Text="Turniername: "
+                   Style="{StaticResource ModalTextBlock}"/>
+        
+        <TextBlock Grid.Row="2"                   
+                   Text="Wettkampfart: "                    
+                   Style="{StaticResource ModalTextBlock}"/>
+        
         <TextBlock Grid.Row="3"
-                       Text="Startdatum: "
-                       Style="{StaticResource ModalTextBlock}"/>
+                   Text="Startdatum: "
+                   Style="{StaticResource ModalTextBlock}"/>
+        
         <TextBlock Grid.Row="4"
-                       Text="Enddatum: "
-                       Style="{StaticResource ModalTextBlock}"/>
+                   Text="Enddatum: "
+                   Style="{StaticResource ModalTextBlock}"/>
+        
         <TextBlock Grid.Row="5"
-                       Text="Veranstaltungsort: "
-                       Style="{StaticResource ModalTextBlock}"/>
+                   Text="Veranstaltungsort: "
+                   Style="{StaticResource ModalTextBlock}"/>
+        
         <TextBlock Grid.Row="6"
-                       Text="Durchgänge: "
-                       Style="{StaticResource ModalTextBlock}"/>
+                   Text="Durchgänge: "
+                   Style="{StaticResource ModalTextBlock}"/>
 
         <TextBox Grid.Column="1"
-                     Text="{Binding Organisation}"
-                     FontFamily="Arial"
-                     FontSize="16"
-                     Height="30"
-                     Background="LightGray"
-                     VerticalContentAlignment="Center"/>
+                 Text="{Binding Organisation}"
+                 FontFamily="Arial"
+                 FontSize="16"
+                 Height="30"
+                 Background="LightGray"
+                 VerticalContentAlignment="Center"/>
+        
         <TextBox Grid.Row="1"
-                     Grid.Column="1"
-                     Text="{Binding TournamentName, UpdateSourceTrigger=PropertyChanged}"
-                     FontFamily="Arial"                     
-                     FontSize="16"
-                     Height="30"
-                     VerticalContentAlignment="Center"                     
-                     Background="LightGray"/>
-        <ComboBox     Grid.Row="2"
-                      Text="{Binding Competition}"
-                      IsEditable="True"
-                      Grid.Column="1"
-                      Height="30"
-                      Width="150"
-                      FontSize="16"
-                      
-                      VerticalContentAlignment="Center"
-                      HorizontalAlignment="Left"/>
+                 Grid.Column="1"
+                 Text="{Binding TournamentName, UpdateSourceTrigger=PropertyChanged}"
+                 FontFamily="Arial"                     
+                 FontSize="16"
+                 Height="30"
+                 VerticalContentAlignment="Center"                     
+                 Background="LightGray"/>
 
-        <DatePicker     SelectedDateFormat="Long"
-                        Grid.Row="3"
-                        SelectedDate="{Binding StartDate}"
-                        Grid.Column="1"                        
-                        Height="30"
-                        FontSize="16"                        
-                        HorizontalAlignment="Left"/>
+        <ComboBox Grid.Row="2"
+                  x:Name="ComboBox"                   
+                  Text="{Binding Competition}"
+                  IsReadOnly="False"
+                  IsEditable="True"
+                  Grid.Column="1"
+                  Height="30"
+                  Width="150"
+                  FontSize="16"
+                  VerticalContentAlignment="Center"
+                  HorizontalAlignment="Left">
+            <ComboBoxItem Content="Halle"></ComboBoxItem>
+            <ComboBoxItem Content="im Freien"></ComboBoxItem>
+            <ComboBoxItem Content="Feld"></ComboBoxItem>
+            <ComboBoxItem Content="3 D"></ComboBoxItem>            
+        </ComboBox>
 
-        <DatePicker     SelectedDateFormat="Long"
-                        Grid.Row="4"
-                        SelectedDate="{Binding EndDate}"
-                        Grid.Column="1"                        
-                        Height="30"
-                        FontSize="16"                        
-                        HorizontalAlignment="Left"/>
+        <Image x:Name="CompetitionImage"                 
+               Grid.Row="2"
+               Grid.Column="1"
+               Grid.RowSpan="2"
+               Height="80"
+               Width="80"
+               HorizontalAlignment="Right"
+               Margin="0 0 80 0"/>
+        
+        <DatePicker SelectedDateFormat="Long"
+                    Grid.Row="3"
+                    SelectedDate="{Binding StartDate}"
+                    Grid.Column="1"                        
+                    Height="30"
+                    FontSize="14"                        
+                    HorizontalAlignment="Left"/>
+                    
+        <DatePicker SelectedDateFormat="Long"
+                    Grid.Row="4"
+                    SelectedDate="{Binding EndDate}"
+                    Grid.Column="1"                        
+                    Height="30"
+                    FontSize="14"                        
+                    HorizontalAlignment="Left"/>
 
         <TextBox Grid.Row="5"
-                     Grid.Column="1"
-                     Text="{Binding Location}"
-                     FontFamily="Arial"                     
-                     FontSize="16"
-                     Height="30"
-                     VerticalContentAlignment="Center"
-                     Background="LightGray"/>
+                 Grid.Column="1"
+                 Text="{Binding Location}"
+                 FontFamily="Arial"                     
+                 FontSize="16"
+                 Height="30"
+                 VerticalContentAlignment="Center"
+                 Background="LightGray"/>
         <TextBox Grid.Row="6"
-                     Grid.Column="1"
-                     Text="{Binding Rounds}"
-                     FontFamily="Arial"                     
-                     FontSize="16"
-                     Height="30"
-                     Width="50"
-                     VerticalContentAlignment="Center"
-                     HorizontalAlignment="Left"
-                     Background="LightGray"/>
+                 Grid.Column="1"
+                 Text="{Binding Rounds}"
+                 FontFamily="Arial"                     
+                 FontSize="16"
+                 Height="30"
+                 Width="50"
+                 VerticalContentAlignment="Center"
+                 HorizontalAlignment="Left"
+                 Background="LightGray"/>
 
         <Grid Grid.Row="7"
               Grid.ColumnSpan="2"
@@ -112,14 +135,15 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
+
             <Button Content="Speichern"
                     Command="{Binding SubmitCommand}"
                     Style="{StaticResource ModernButton}"
                     Width="120"
                     Height="35" 
                     FontSize="16"
-                    IsEnabled="{Binding CanSubmit}">
-            </Button>
+                    IsEnabled="{Binding CanSubmit}"/>
+            
             <Button Content="Abbrechen"
                     Command="{Binding CancelCommand}"
                     Style="{StaticResource ModernButton}"
@@ -128,8 +152,5 @@
                     FontSize="16"
                     Grid.Column="1"/>
         </Grid>
-
-
     </Grid>
-
 </UserControl>
diff --git a/Apollon.WPF/Views/Components/AddEditDetails.xaml.cs b/Apollon.WPF/Views/Components/AddEditDetails.xaml.cs
index 8092b98..a3fb04e 100644
--- a/Apollon.WPF/Views/Components/AddEditDetails.xaml.cs
+++ b/Apollon.WPF/Views/Components/AddEditDetails.xaml.cs
@@ -22,7 +22,8 @@ namespace Apollon.WPF.Views.Components
     {
         public AddEditDetails()
         {
-            InitializeComponent();
-        }
+            InitializeComponent();           
+           
+        }        
     }
 }
diff --git a/Apollon.WPF/Views/Components/OverViewListing.xaml b/Apollon.WPF/Views/Components/OverViewListing.xaml
index 5f0ef5e..14cd2b3 100644
--- a/Apollon.WPF/Views/Components/OverViewListing.xaml
+++ b/Apollon.WPF/Views/Components/OverViewListing.xaml
@@ -19,7 +19,7 @@
                       BorderBrush="Transparent"
                       Padding="5"
                       ItemsSource="{Binding OverviewListingItemViewModels}"
-                      SelectedItem="{Binding SelectedOverviewListingItemViewModel}">
+                      SelectedItem="{Binding SelectedOverviewListingItemViewModel}"                      >
                 <ListView.ItemContainerStyle>
                     <Style TargetType="ListViewItem">
                         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
diff --git a/Apollon.WPF/Views/Components/OverViewListing.xaml.cs b/Apollon.WPF/Views/Components/OverViewListing.xaml.cs
index 628baea..6600975 100644
--- a/Apollon.WPF/Views/Components/OverViewListing.xaml.cs
+++ b/Apollon.WPF/Views/Components/OverViewListing.xaml.cs
@@ -23,6 +23,6 @@ namespace Apollon.WPF.Views.Components
         public OverViewListing()
         {
             InitializeComponent();
-        }
+        }        
     }
 }
diff --git a/Apollon.WPF/Views/Components/OverviewDetails.xaml b/Apollon.WPF/Views/Components/OverviewDetails.xaml
index e8ac9ef..5443c3c 100644
--- a/Apollon.WPF/Views/Components/OverviewDetails.xaml
+++ b/Apollon.WPF/Views/Components/OverviewDetails.xaml
@@ -31,8 +31,7 @@
                     </Style.Triggers>
                 </Style>
             </TextBlock.Style>
-        </TextBlock>
-             
+        </TextBlock>             
             <StackPanel>
                 <TextBlock Text="{Binding TournamentName}"
                        TextAlignment="Center"
@@ -66,8 +65,8 @@
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
                                     <Setter Property="Visibility" Value="Visible"/>
-                                </DataTrigger>
-                            </Style.Triggers>
+                                </DataTrigger>                            
+                        </Style.Triggers>
                         </Style>
                     </TextBlock.Style>
                 </TextBlock>
diff --git a/Apollon.WPF/Views/OverviewView.xaml b/Apollon.WPF/Views/OverviewView.xaml
index 384b68b..af7b25e 100644
--- a/Apollon.WPF/Views/OverviewView.xaml
+++ b/Apollon.WPF/Views/OverviewView.xaml
@@ -57,7 +57,7 @@
         </StackPanel>
 
         <StackPanel Grid.Row="2" 
-                    VerticalAlignment="Center">
+                    VerticalAlignment="Stretch">
 
             <Image Grid.Column="2"
                Grid.Row="2"