diff --git a/.vs/Server Dashboard/DesignTimeBuild/.dtbcache.v2 b/.vs/Server Dashboard/DesignTimeBuild/.dtbcache.v2
index 4ee9dd6..0b7bc87 100644
Binary files a/.vs/Server Dashboard/DesignTimeBuild/.dtbcache.v2 and b/.vs/Server Dashboard/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/.vs/Server Dashboard/v16/.suo b/.vs/Server Dashboard/v16/.suo
index 3e9828e..006ec3e 100644
Binary files a/.vs/Server Dashboard/v16/.suo and b/.vs/Server Dashboard/v16/.suo differ
diff --git a/Server Dashboard/App.xaml b/Server Dashboard/App.xaml
index 938123c..184a8a1 100644
--- a/Server Dashboard/App.xaml	
+++ b/Server Dashboard/App.xaml	
@@ -12,6 +12,9 @@
             </RadialGradientBrush.GradientStops>
         </RadialGradientBrush>
 
+        <BooleanToVisibilityConverter x:Key="UserNameVisibillity" />
+        <BooleanToVisibilityConverter x:Key="PasswordVisibillity" />
+        
         <SolidColorBrush x:Key="Background" Color="#141424"/>
         <!--A700 Teal-->
         <SolidColorBrush x:Key="Green" Color="#00BFA5"/>
@@ -23,22 +26,6 @@
         <SolidColorBrush x:Key="Yellow" Color="#FFEB3B"/>
         <!--700 Yellow-->
         <SolidColorBrush x:Key="PressedYellow" Color="#FBC02D"/>
-        
-        <Style x:Key="loginButtonStyle" TargetType="Button">
-            <Setter Property="Background" Value="#25AEA6"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <Border CornerRadius="4" Background="{TemplateBinding Background}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                
-            </Style.Triggers>
-        </Style>
 
         <Style x:Key="LoginViewBorder" TargetType="{x:Type Border}">
             <Setter Property="BorderBrush" Value="#25AEA6"/>
@@ -56,7 +43,7 @@
             <Setter Property="Background" Value="#1B1C20"/>
         </Style>
 
-        <Style x:Name="LoginFormHint" x:Key="LoginFormTooltip" TargetType="{x:Type Label}">
+        <Style x:Name="HintText" x:Key="LoginFormTooltip" TargetType="{x:Type TextBlock}">
             <Setter Property="Foreground" Value="#40AAAAAA"/>
             <Setter Property="FontFamily" Value="Arial"/>
             <Setter Property="FontSize" Value="20"/>
@@ -101,31 +88,42 @@
         <Style x:Key="LoginFormButton" TargetType="{x:Type Button}">
             <Setter Property="Width" Value="350"/>
             <Setter Property="Height" Value="60"/>
-            <Setter Property="Background" Value="#25AEA6"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Foreground" Value="{StaticResource Background}"/>
+            <Setter Property="Background" Value="#2A2D30"/>
+            <Setter Property="BorderBrush" Value="#25AEA6"/>
+            <Setter Property="BorderThickness" Value="2"/>
+            <Setter Property="Foreground" Value="#25AEA6"/>
             <Setter Property="FontSize" Value="25"/>
             <Setter Property="FontFamily" Value="Arial"/>
             <Setter Property="Cursor" Value="Hand"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border CornerRadius="4" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                            <TextBlock TextAlignment="Center" Padding="5" TextWrapping="Wrap" Text="{TemplateBinding Content}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <Border x:Name="Border" CornerRadius="4" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                            <TextBlock TextAlignment="Center" Padding="0" TextWrapping="Wrap" Text="{TemplateBinding Content}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#35bEb6"/>
