diff --git a/SkyTeam/HomePage.xaml b/SkyTeam/HomePage.xaml
index 0b8efe4..b42e15b 100644
--- a/SkyTeam/HomePage.xaml
+++ b/SkyTeam/HomePage.xaml
@@ -46,7 +46,7 @@
                     Background="#FFE3F2FD"
                     Orientation="Vertical">
 
-            <!-- Home button (selected) -->
+       
             <Button x:Name="HomeButton"
                     Height="50"
                     Margin="5"
@@ -76,7 +76,6 @@
                 </StackPanel>
             </Button>
 
-            
             <Button x:Name="SettingsButton"
                     Height="50"
                     Margin="5"
@@ -91,16 +90,32 @@
                 </StackPanel>
             </Button>
 
+            <Button x:Name="LogoutButton"
+                    Height="50"
+                    Margin="5"
+                    Background="#FFEBEB"
+                    BorderBrush="#FFB71C1C"
+                    Foreground="#D32F2F"
+                    FontWeight="Bold"
+                    Click="LogoutButton_Click">
+                <StackPanel Orientation="Horizontal"
+                            VerticalAlignment="Center">
+                    <iconPacks:PackIconMaterial Kind="Logout"
+                                                Width="20"
+                                                Height="20"
+                                                Margin="0,0,10,0"/>
+                    <TextBlock Text="Abmelden"/>
+                </StackPanel>
+            </Button>
+
         </StackPanel>
 
-    
         <ScrollViewer Grid.Row="1"
                       Grid.Column="1"
                       Margin="30"
                       VerticalScrollBarVisibility="Auto">
             <StackPanel Margin="0,0,0,30">
 
-               
                 <StackPanel Orientation="Horizontal"
                             Margin="0,0,0,30">
                     <iconPacks:PackIconMaterial Kind="AirplaneTakeoff"
@@ -117,7 +132,6 @@
                     </StackPanel>
                 </StackPanel>
 
-                
                 <Border Background="#F8F9FA"
                         Padding="25"
                         CornerRadius="8"
@@ -128,7 +142,6 @@
                                TextWrapping="Wrap"/>
                 </Border>
 
-              
                 <TextBlock Text="Unsere Services"
                            FontSize="20"
                            FontWeight="Bold"
@@ -140,7 +153,6 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    
                     <Border Grid.Column="0"
                             Margin="0,0,15,0"
                             Padding="20"
@@ -162,7 +174,6 @@
                         </StackPanel>
                     </Border>
 
-                  
                     <Border Grid.Column="1"
                             Padding="20"
                             Background="#E8F5E8"
@@ -184,13 +195,11 @@
                     </Border>
                 </Grid>
 
-              
                 <StackPanel Orientation="Horizontal"
                             HorizontalAlignment="Center"
-                            Margin="0,30,0,0">
-                    <Button Width="160"
-                            Height="45"
-                            Margin="0,0,15,0"
+                            Margin="0,40,0,0">
+                    <Button Width="200"
+                            Height="50"
                             Background="#FF1E88E5"
                             Foreground="White"
                             FontSize="16"
@@ -198,9 +207,9 @@
                             Click="BookFlightButton_Click">
                         <StackPanel Orientation="Horizontal">
                             <iconPacks:PackIconMaterial Kind="Airplane"
-                                                        Width="20"
-                                                        Height="20"
-                                                        Margin="0,0,8,0"/>
+                                                        Width="24"
+                                                        Height="24"
+                                                        Margin="0,0,12,0"/>
                             <TextBlock Text="Jetzt Flug buchen"/>
                         </StackPanel>
                     </Button>
diff --git a/SkyTeam/HomePage.xaml.cs b/SkyTeam/HomePage.xaml.cs
index 0bad3aa..ef6a86c 100644
--- a/SkyTeam/HomePage.xaml.cs
+++ b/SkyTeam/HomePage.xaml.cs
@@ -29,6 +29,16 @@ namespace SkyTeam
         private void BookFlightButton_Click(object sender, RoutedEventArgs e)
         {
 
+        }
+        private void LogoutButton_Click(object sender, RoutedEventArgs e)
+        {
+            var result = MessageBox.Show(
+                "Möchten Sie sich wirklich abmelden?",
+                "Abmelden",
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Question);
+
+          
         }
     }
 }
