diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml
index 0bec6be..840f284 100644
--- a/Apollon.WPF/MainWindow.xaml
+++ b/Apollon.WPF/MainWindow.xaml
@@ -20,6 +20,9 @@
         <DataTemplate DataType="{x:Type vms:AddTournametViewModel}">
             <views:AddTournamentView/>
         </DataTemplate>
+        <DataTemplate DataType="{x:Type vms:EditTournamentViewModel}">
+            <views:EditTournamentView/>
+        </DataTemplate>
     </Window.Resources>
     <ScrollViewer HorizontalScrollBarVisibility="Auto"
                   VerticalScrollBarVisibility="Auto">
diff --git a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
index 9096088..d4b6552 100644
--- a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
@@ -24,7 +24,7 @@ namespace Apollon.WPF.ViewModels
 		}
 
 		private string _tournamentname;
-		public string Tounamentname
+		public string Tournamentname
 		{
 			get
 			{
@@ -33,7 +33,7 @@ namespace Apollon.WPF.ViewModels
 			set
 			{
 				_tournamentname = value;
-				OnPropertyChanged(nameof(Tounamentname));
+				OnPropertyChanged(nameof(Tournamentname));
 				OnPropertyChanged(nameof(CanSubmit));
 			}
 		}
@@ -94,9 +94,9 @@ namespace Apollon.WPF.ViewModels
 			}
 		}
 
-        public bool CanSubmit => !string.IsNullOrEmpty(Tounamentname);
+        public bool CanSubmit => !string.IsNullOrEmpty(Tournamentname);
         public ICommand SubmitCommand { get; }
-        public ICommand CancleCommand { get; }
+        public ICommand CancelCommand { get; }
     }
 
 	
diff --git a/Apollon.WPF/ViewModels/EditTournamentViewModel.cs b/Apollon.WPF/ViewModels/EditTournamentViewModel.cs
new file mode 100644
index 0000000..ba57c62
--- /dev/null
+++ b/Apollon.WPF/ViewModels/EditTournamentViewModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Apollon.WPF.ViewModels
+{
+    public class EditTournamentViewModel : ViewModelBase
+    {
+        public AddEditDetailsViewModel AddEditDetailsViewModel { get; }
+        public EditTournamentViewModel()
+        {
+            AddEditDetailsViewModel = new AddEditDetailsViewModel();
+        }
+    }
+}
diff --git a/Apollon.WPF/ViewModels/MainViewModel.cs b/Apollon.WPF/ViewModels/MainViewModel.cs
index 1609bb1..a345633 100644
--- a/Apollon.WPF/ViewModels/MainViewModel.cs
+++ b/Apollon.WPF/ViewModels/MainViewModel.cs
@@ -20,9 +20,7 @@ namespace Apollon.WPF.ViewModels
             _modalNavigationStore = modalNavigationStore;
             OverviewViewModel = overviewViewModel;
 
-            _modalNavigationStore.CurrentViewModelChanged += ModalNavigationStore_CurrentViewModelChanged;
-
-            //_modalNavigationStore.CurrentViewModel = new AddTournametViewModel();
+            _modalNavigationStore.CurrentViewModelChanged += ModalNavigationStore_CurrentViewModelChanged;            
         }
 
         protected override void Dispose()