+                                <Setter Property="BorderBrush" Value="#35bEb6"/>
+                                <Setter Property="Foreground" Value="#35bEb6"/>
                             </Trigger>
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="#159E96"/>
+                                <Setter Property="Background" Value="#25AEA6"/>
+                                <Setter Property="Foreground" Value="#2A2D30"/>
+                                <Setter Property="BorderThickness" Value="0"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
+
+        <Style x:Key="LoginGreeter" TargetType="{x:Type TextBlock}">
+            <Setter Property="Foreground" Value="#878787"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="FontSize" Value="40"/>
+            <Setter Property="TextAlignment" Value="Center"/>
+        </Style>
         
     </Application.Resources>
 </Application>
diff --git a/Server Dashboard/MainWindow.xaml b/Server Dashboard/MainWindow.xaml
index 072d248..40e8bcf 100644
--- a/Server Dashboard/MainWindow.xaml	
+++ b/Server Dashboard/MainWindow.xaml	
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Server_Dashboard"
         mc:Ignorable="d"
-        Title="Server Dashboard" Height="600" Width="400">
+        Title="Server Dashboard" Height="700" Width="500">
     <Border Style="{StaticResource LoginViewBorder}">
         <Grid>
             <Grid.RowDefinitions>
@@ -15,7 +15,12 @@
                 <RowDefinition Height="80"/>
                 <RowDefinition Height=".5*"/>
             </Grid.RowDefinitions>
-            <TextBlock Text="Login"/>
+            <Border Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" BorderBrush="#35bEb6" BorderThickness="0 1 0 1">
+                <StackPanel VerticalAlignment="Center" Margin="0 0 0 5">
+                    <TextBlock Text="Server Dashboard" Style="{StaticResource LoginGreeter}"/>
+                    <TextBlock Text="Login" FontSize="40" Style="{StaticResource LoginGreeter}"/>
+                </StackPanel>
+            </Border>
             <Grid Grid.Row="1">
                 <Border Style="{StaticResource LoginFormsBorder}">
                     <Grid Grid.Column="1">
@@ -24,8 +29,9 @@
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <Image Grid.Column="0" Height="30" Source="Assets/Images/userlogin.png"/>
+                        <TextBlock Text="Username" Style="{StaticResource LoginFormTooltip}" Visibility="{Binding ElementName=UserName, Path=Text.IsEmpty, Converter={StaticResource UserNameVisibillity}}" Grid.Column="1" IsHitTestVisible="False"/>
                         <Border Grid.Column="1" Style="{StaticResource LoginFormsInputBorder}">
-                            <TextBox Grid.Column="1" Style="{StaticResource LoginFormInput}"/>
+                            <TextBox x:Name="UserName" Background="Transparent" Grid.Column="1" Style="{StaticResource LoginFormInput}"/>
                         </Border>
                     </Grid>
                 </Border>
@@ -38,38 +44,14 @@
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <Image Grid.Column="0" Height="30" Source="Assets/Images/userpasswd.png"/>
+                        <TextBlock Text="Password" Style="{StaticResource LoginFormTooltip}" Visibility="{Binding ElementName=Password, Path=SecurePassword.IsEmpty, Converter={StaticResource PasswordVisibillity}}" Grid.Column="1" IsHitTestVisible="False"/>
                         <Border Grid.Column="1" Style="{StaticResource LoginFormsInputBorder}">
-                            <PasswordBox Grid.Column="1" Style="{StaticResource LoginFormPassword}"/>
+                            <PasswordBox x:Name="Password" Grid.Column="1" Style="{StaticResource LoginFormPassword}"/>
                         </Border>
                     </Grid>
                 </Border>
             </Grid>