diff --git a/SkyTeam/Regestrieren.xaml b/SkyTeam/Regestrieren.xaml
index ee70843..4b6bd60 100644
--- a/SkyTeam/Regestrieren.xaml
+++ b/SkyTeam/Regestrieren.xaml
@@ -4,130 +4,108 @@
       xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
       Title="Registrierungsseite">
 
-    <Grid Margin="20">
+    <Grid Margin="40,20">
 
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-      
+        <!-- Header -->
         <StackPanel Grid.Row="0"
                     Orientation="Horizontal"
                     VerticalAlignment="Center"
-                    Margin="0,0,0,30">
+                    Margin="0,0,0,40">
             <iconPacks:PackIconMaterial Kind="AccountPlus"
-                                        Width="28"
-                                        Height="28"
-                                        Margin="0,0,10,0"/>
+                                        Width="32"
+                                        Height="32"
+                                        Margin="0,0,15,0"/>
             <StackPanel>
                 <TextBlock Text="Registrieren"
-                           FontSize="22"
+                           FontSize="28"
                            FontWeight="Bold"/>
                 <TextBlock Text="Erstellen Sie Ihren Sky Team Account"
-                           FontSize="12"
-                           Foreground="Gray"/>
+                           FontSize="14"
+                           Foreground="#666"/>
             </StackPanel>
         </StackPanel>
 
-        <Grid Grid.Row="1"
-              VerticalAlignment="Center"
-              HorizontalAlignment="Center">
+        
+        <Border Grid.Row="1"
+                Background="White"
+                CornerRadius="12"
+                Padding="40"
+                BorderBrush="#E0E0E0"
+                BorderThickness="1"
+                VerticalAlignment="Center"
+                HorizontalAlignment="Center">
+            <Grid>
 
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="60"/>
+              
+                    <RowDefinition Height="40"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
 
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="200"/>
-            </Grid.ColumnDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="220"/>
+                </Grid.ColumnDefinitions>
 
-            <Label Content="Vorname:"
-                   Grid.Row="0"
-                   Grid.Column="0"
-                   Margin="0,0,10,10"/>
-            <TextBox x:Name="FirstNameTextBox"
-                     Grid.Row="0"
-                     Grid.Column="1"
-                     Margin="0,0,0,10"/>
+                <Label Content="Vorname:"
+                       Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,12,8"/>
+                <TextBox x:Name="FirstNameTextBox" Grid.Row="0" Grid.Column="1" Margin="0,0,0,8"/>
 
-            <Label Content="Nachname:"
-                   Grid.Row="1"
-                   Grid.Column="0"
-                   Margin="0,0,10,10"/>
-            <TextBox x:Name="LastNameTextBox"
-                     Grid.Row="1"
-                     Grid.Column="1"
-                     Margin="0,0,0,10"/>
+                <Label Content="Nachname:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,12,8"/>
+                <TextBox x:Name="LastNameTextBox" Grid.Row="1" Grid.Column="1" Margin="0,0,0,8"/>
 
-            <Label Content="E-Mail:"
-                   Grid.Row="2"
-                   Grid.Column="0"
-                   Margin="0,0,10,10"/>
-            <TextBox x:Name="EmailTextBox"
-                     Grid.Row="2"
-                     Grid.Column="1"
-                     Margin="0,0,0,10"/>
+                <Label Content="E-Mail:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,12,8"/>
+                <TextBox x:Name="EmailTextBox" Grid.Row="2" Grid.Column="1" Margin="0,0,0,8"/>
 
