diff --git a/Casino/Login.xaml b/Casino/Login.xaml
index d51bcd0..17e3c94 100644
--- a/Casino/Login.xaml
+++ b/Casino/Login.xaml
@@ -13,7 +13,7 @@
         AllowsTransparency="True"
         MouseDown="Window_MouseDown">
     
-    <Border CornerRadius="50"
+    <Border CornerRadius="20"
             Background="#590D00"
             BorderBrush="Gold"
             BorderThickness="5">
diff --git a/Casino/Login.xaml.cs b/Casino/Login.xaml.cs
index 120a71a..647fa18 100644
--- a/Casino/Login.xaml.cs
+++ b/Casino/Login.xaml.cs
@@ -28,7 +28,7 @@ namespace Casino
         public Login()
         {
             InitializeComponent();
-            Console.WriteLine(HashPassword("Mast"));
+            
         }
       
 
diff --git a/Casino/MainWindow.xaml b/Casino/MainWindow.xaml
index 8797d74..990ca4a 100644
--- a/Casino/MainWindow.xaml
+++ b/Casino/MainWindow.xaml
@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800"
         WindowStartupLocation="CenterScreen"
-        Background="Transparent">
+        >
     
     
     <Border 
@@ -17,10 +17,26 @@
          BorderThickness="5">
 
         <Grid>
-            <Button Content="Slots" HorizontalAlignment="Left" Height="39" Margin="65,114,0,0" VerticalAlignment="Top" Width="93" Click="Slots_Click"/>
-            <Button Content="Blackjack" HorizontalAlignment="Left" Margin="221,114,0,0" VerticalAlignment="Top" Height="40" Width="79" Click="Blackjack_Click"/>
-            <Button Content="Busfahrer" HorizontalAlignment="Left" Margin="221,193,0,0" VerticalAlignment="Top" Height="40" Width="79" Click="Busfahrer_Click"/>
 
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                
+            </Grid.RowDefinitions>
+            <Button Content="Slots" HorizontalAlignment="Center" Grid.Column="2" Grid.Row="2"  VerticalAlignment="Center" Width="79" Height="40" Click="Slots_Click" Background="Silver"/>
+            <Button Content="Blackjack" HorizontalAlignment="Center" Grid.Column="3" Grid.Row="2"  VerticalAlignment="Center" Height="40" Width="79" Click="Blackjack_Click" Background="Silver"/>
+            <Button Content="Busfahrer" HorizontalAlignment="Center" Grid.Column="1" Grid.Row="2"  VerticalAlignment="Center" Height="40" Width="79" Click="Busfahrer_Click" Background="Silver"/>
+            <TextBlock Name="TxtName" VerticalAlignment="Top" Grid.Column="2" Height="30" Margin="0,10,0,0" Foreground="DarkSlateGray"/>
+            <TextBlock Name="TxtKonto" VerticalAlignment="Top" Grid.Column="3" Height="30" Margin="0,10,0,0" Foreground="DarkSlateGray"/>
         </Grid> 
     </Border>
 </Window>
diff --git a/Casino/MainWindow.xaml.cs b/Casino/MainWindow.xaml.cs
index 9876235..6377391 100644
--- a/Casino/MainWindow.xaml.cs
+++ b/Casino/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
-using System.Text;
+using System.Collections.ObjectModel;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -17,9 +18,13 @@ namespace Casino
     public partial class MainWindow : Window
     {
         public static int currentUser;
+        ObservableCollection<User> users = new ObservableCollection<User>();
         public MainWindow()
         {
             InitializeComponent();
+
+            TxtName.Text = "User: " + users[currentUser].Name.ToString();
+            TxtKonto.Text = "Konto: " + users[currentUser].Geld.ToString();
         }
         private void Slots_Click(object sender, RoutedEventArgs e)
         {