diff --git a/Apollon.EntityFramework/Commands/CreateTournamentCommand.cs b/Apollon.EntityFramework/Commands/CreateTournamentCommand.cs
index eb2445f..d139171 100644
--- a/Apollon.EntityFramework/Commands/CreateTournamentCommand.cs
+++ b/Apollon.EntityFramework/Commands/CreateTournamentCommand.cs
@@ -20,9 +20,7 @@ namespace Apollon.EntityFramework.Commands
         }
 
         public  async Task Execute(Tournament tournament)
-        {
-            throw new Exception();
-
+        {     
             using (TournamentsDbContext context = _contextFactory.Create())
             {        
                 TournamentDto tournamentDto = new TournamentDto()
diff --git a/Apollon.WPF/Apollon.WPF.csproj b/Apollon.WPF/Apollon.WPF.csproj
index 06af9ed..444d77c 100644
--- a/Apollon.WPF/Apollon.WPF.csproj
+++ b/Apollon.WPF/Apollon.WPF.csproj
@@ -18,4 +18,8 @@
     <ProjectReference Include="..\Apollon.EntityFramework\Apollon.EntityFramework.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Images\Logos\" />
+  </ItemGroup>
+
 </Project>
diff --git a/Apollon.WPF/Images/Logos/logo_gross_DSB.jpg b/Apollon.WPF/Images/Logos/logo_gross_DSB.jpg
new file mode 100644
index 0000000..d44224a
Binary files /dev/null and b/Apollon.WPF/Images/Logos/logo_gross_DSB.jpg differ
diff --git a/Apollon.WPF/Images/Logos/logo_klein_DSB.jpg b/Apollon.WPF/Images/Logos/logo_klein_DSB.jpg
new file mode 100644
index 0000000..209f80e
Binary files /dev/null and b/Apollon.WPF/Images/Logos/logo_klein_DSB.jpg differ
diff --git a/Apollon.WPF/Views/Components/TournamentDetails.xaml b/Apollon.WPF/Views/Components/TournamentDetails.xaml
new file mode 100644
index 0000000..bd25baf
--- /dev/null
+++ b/Apollon.WPF/Views/Components/TournamentDetails.xaml
@@ -0,0 +1,86 @@
+<UserControl x:Class="Apollon.WPF.Views.Components.TournamentDetails"
+             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.Components"
+             mc:Ignorable="d" 
+             d:DesignHeight="100" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto"/>
+            <ColumnDefinition MaxWidth="650"/>
+            <ColumnDefinition Width="auto"/>
+        </Grid.ColumnDefinitions>
+        <Image Grid.Column="0"
+               Source="D:\Projekte\Apollon\Apollon\Apollon.WPF\Images\Logos\logo_klein_DSB.jpg"
+               Width="80"
+               VerticalAlignment="Center"/>
+        <StackPanel Grid.Column="1">            
+            <WrapPanel HorizontalAlignment="Center">
+                <TextBlock Text="Organisation"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="16"
+                       Foreground="#0000a0"
+                       Margin="10"/>
+                <TextBlock Text="TournamentName"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="16"
+                       Foreground="#0000a0"
+                       Margin="10"/>
+            </WrapPanel>
+            <WrapPanel HorizontalAlignment="Center">
+                <TextBlock Text="Competition"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="14"
+                       Foreground="#0000a0"
+                       Margin="10"/>
+                <TextBlock Text="Location"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="14"
+                       Foreground="#0000a0"
+                       Margin="10"/>
+                <TextBlock Text="vom"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="14"
+                       Foreground="#0000a0"
+                       Margin="10"/>
+                <TextBlock Text="StartDate"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="14"
+                       Foreground="#0000a0"
+                       Margin="10"/>
+                <TextBlock Text="bis"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="14"
+                       Foreground="#0000a0"
+                       Margin="10"/>
+                <TextBlock Text="EndDate"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="14"
+                       Foreground="#0000a0"
+                       Margin="10"/>                
+            </WrapPanel>
+        </StackPanel>
+        <Image Grid.Column="2"
+               Source="D:\Projekte\Apollon\Apollon\Apollon.WPF\Images\TargetField.png"
+               Width="70"
+               VerticalAlignment="Center"/>
+    </Grid>
+</UserControl>
diff --git a/Apollon.WPF/Views/Components/TournamentDetails.xaml.cs b/Apollon.WPF/Views/Components/TournamentDetails.xaml.cs
new file mode 100644
index 0000000..a1eddf8
--- /dev/null
+++ b/Apollon.WPF/Views/Components/TournamentDetails.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.Components
+{
+    /// <summary>
+    /// Interaction logic for TournamentDetails.xaml
+    /// </summary>
+    public partial class TournamentDetails : UserControl
+    {
+        public TournamentDetails()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Apollon.WPF/Views/Layout.xaml b/Apollon.WPF/Views/Layout.xaml
index 96cbce9..09fa902 100644
--- a/Apollon.WPF/Views/Layout.xaml
+++ b/Apollon.WPF/Views/Layout.xaml
@@ -7,8 +7,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-        <Border BorderThickness="4"
-                BorderBrush="#0000a0"
+        <Border BorderThickness="2"
                 CornerRadius="5"
                 Grid.RowSpan="2" 
                 Grid.ColumnSpan="3">
diff --git a/Apollon.WPF/Views/NavBarView.xaml b/Apollon.WPF/Views/NavBarView.xaml
index 4356293..da29c0d 100644
--- a/Apollon.WPF/Views/NavBarView.xaml
+++ b/Apollon.WPF/Views/NavBarView.xaml
@@ -4,11 +4,43 @@
              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"
+             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <TextBlock Text="Navbar"
-                   FontSize="35"
-                   Padding="100"/>
+    <Grid Margin="45">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="100"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="150"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+        <Button Width="35"
+                Height="35"
+                Background="Transparent"
+                BorderThickness="0"
+                HorizontalAlignment="Left"
+                Margin="5">
+            <iconPacks:PackIconMaterial Kind="ArrowLeft"
+                                        Height="25"
+                                        Width="35"
+                                        Foreground="#0000a0"/>
+        </Button>
+
+        <components:TournamentDetails Grid.Column="1"/>
+        <StackPanel Grid.Row="1">
+            <Button Height="45"
+                    Background="Transparent"/>
+            <Button Height="45"
+                    Background="Transparent"/>
+            <Button Height="45"
+                    Background="Transparent"/>
+            <Button Height="45"
+                    Background="Transparent"/>
+        </StackPanel>
+
     </Grid>
 </UserControl>