-            <Grid Grid.Row="3">
-                <Button Style="{StaticResource LoginFormButton}" Content="Anmelden"/>
-            </Grid>
-            <Grid Grid.Row="4">
-                <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                </Grid.RowDefinitions>
-                <Grid Height="20" VerticalAlignment="Top" Grid.Row="0">
-                    <TextBlock Grid.Column="1" HorizontalAlignment="Center" FontSize="14" FontFamily="Arial" Foreground="#878787">
-                        Noch keinen Account? Klicke 
-                        <Hyperlink Foreground="#25AEA6" TextDecorations="none" NavigateUri="https://www.youtube.com/watch?v=dQw4w9WgXcQ">
-                            hier
-                        </Hyperlink>
-                        um einen zu erstellen!
-                    </TextBlock>
-                </Grid>
-                <Grid VerticalAlignment="Top" Height="20" Grid.Row="2">
-                    <TextBlock HorizontalAlignment="Center" FontSize="14" FontFamily="Arial" Foreground="#878787">
-                        Passwort 
-                        <Hyperlink Foreground="#25AEA6" TextDecorations="none" NavigateUri="https://www.youtube.com/watch?v=dQw4w9WgXcQ">
-                            Vergessen?
-                        </Hyperlink>
-                    </TextBlock>
-                </Grid>
-            </Grid>
+            <Button Grid.Row="3" Style="{StaticResource LoginFormButton}" Content="Login"/>
         </Grid>
     </Border>
 </Window>
