diff --git a/Jugenddienst Stunden/Views/LoginPage.xaml b/Jugenddienst Stunden/Views/LoginPage.xaml
index 109d7ae..950f0a7 100644
--- a/Jugenddienst Stunden/Views/LoginPage.xaml	
+++ b/Jugenddienst Stunden/Views/LoginPage.xaml	
@@ -2,7 +2,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:models="clr-namespace:Jugenddienst_Stunden.ViewModels"
-            xmlns:zxing="clr-namespace:ZXing.Net.Maui.Controls;assembly=ZXing.Net.MAUI.Controls"
+             xmlns:zxing="clr-namespace:ZXing.Net.Maui.Controls;assembly=ZXing.Net.MAUI.Controls"
              xmlns:conv="clr-namespace:Jugenddienst_Stunden.Converter"
              x:Class="Jugenddienst_Stunden.Views.LoginPage"
              Title="{Binding Title}">
@@ -19,55 +19,50 @@
     </ContentPage.Resources>
 
     <ScrollView>
-        <VerticalStackLayout Spacing="10" Margin="15">
+        <VerticalStackLayout Spacing="10" Margin="15,0">
 
-            <HorizontalStackLayout Spacing="10">
-                <Label FontSize="22" FontAttributes="Bold" Text="{Binding AppTitle}" Margin="0,4,0,0" />
-                <Label FontSize="22" Text="{Binding Version}" Margin="0,4,0,0" />
-
-                <HorizontalStackLayout HorizontalOptions="End" Spacing="10" Margin="25,0,0,0">
-                    <Label Text="Login QR/manuell" Margin="0,12,0,0"/>
-                    <Switch x:Name="LoginSwitch" IsToggled="False" Toggled="Switch_Toggled">
-                        
-                    </Switch>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <HorizontalStackLayout Spacing="10" HorizontalOptions="Start" Grid.Column="0">
+                    <Label FontSize="22" FontAttributes="Bold" Text="{Binding AppTitle}" Margin="0,4,0,0" />
+                    <Label FontSize="22" Text="{Binding Version}" Margin="0,4,0,0" />
                 </HorizontalStackLayout>
-                
-            </HorizontalStackLayout>
+                <HorizontalStackLayout HorizontalOptions="End" Spacing="10" Grid.Column="1">
+                    <Label Text="Login QR/manuell" Margin="0,12,0,0"/>
+                    <Switch x:Name="LoginSwitch" IsToggled="False" Toggled="Switch_Toggled"/>
+                </HorizontalStackLayout>
+            </Grid>
 
+            <Label x:Name="ServerLabel" Text="{Binding Server}" IsVisible="{Binding Server, Converter={StaticResource StringVisibilityConverter}}" />
 
+            <VerticalStackLayout x:Name="LoginQR">
+                <Label Text="Login mit QR-Code" FontSize="32" HorizontalOptions="Start" />
+                <Label x:Name="Message" Text="{Binding Message}" Margin="0,15" />
 
-            <Label x:Name="Message" Text="{Binding Message}" HeightRequest="40" />
-            <Label x:Name="ServerLabel" Text="{Binding Server}" HeightRequest="25" Margin="0,0,0,10" IsVisible="{Binding Server, Converter={StaticResource StringVisibilityConverter}}" />
-
-            <Frame x:Name="LoginQR" HeightRequest="300" Padding="0" CornerRadius="0">
-                <zxing:CameraBarcodeReaderView x:Name="barcodeScannerView"
+                <Border HeightRequest="300" Padding="0">
+                    <zxing:CameraBarcodeReaderView x:Name="barcodeScannerView"
                                 BarcodesDetected="BarcodesDetected"
                                 HorizontalOptions="FillAndExpand"
                                 VerticalOptions="FillAndExpand"/>
-            </Frame>
+                </Border>
+            </VerticalStackLayout>
 
-            <VerticalStackLayout x:Name="LoginManual" Padding="30" Spacing="15">
-                <Label Text="Manueller Login" 
-   FontSize="32"
-   HorizontalOptions="Start" />
+            <VerticalStackLayout x:Name="LoginManual" Spacing="15">
+                <Label Text="Manueller Login" FontSize="32" HorizontalOptions="Start" />
 
-                <Entry x:Name="UsernameEntry"
-   Placeholder="Benutzername"
-   Keyboard="Email" />
+                <Entry x:Name="UsernameEntry" Placeholder="Benutzername" Keyboard="Email" />
 
-                <Entry x:Name="PasswordEntry"
-   Placeholder="Passwort"
-   IsPassword="True" />
+                <Entry x:Name="PasswordEntry" Placeholder="Passwort" IsPassword="True" />
 
-                <Entry x:Name="ServerEntry"
-    Placeholder="Server"
-    Keyboard="Url" />
+                <Entry x:Name="ServerEntry" Placeholder="Server" Keyboard="Url" />
 
                 <Button Text="Login" Clicked="OnLoginButtonClicked" />
-
             </VerticalStackLayout>
         </VerticalStackLayout>
-        
+
     </ScrollView>