diff --git a/Apollon.WPF/Commands/AddTournamentCommand.cs b/Apollon.WPF/Commands/AddTournamentCommand.cs
index fbd653b..c864485 100644
--- a/Apollon.WPF/Commands/AddTournamentCommand.cs
+++ b/Apollon.WPF/Commands/AddTournamentCommand.cs
@@ -32,7 +32,7 @@ namespace Apollon.WPF.Commands
         public override async Task ExecuteAsync(object parameter)
         {
             AddEditDetailsViewModel formViewModel = _addTournamentViewModel.AddEditDetailsViewModel;
-            Tournament tournament = new Tournament(formViewModel.Organisation,formViewModel.Tournamentname, formViewModel.Category, formViewModel.Startdate, formViewModel.Enddate,
+            Tournament tournament = new Tournament(formViewModel.Organisation,formViewModel.Tournamentname, formViewModel.Competition, formViewModel.Startdate, formViewModel.Enddate,
                                                     formViewModel.Location, formViewModel.Rounds);
 
             try
diff --git a/Apollon.WPF/Images/Archery.png b/Apollon.WPF/Images/Archery.png
new file mode 100644
index 0000000..0581c75
Binary files /dev/null and b/Apollon.WPF/Images/Archery.png differ
diff --git a/Apollon.WPF/Images/TargetField.png b/Apollon.WPF/Images/TargetField.png
new file mode 100644
index 0000000..7aa2d9e
Binary files /dev/null and b/Apollon.WPF/Images/TargetField.png differ
diff --git a/Apollon.WPF/Images/TargetHall.png b/Apollon.WPF/Images/TargetHall.png
new file mode 100644
index 0000000..106fadd
Binary files /dev/null and b/Apollon.WPF/Images/TargetHall.png differ
diff --git a/Apollon.WPF/Images/TargetOutdoor.png b/Apollon.WPF/Images/TargetOutdoor.png
new file mode 100644
index 0000000..9736f2a
Binary files /dev/null and b/Apollon.WPF/Images/TargetOutdoor.png differ
diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml
index cd6daec..782603e 100644
--- a/Apollon.WPF/MainWindow.xaml
+++ b/Apollon.WPF/MainWindow.xaml
@@ -10,12 +10,12 @@
         mc:Ignorable="d"
         Title="Apollon Auswertung Bogen"
         Height="680"
-        Width="1080"
+        Width="1100"
         WindowStartupLocation="CenterScreen"
         Background="Transparent"
         AllowsTransparency="True"
         WindowStyle="None"
-        ResizeMode="CanResizeWithGrip">
+        ResizeMode="NoResize">
     <Window.Resources>
         <DataTemplate DataType="{x:Type vms:AddTournamentViewModel}">
             <views:AddTournamentView/>
@@ -23,9 +23,7 @@
         <DataTemplate DataType="{x:Type vms:EditTournamentViewModel}">
             <views:EditTournamentView/>
         </DataTemplate>
-    </Window.Resources>
-    <ScrollViewer HorizontalScrollBarVisibility="Auto"
-                  VerticalScrollBarVisibility="Auto">
+    </Window.Resources>    
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"/>
@@ -73,6 +71,5 @@
                         Foreground="#0000a0"
                         Click="Button_Exit"/>
             </WrapPanel>
-        </Grid>
-    </ScrollViewer>
+        </Grid>   
 </Window>
diff --git a/Apollon.WPF/Models/Tournament.cs b/Apollon.WPF/Models/Tournament.cs
index 7613d49..c82b1b7 100644
--- a/Apollon.WPF/Models/Tournament.cs
+++ b/Apollon.WPF/Models/Tournament.cs
@@ -8,11 +8,11 @@ namespace Apollon.WPF.Models
 {
     public class Tournament
     {
-        public Tournament(string organisation, string tournamentname, string category, string startdate, string enddate, string location, int rounds = 0)
+        public Tournament(string organisation, string tournamentname, string competition, string startdate, string enddate, string location, int rounds = 0)
         {
             Organisation = organisation;
             Tournamentname = tournamentname;
-            Category = category;
+            Competition = competition;
             Startdate = startdate;
             Enddate = enddate;
             Location = location;
@@ -21,7 +21,7 @@ namespace Apollon.WPF.Models
 
         public string Organisation { get; }
         public string Tournamentname { get; }
-        public string Category { get; }
+        public string Competition { get; }
         public string Startdate { get; }
         public string Enddate { get; }
         public string Location { get; }
diff --git a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
index bdce062..36bcccd 100644
--- a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
@@ -39,7 +39,7 @@ namespace Apollon.WPF.ViewModels
 		}
 
 		private string _category;
-		public string Category
+		public string Competition
 		{
 			get
 			{
@@ -48,7 +48,7 @@ namespace Apollon.WPF.ViewModels
 			set
 			{
 				_category = value;
-				OnPropertyChanged(nameof(Category));
+				OnPropertyChanged(nameof(Competition));
 			}
 		}
 
diff --git a/Apollon.WPF/ViewModels/EditTournamentViewModel.cs b/Apollon.WPF/ViewModels/EditTournamentViewModel.cs
index 4176e35..1e2be97 100644
--- a/Apollon.WPF/ViewModels/EditTournamentViewModel.cs
+++ b/Apollon.WPF/ViewModels/EditTournamentViewModel.cs
@@ -22,7 +22,7 @@ namespace Apollon.WPF.ViewModels
             {
                 Organisation = tournament.Organisation,
                 Tournamentname = tournament.Tournamentname,
-                Category = tournament.Category,
+                Competition = tournament.Competition,
                 Startdate = tournament.Startdate,
                 Enddate = tournament.Enddate,
                 Location = tournament.Location,
diff --git a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
index 3d1dafa..ba7e89e 100644
--- a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
@@ -17,7 +17,7 @@ namespace Apollon.WPF.ViewModels
         public bool HasSelectedTournament => SelectedTournament != null;
         public string Organisation => SelectedTournament?.Organisation ?? "keine Organisation";
         public string Tournamentname => SelectedTournament?.Tournamentname ?? "kein Name";
-        public string Category => SelectedTournament?.Category ?? "keine Kategorie";
+        public string Category => SelectedTournament?.Competition ?? "keine Kategorie";
         public string Startdate => SelectedTournament?.Startdate ?? "kein Datum";
         public string Enddate => SelectedTournament?.Enddate ?? "kein Datum";
         public string Location => SelectedTournament?.Location ?? "kein Ort";
diff --git a/Apollon.WPF/ViewModels/OverviewListingItemViewModel.cs b/Apollon.WPF/ViewModels/OverviewListingItemViewModel.cs
index d471113..57ade72 100644
--- a/Apollon.WPF/ViewModels/OverviewListingItemViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewListingItemViewModel.cs
@@ -13,6 +13,7 @@ namespace Apollon.WPF.ViewModels
         public Tournament Tournament { get;}        
 
         public string Tournamentname => Tournament.Tournamentname;
+        public string Location => Tournament.Location;
         public ICommand DeleteCommand { get; }
                 
         public OverviewListingItemViewModel(Tournament tournament)
diff --git a/Apollon.WPF/Views/Components/AddEditDetails.xaml b/Apollon.WPF/Views/Components/AddEditDetails.xaml
index 5cbcc4f..322dd7c 100644
--- a/Apollon.WPF/Views/Components/AddEditDetails.xaml
+++ b/Apollon.WPF/Views/Components/AddEditDetails.xaml
@@ -5,37 +5,37 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Apollon.WPF.Views.Components"
              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="55"/>
-                <RowDefinition Height="auto"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="180"/>
-                <ColumnDefinition Width="400"/>
-            </Grid.ColumnDefinitions>
-            
-            <TextBlock Text="Veranstalter: "                       
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="55"/>
+            <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}"/>
-            <TextBlock Grid.Row="1"
+        <TextBlock Grid.Row="1"
                        Text="Turniername: "
                        Style="{StaticResource ModalTextBlock}"/>
-            <TextBlock Grid.Row="2"
-                       Text="Kategorie: "                       
+        <TextBlock Grid.Row="2"
+                       Text="Wettkampfart: "                       
                        Style="{StaticResource ModalTextBlock}"/>
-            <TextBlock Grid.Row="3"
+        <TextBlock Grid.Row="3"
                        Text="Startdatum: "
                        Style="{StaticResource ModalTextBlock}"/>
-            <TextBlock Grid.Row="4"
+        <TextBlock Grid.Row="4"
                        Text="Enddatum: "
                        Style="{StaticResource ModalTextBlock}"/>
-            <TextBlock Grid.Row="5"
+        <TextBlock Grid.Row="5"
                        Text="Veranstaltungsort: "
                        Style="{StaticResource ModalTextBlock}"/>
         <TextBlock Grid.Row="6"
@@ -49,30 +49,30 @@
                      Height="30"
                      Background="LightGray"
                      VerticalContentAlignment="Center"/>
-            <TextBox Grid.Row="1"
+        <TextBox Grid.Row="1"
                      Grid.Column="1"
                      Text="{Binding Tournamentname, UpdateSourceTrigger=PropertyChanged}"
                      FontFamily="Arial"                     
                      FontSize="16"
                      Height="30"
-                     VerticalContentAlignment="Center"
+                     VerticalContentAlignment="Center"                     
                      Background="LightGray"/>
-            <ComboBox Grid.Row="2"
+        <ComboBox Grid.Row="2"
                       Grid.Column="1"
-                      ItemsSource="{Binding Category}"
                       Height="30"
+                      Width="150"
                       FontSize="16"
-                      HorizontalContentAlignment="Center"
-                      VerticalContentAlignment="Center"/>
+                      VerticalContentAlignment="Center"
+                      HorizontalAlignment="Left"/>
 
-            <DatePicker Grid.Row="3"
+        <DatePicker Grid.Row="3"
                         Grid.Column="1"                        
                         Height="30"
                         FontSize="16"
                         Width="160"
                         HorizontalAlignment="Left"/>
 
-            <DatePicker Grid.Row="4"
+        <DatePicker Grid.Row="4"
                         Grid.Column="1"                        
                         Height="30"
                         FontSize="16"
@@ -121,10 +121,10 @@
                     Width="120"
                     Height="35"
                     FontSize="16"
-                    Grid.Column="1"/>            
+                    Grid.Column="1"/>
         </Grid>
 
-            
-        </Grid> 
-    
+
+    </Grid>
+
 </UserControl>
diff --git a/Apollon.WPF/Views/Components/OverViewListing.xaml b/Apollon.WPF/Views/Components/OverViewListing.xaml
index db4d016..1cfb4d2 100644
--- a/Apollon.WPF/Views/Components/OverViewListing.xaml
+++ b/Apollon.WPF/Views/Components/OverViewListing.xaml
@@ -17,7 +17,7 @@
                       FontWeight="Bold"
                       Background="Transparent"
                       BorderBrush="Transparent"
-                      Padding="20"
+                      Padding="5"
                       ItemsSource="{Binding OverviewListingItemViewModels}"
                       SelectedItem="{Binding SelectedOverviewListingItemViewModel}">
                 <ListView.ItemContainerStyle>
@@ -32,7 +32,12 @@
                                 <ColumnDefinition Width="*"></ColumnDefinition>
                                 <ColumnDefinition Width="auto"></ColumnDefinition>
                             </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0" Text="{Binding Tournamentname}"/>
+                            <WrapPanel Grid.Column="0">
+                                <TextBlock Text="{Binding Tournamentname}"
+                                           Margin="0 0 4 0"/>
+                                <TextBlock Text="{Binding Location}"/>
+                            </WrapPanel>
+                            
                             <Button Grid.Column="1"
                                     Background="Transparent"
                                     BorderThickness="0"
diff --git a/Apollon.WPF/Views/Components/OverviewDetails.xaml b/Apollon.WPF/Views/Components/OverviewDetails.xaml
index 3604f58..5c2964a 100644
--- a/Apollon.WPF/Views/Components/OverviewDetails.xaml
+++ b/Apollon.WPF/Views/Components/OverviewDetails.xaml
@@ -71,8 +71,10 @@
                         </Style>
                     </TextBlock.Style>
                 </TextBlock>
+            <WrapPanel HorizontalAlignment="Center">
                 <TextBlock Text="{Binding Category}"
                        TextAlignment="Center"
+                       VerticalAlignment="Center"
                        FontFamily="Arial"
                        FontWeight="Bold"
                        FontSize="14"
@@ -89,7 +91,25 @@
                         </Style>
                     </TextBlock.Style>
                 </TextBlock>
-                <WrapPanel Margin="10" HorizontalAlignment="Center">
+                <Image Grid.Column="2"
+               Grid.Row="2"
+               Source="D:\Projekte\Apollon\Apollon\Apollon.WPF\Images\TargetField.png"
+               Width="50"
+               Height="50">
+                    <Image.Style>
+                        <Style TargetType="Image">
+                            <Setter Property="Visibility" Value="Hidden"/>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
+                                    <Setter Property="Visibility" Value="Visible"/>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Image.Style>
+                </Image>
+            </WrapPanel>              
+
+            <WrapPanel Margin="10" HorizontalAlignment="Center">
                     <TextBlock Text="vom "
                        TextAlignment="Center"
                        FontFamily="Arial"
diff --git a/Apollon.WPF/Views/OverviewView.xaml b/Apollon.WPF/Views/OverviewView.xaml
index dbaba7b..2b9640d 100644
--- a/Apollon.WPF/Views/OverviewView.xaml
+++ b/Apollon.WPF/Views/OverviewView.xaml
@@ -15,8 +15,8 @@
         </Grid.RowDefinitions>
         
         <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition/>
+            <ColumnDefinition Width="auto"/>
+            <ColumnDefinition Width="auto"/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
         
@@ -61,7 +61,7 @@
 
             <Image Grid.Column="2"
                Grid.Row="2"
-               Source="D:\Projekte\Apollon\Apollon\Apollon.WPF\Images\Scheibe.png"
+               Source="D:\Projekte\Apollon\Apollon\Apollon.WPF\Images\Archery.png"
                Width="250"
                Height="250">
             </Image>
@@ -89,6 +89,7 @@
                        Foreground="#0000a0"/>
             
             <components:OverViewListing Height="400"
+                                        Width="400"
                                         DataContext="{Binding OverviewListingViewModel}"/>
         </StackPanel>