diff --git a/LiamWorkflowDiagnostics/MainWindow.xaml b/LiamWorkflowDiagnostics/MainWindow.xaml
index afeebef..0b2f7f2 100644
--- a/LiamWorkflowDiagnostics/MainWindow.xaml
+++ b/LiamWorkflowDiagnostics/MainWindow.xaml
@@ -454,20 +454,32 @@
             </Grid>
         </GroupBox>
 
-        <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,0,8">
+        <Grid Grid.Row="5" Margin="0,0,0,8">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
             <CheckBox x:Name="WhatIfCheckBox"
+                      Grid.Column="0"
                       Content="WhatIf aktiv (Schreibaktionen nur simulieren)"
                       Margin="0,0,16,0"
                       VerticalAlignment="Center"
                       IsChecked="True"
                       Click="WhatIfCheckBox_Click"/>
-            <Button x:Name="LoadJsonButton" Content="Load JSON" Width="110" Margin="0,0,8,0" Click="LoadJsonButton_Click"/>
-            <Button x:Name="ExportJsonButton" Content="Export Sanitized JSON" Width="170" Margin="0,0,8,0" Click="ExportJsonButton_Click"/>
-            <Button x:Name="InitializeButton" Content="Initialize Provider" Width="160" Margin="0,0,8,0" Click="InitializeButton_Click"/>
-            <Button x:Name="FetchDataAreasButton" Content="Fetch Data Areas" Width="160" Margin="0,0,8,0" Click="FetchDataAreasButton_Click"/>
-            <Button x:Name="FetchSecurityGroupsButton" Content="Fetch Security Groups" Width="170" Margin="0,0,8,0" Click="FetchSecurityGroupsButton_Click"/>
-            <Button x:Name="ClearLogButton" Content="Clear Log" Width="110" Click="ClearLogButton_Click"/>
-        </StackPanel>
+
+            <WrapPanel Grid.Column="1"
+                       HorizontalAlignment="Right"
+                       ItemHeight="26"
+                       Orientation="Horizontal">
+                <Button x:Name="LoadJsonButton" Content="Load JSON" Width="110" Margin="0,0,8,8" Click="LoadJsonButton_Click"/>
+                <Button x:Name="ExportJsonButton" Content="Export Sanitized JSON" Width="170" Margin="0,0,8,8" Click="ExportJsonButton_Click"/>
+                <Button x:Name="InitializeButton" Content="Initialize Provider" Width="160" Margin="0,0,8,8" Click="InitializeButton_Click"/>
+                <Button x:Name="FetchDataAreasButton" Content="Fetch Data Areas" Width="160" Margin="0,0,8,8" Click="FetchDataAreasButton_Click"/>
+                <Button x:Name="FetchSecurityGroupsButton" Content="Fetch Security Groups" Width="170" Margin="0,0,8,8" Click="FetchSecurityGroupsButton_Click"/>
+                <Button x:Name="ClearLogButton" Content="Clear Log" Width="110" Margin="0,0,0,8" Click="ClearLogButton_Click"/>
+            </WrapPanel>
+        </Grid>
 
         <GroupBox Header="Result" Grid.Row="6" Margin="0,0,0,8">
             <Grid Margin="10">