diff --git a/ClientApp/ViewModels/LoginViewModel.cs b/ClientApp/ViewModels/LoginViewModel.cs
index ad5b348..345205e 100644
--- a/ClientApp/ViewModels/LoginViewModel.cs
+++ b/ClientApp/ViewModels/LoginViewModel.cs
@@ -1,11 +1,26 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text;
+using System.Windows.Controls;
+using System.Windows.Input;
 using ClientApp.Utils;
+using GalaSoft.MvvmLight.Command;
 
 namespace ClientApp.ViewModels
 {
     class LoginViewModel : ObservableObject
     {
+        public string Username { get; set; }
+        public LoginViewModel()
+        {
+            LoginCommand = new RelayCommand<object>((parameter) =>
+            {
+                Debug.WriteLine($"username {Username} password {((PasswordBox)parameter).Password}");
+                //TODO send username and password to server
+            });
+        }
+
+        public ICommand LoginCommand { get; set; }
     }
 }
diff --git a/ClientApp/Views/LoginView.xaml b/ClientApp/Views/LoginView.xaml
index a24b69c..81ea950 100644
--- a/ClientApp/Views/LoginView.xaml
+++ b/ClientApp/Views/LoginView.xaml
@@ -6,13 +6,13 @@
              xmlns:local="clr-namespace:ClientApp.Views"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <StackPanel VerticalAlignment="Center">
-            <Label Content="Username" HorizontalContentAlignment="Center"/>
-            <TextBox x:Name="Username" TextWrapping="Wrap" Width="120"/>
+    <DockPanel>
+        <StackPanel VerticalAlignment="Center" Width="auto">
+            <Label Content="Username" HorizontalContentAlignment="Center" />
+            <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120"/>
             <Label Content="Password" HorizontalContentAlignment="Center"/>
-            <TextBox x:Name="Password" TextWrapping="Wrap" Width="120"/>
-            <Button x:Name="Login" Content="Login" Margin="0,20,0,0" Width="120"/>
+            <PasswordBox x:Name="Password" Width="120"/>
+            <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
         </StackPanel>
-    </Grid>
+    </DockPanel>
 </UserControl>
diff --git a/ClientApp/Views/MainWindow.xaml b/ClientApp/Views/MainWindow.xaml
index 7d6f23b..025cf3f 100644
--- a/ClientApp/Views/MainWindow.xaml
+++ b/ClientApp/Views/MainWindow.xaml
@@ -6,13 +6,11 @@
         xmlns:local="clr-namespace:ClientApp"
         xmlns:views="clr-namespace:ClientApp.Views"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
+        Title="Whaazzzzuuuuuuuup" Height="450" Width="800">
 
 
-    <Grid>
-
-
-        <ContentControl DockPanel.Dock="Bottom" Content="{Binding SelectedViewModel}" />
-
-    </Grid>
+    <DockPanel>
+        <Label Content="gemaakt door: mensen" DockPanel.Dock="Bottom" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontStyle="Italic" Foreground="Gray"/>
+        <ContentControl  HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding SelectedViewModel}" />
+    </DockPanel>
 </Window>