diff --git a/Server Dashboard/bin/Debug/netcoreapp3.1/Server Dashboard.dll b/Server Dashboard/bin/Debug/netcoreapp3.1/Server Dashboard.dll
index 8504735..19e61ca 100644
Binary files a/Server Dashboard/bin/Debug/netcoreapp3.1/Server Dashboard.dll and b/Server Dashboard/bin/Debug/netcoreapp3.1/Server Dashboard.dll differ
diff --git a/Server Dashboard/bin/Debug/netcoreapp3.1/Server Dashboard.pdb b/Server Dashboard/bin/Debug/netcoreapp3.1/Server Dashboard.pdb
index d1da010..2d2ecff 100644
Binary files a/Server Dashboard/bin/Debug/netcoreapp3.1/Server Dashboard.pdb and b/Server Dashboard/bin/Debug/netcoreapp3.1/Server Dashboard.pdb differ
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/App.baml b/Server Dashboard/obj/Debug/netcoreapp3.1/App.baml
index 45edc3c..ed5311c 100644
Binary files a/Server Dashboard/obj/Debug/netcoreapp3.1/App.baml and b/Server Dashboard/obj/Debug/netcoreapp3.1/App.baml differ
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/App.g.cs b/Server Dashboard/obj/Debug/netcoreapp3.1/App.g.cs
index 0778940..20d57b9 100644
--- a/Server Dashboard/obj/Debug/netcoreapp3.1/App.g.cs	
+++ b/Server Dashboard/obj/Debug/netcoreapp3.1/App.g.cs	
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CFAEA69073E0A9617DE983A1C17F812E8D11C797"
+#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D03A8BE38EE5AEEDA00BB5AE30E41B585091E1F0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/App.g.i.cs b/Server Dashboard/obj/Debug/netcoreapp3.1/App.g.i.cs
index 0778940..20d57b9 100644
--- a/Server Dashboard/obj/Debug/netcoreapp3.1/App.g.i.cs	
+++ b/Server Dashboard/obj/Debug/netcoreapp3.1/App.g.i.cs	
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CFAEA69073E0A9617DE983A1C17F812E8D11C797"
+#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D03A8BE38EE5AEEDA00BB5AE30E41B585091E1F0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.baml b/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.baml
index 75489d9..4c2ff3a 100644
Binary files a/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.baml and b/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.baml differ
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.g.cs b/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.g.cs
index 3ee022b..b1bd53f 100644
--- a/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.g.cs	
+++ b/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.g.cs	
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9936019F8F4F36AA14CB7E4E5EF102427D7DACAB"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3C90DD8C14A9C472B0C23B4B4C5ADAF4EB5BB2A0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
@@ -42,9 +42,17 @@ namespace Server_Dashboard {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
-        #line 74 "..\..\..\MainWindow.xaml"
+        #line 34 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock LoginErrorText;
+        internal System.Windows.Controls.TextBox UserName;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 49 "..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.PasswordBox Password;
         
         #line default
         #line hidden
@@ -80,7 +88,10 @@ namespace Server_Dashboard {
             switch (connectionId)
             {
             case 1:
-            this.LoginErrorText = ((System.Windows.Controls.TextBlock)(target));
+            this.UserName = ((System.Windows.Controls.TextBox)(target));
+            return;
+            case 2:
+            this.Password = ((System.Windows.Controls.PasswordBox)(target));
             return;
             }
             this._contentLoaded = true;
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs b/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs
index c5c324a..b1bd53f 100644
--- a/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs	
+++ b/Server Dashboard/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs	
@@ -1,5 +1,4 @@
-// Updated by XamlIntelliSenseFileGenerator 01.04.2021 15:13:25
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9936019F8F4F36AA14CB7E4E5EF102427D7DACAB"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3C90DD8C14A9C472B0C23B4B4C5ADAF4EB5BB2A0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
@@ -35,18 +34,31 @@ using System.Windows.Shell;
 
 
 namespace Server_Dashboard {
-
-
+    
+    
     /// <summary>
     /// MainWindow
     /// </summary>
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-
-#line default
-#line hidden
-
+        
+        
+        #line 34 "..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox UserName;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 49 "..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.PasswordBox Password;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
-
+        
         /// <summary>
         /// InitializeComponent
         /// </summary>
@@ -58,14 +70,14 @@ namespace Server_Dashboard {
             }
             _contentLoaded = true;
             System.Uri resourceLocater = new System.Uri("/Server Dashboard;component/mainwindow.xaml", System.UriKind.Relative);
-
-#line 1 "..\..\..\MainWindow.xaml"
+            
+            #line 1 "..\..\..\MainWindow.xaml"
             System.Windows.Application.LoadComponent(this, resourceLocater);
-
-#line default
-#line hidden
+            
+            #line default
+            #line hidden
         }
-
+        
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "5.0.4.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -73,10 +85,14 @@ namespace Server_Dashboard {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId) {
-                case 1:
-                    this.LoginErrorText = ((System.Windows.Controls.TextBlock)(target));
-                    return;
+            switch (connectionId)
+            {
+            case 1:
+            this.UserName = ((System.Windows.Controls.TextBox)(target));
+            return;
+            case 2:
+            this.Password = ((System.Windows.Controls.PasswordBox)(target));
+            return;
             }
             this._contentLoaded = true;
         }
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.csprojAssemblyReference.cache b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.csprojAssemblyReference.cache
index f4a5b97..38b24af 100644
Binary files a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.csprojAssemblyReference.cache and b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.csprojAssemblyReference.cache differ
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.dll b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.dll
index 8504735..19e61ca 100644
Binary files a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.dll and b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.dll differ
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.g.resources b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.g.resources
index 896e51c..58ff6b8 100644
Binary files a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.g.resources and b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.g.resources differ
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.pdb b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.pdb
index d1da010..2d2ecff 100644
Binary files a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.pdb and b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard.pdb differ
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard_MarkupCompile.i.cache b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard_MarkupCompile.i.cache
index dbfdece..3ecc871 100644
--- a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard_MarkupCompile.i.cache	
+++ b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard_MarkupCompile.i.cache	
@@ -16,5 +16,5 @@ C:\Users\Crylia\Documents\Git\Server Dashboard\Server Dashboard\App.xaml
 193-833620683
 MainWindow.xaml;
 
-False
+True
 
diff --git a/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard_MarkupCompile.i.lref b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard_MarkupCompile.i.lref
new file mode 100644
index 0000000..10c5b94
--- /dev/null
+++ b/Server Dashboard/obj/Debug/netcoreapp3.1/Server Dashboard_MarkupCompile.i.lref	
@@ -0,0 +1,4 @@
+
+FC:\Users\Crylia\Documents\Git\Server Dashboard\Server Dashboard\App.xaml;;
+FC:\Users\Crylia\Documents\Git\Server Dashboard\Server Dashboard\MainWindow.xaml;;
+