-            <Label Content="Telefonnummer:"
-                   Grid.Row="3"
-                   Grid.Column="0"
-                   Margin="0,0,10,10"/>
-            <TextBox x:Name="PhoneNumberTextBox"
-                     Grid.Row="3"
-                     Grid.Column="1"
-                     Margin="0,0,0,10"/>
+                <Label Content="Telefonnummer:" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,12,8"/>
+                <TextBox x:Name="PhoneNumberTextBox" Grid.Row="3" Grid.Column="1" Margin="0,0,0,8"/>
 
-            <Label Content="Stadt:"
-                   Grid.Row="4"
-                   Grid.Column="0"
-                   Margin="0,0,10,10"/>
-            <TextBox x:Name="CityTextBox"
-                     Grid.Row="4"
-                     Grid.Column="1"
-                     Margin="0,0,0,10"/>
+                <Label Content="Stadt:" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,12,8"/>
+                <TextBox x:Name="CityTextBox" Grid.Row="4" Grid.Column="1" Margin="0,0,0,8"/>
 
-            <Label Content="Land:"
-                   Grid.Row="5"
-                   Grid.Column="0"
-                   Margin="0,0,10,10"/>
-            <TextBox x:Name="CountryTextBox"
-                     Grid.Row="5"
-                     Grid.Column="1"
-                     Margin="0,0,0,10"/>
+                <Label Content="Land:" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,12,8"/>
+                <TextBox x:Name="CountryTextBox" Grid.Row="5" Grid.Column="1" Margin="0,0,0,8"/>
 
-            <Label Content="Passwort:"
-                   Grid.Row="6"
-                   Grid.Column="0"
-                   Margin="0,0,10,20"/>
+                <Label Content="Passwort:" Grid.Row="6" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,12,0"/>
+                <PasswordBox x:Name="PasswordBox" Grid.Row="6" VerticalAlignment="Top" Margin="1,4,0,0" Height="21" Grid.Column="1"/>
 
-            <PasswordBox x:Name="PasswordBox"
-                         Grid.Row="7"
-                         Grid.ColumnSpan="2"
-                         Margin="0,0,0,20"/>
+                <!-- Buttons - FORCED DOWN with extra rows -->
+                <StackPanel Grid.Row="9"
+                            Grid.ColumnSpan="2"
+                            Orientation="Horizontal"
+                            HorizontalAlignment="Center">
+                    <Button Content="Registrieren"
+                            Width="130"
+                            Height="42"
+                            Margin="0,0,20,0"
+                            Background="#FF1E88E5"
+                            Foreground="White"
+                            FontWeight="Bold"
+                            FontSize="14"
+                            Click="RegisterButton_Click"/>
+                    <Button Content="Abbrechen"
+                            Width="130"
+                            Height="42"
+                            Background="#F5F5F5"
+                            BorderBrush="#DDD"
+                            Click="CancelButton_Click"/>
+                </StackPanel>
 
-            <StackPanel Grid.Row="8"
-                        Grid.ColumnSpan="2"
-                        Orientation="Horizontal"
-                        HorizontalAlignment="Center">
-                <Button Content="Registrieren"
-                        Width="120"
-                        Margin="0,0,20,0"
-                        Click="RegisterButton_Click"/>
-                <Button Content="Abbrechen"
-                        Width="120"
-                        Click="CancelButton_Click"/>
-            </StackPanel>
-
-        </Grid>
+            </Grid>
+        </Border>
 
     </Grid>
 </Page>
diff --git a/SkyTeam/SettingsPage.xaml.cs b/SkyTeam/SettingsPage.xaml.cs
index d7f32e8..f27550f 100644
--- a/SkyTeam/SettingsPage.xaml.cs
+++ b/SkyTeam/SettingsPage.xaml.cs
@@ -17,7 +17,7 @@ namespace SkyTeam
         {
             _isDark = true;
             DarkModeToggle.Content = "An";
-            // Apply dark theme to parent window
+           
             if (Window.GetWindow(this) is MainWindow mainWindow)
             {
                 mainWindow.Background = Brushes.Black;