diff --git a/Aaru.Gui/Views/Tabs/XboxInfo.xaml b/Aaru.Gui/Views/Tabs/XboxInfo.xaml
index a0c768a99..7c27a183d 100644
--- a/Aaru.Gui/Views/Tabs/XboxInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/XboxInfo.xaml
@@ -45,93 +45,167 @@
     <Design.DataContext>
         <tabs:XboxInfoViewModel />
     </Design.DataContext>
-    <StackPanel>
-        <StackPanel IsVisible="{Binding XboxInformationVisible, Mode=OneWay}">
-            <StackPanel Orientation="Horizontal"
-                        IsVisible="{Binding !!XboxL0VideoText, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:Core.Video_layer_zero_size}" />
-                <TextBox IsReadOnly="True"
-                         Text="{Binding XboxL0VideoText, Mode=OneWay}"
-                         Background="Transparent"
-                         BorderThickness="0"
-                         Cursor="Arrow"
-                         Padding="4,0,0,0" />
+    <Grid RowDefinitions="*,Auto"
+          Margin="8"
+          RowSpacing="8">
+        <ScrollViewer Grid.Row="0"
+                      HorizontalScrollBarVisibility="Disabled"
+                      VerticalScrollBarVisibility="Auto">
+            <StackPanel Spacing="16">
+                <!-- Xbox Disc Information Section -->
+                <Border IsVisible="{Binding XboxInformationVisible, Mode=OneWay}"
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+                        CornerRadius="8"
+                        Padding="12">
+                    <StackPanel Spacing="8">
+                        <TextBlock Text="{x:Static localization:UI.Title_Information}"
+                                   FontWeight="Bold" />
+                        <Grid ColumnDefinitions="Auto,*"
+                              RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto"
+                              ColumnSpacing="8"
+                              RowSpacing="4"
+                              IsVisible="{Binding !!XboxL0VideoText, Mode=OneWay}">
+                            <TextBlock Grid.Row="0"
+                                       Grid.Column="0"
+                                       Text="{x:Static localization:Core.Video_layer_zero_size}"
+                                       VerticalAlignment="Center" />
+                            <TextBox Grid.Row="0"
+                                     Grid.Column="1"
+                                     IsReadOnly="True"
+                                     Text="{Binding XboxL0VideoText, Mode=OneWay}"
+                                     Background="Transparent"
+                                     BorderThickness="0"
+                                     Cursor="Arrow"
+                                     Padding="0"
+                                     VerticalAlignment="Center" />
+                        </Grid>
+                        <Grid ColumnDefinitions="Auto,*"
+                              ColumnSpacing="8"
+                              IsVisible="{Binding !!XboxL1VideoText, Mode=OneWay}">
+                            <TextBlock Grid.Column="0"
+                                       Text="{x:Static localization:Core.Video_layer_one_size}"
+                                       VerticalAlignment="Center" />
+                            <TextBox Grid.Column="1"
+                                     IsReadOnly="True"
+                                     Text="{Binding XboxL1VideoText, Mode=OneWay}"
+                                     Background="Transparent"
+                                     BorderThickness="0"
+                                     Cursor="Arrow"
+                                     Padding="0"
+                                     VerticalAlignment="Center" />
+                        </Grid>
+                        <Grid ColumnDefinitions="Auto,*"
+                              ColumnSpacing="8"
+                              IsVisible="{Binding !!XboxMiddleZoneText, Mode=OneWay}">
+                            <TextBlock Grid.Column="0"
+                                       Text="{x:Static localization:Core.Middle_zone_size}"
+                                       VerticalAlignment="Center" />
+                            <TextBox Grid.Column="1"
+                                     IsReadOnly="True"
+                                     Text="{Binding XboxMiddleZoneText, Mode=OneWay}"
+                                     Background="Transparent"
+                                     BorderThickness="0"
+                                     Cursor="Arrow"
+                                     Padding="0"
+                                     VerticalAlignment="Center" />
+                        </Grid>
+                        <Grid ColumnDefinitions="Auto,*"
+                              ColumnSpacing="8"
+                              IsVisible="{Binding !!XboxGameSizeText, Mode=OneWay}">
+                            <TextBlock Grid.Column="0"
+                                       Text="{x:Static localization:Core.Game_data_size}"
+                                       VerticalAlignment="Center" />
+                            <TextBox Grid.Column="1"
+                                     IsReadOnly="True"
+                                     Text="{Binding XboxGameSizeText, Mode=OneWay}"
+                                     Background="Transparent"
+                                     BorderThickness="0"
+                                     Cursor="Arrow"
+                                     Padding="0"
+                                     VerticalAlignment="Center" />
+                        </Grid>
+                        <Grid ColumnDefinitions="Auto,*"
+                              ColumnSpacing="8"
+                              IsVisible="{Binding !!XboxTotalSizeText, Mode=OneWay}">
+                            <TextBlock Grid.Column="0"
+                                       Text="{x:Static localization:Core.Total_size}"
+                                       VerticalAlignment="Center" />
+                            <TextBox Grid.Column="1"
+                                     IsReadOnly="True"
+                                     Text="{Binding XboxTotalSizeText, Mode=OneWay}"
+                                     Background="Transparent"
+                                     BorderThickness="0"
+                                     Cursor="Arrow"
+                                     Padding="0"
+                                     VerticalAlignment="Center" />
+                        </Grid>
+                        <Grid ColumnDefinitions="Auto,*"
+                              ColumnSpacing="8"
+                              IsVisible="{Binding !!XboxRealBreakText, Mode=OneWay}">
+                            <TextBlock Grid.Column="0"
+                                       Text="{x:Static localization:Core.Real_layer_break}"
+                                       VerticalAlignment="Center" />
+                            <TextBox Grid.Column="1"
+                                     IsReadOnly="True"
+                                     Text="{Binding XboxRealBreakText, Mode=OneWay}"
+                                     Background="Transparent"
+                                     BorderThickness="0"
+                                     Cursor="Arrow"
+                                     Padding="0"
+                                     VerticalAlignment="Center" />
+                        </Grid>
+                    </StackPanel>
+                </Border>
+
+                <!-- Disc Manufacturing Information Section -->
+                <Border IsVisible="{Binding !!XboxDmiText, Mode=OneWay}"
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+                        CornerRadius="8"
+                        Padding="12">
+                    <StackPanel Spacing="8">
+                        <TextBlock Text="{x:Static localization:UI.Title_Disc_Manufacturing_Information}"
+                                   FontWeight="Bold" />
+                        <TextBox IsReadOnly="True"
+                                 Text="{Binding XboxDmiText, Mode=OneWay}"
+                                 Background="Transparent"
+                                 BorderThickness="0"
+                                 Cursor="Arrow"
+                                 Padding="0"
+                                 TextWrapping="Wrap" />
+                    </StackPanel>
+                </Border>
+
+                <!-- Security Sector Section -->
+                <Border IsVisible="{Binding !!XboxSsText, Mode=OneWay}"
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+                        CornerRadius="8"
+                        Padding="12">
+                    <StackPanel Spacing="8">
+                        <TextBlock Text="{x:Static localization:UI.Title_Security_Sector}"
+                                   FontWeight="Bold" />
+                        <TextBox IsReadOnly="True"
+                                 Text="{Binding XboxSsText, Mode=OneWay}"
+                                 Background="Transparent"
+                                 BorderThickness="0"
+                                 Cursor="Arrow"
+                                 Padding="0"
+                                 TextWrapping="Wrap" />
+                    </StackPanel>
+                </Border>
             </StackPanel>
-            <StackPanel Orientation="Horizontal"
-                        IsVisible="{Binding !!XboxL1VideoText, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:Core.Video_layer_one_size}" />
-                <TextBox IsReadOnly="True"
-                         Text="{Binding XboxL1VideoText, Mode=OneWay}"
-                         Background="Transparent"
-                         BorderThickness="0"
-                         Cursor="Arrow"
-                         Padding="4,0,0,0" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal"
-                        IsVisible="{Binding !!XboxMiddleZoneText, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:Core.Middle_zone_size}" />
-                <TextBox IsReadOnly="True"
-                         Text="{Binding XboxMiddleZoneText, Mode=OneWay}"
-                         Background="Transparent"
-                         BorderThickness="0"
-                         Cursor="Arrow"
-                         Padding="4,0,0,0" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal"
-                        IsVisible="{Binding !!XboxGameSizeText, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:Core.Game_data_size}" />
-                <TextBox IsReadOnly="True"
-                         Text="{Binding XboxGameSizeText, Mode=OneWay}"
-                         Background="Transparent"
-                         BorderThickness="0"
-                         Cursor="Arrow"
-                         Padding="4,0,0,0" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal"
-                        IsVisible="{Binding !!XboxTotalSizeText, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:Core.Total_size}" />
-                <TextBox IsReadOnly="True"
-                         Text="{Binding XboxTotalSizeText, Mode=OneWay}"
-                         Background="Transparent"
-                         BorderThickness="0"
-                         Cursor="Arrow"
-                         Padding="4,0,0,0" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal"
-                        IsVisible="{Binding !!XboxRealBreakText, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:Core.Real_layer_break}" />
-                <TextBox IsReadOnly="True"
-                         Text="{Binding XboxRealBreakText, Mode=OneWay}"
-                         Background="Transparent"
-                         BorderThickness="0"
-                         Cursor="Arrow"
-                         Padding="4,0,0,0" />
-            </StackPanel>
-        </StackPanel>
-        <StackPanel>
-            <StackPanel IsVisible="{Binding !!XboxDmiText, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:UI.Title_Disc_Manufacturing_Information}" />
-                <TextBox IsReadOnly="True"
-                         Text="{Binding XboxDmiText, Mode=OneWay}"
-                         Background="Transparent"
-                         BorderThickness="0"
-                         Cursor="Arrow"
-                         Padding="0" />
-            </StackPanel>
-            <StackPanel IsVisible="{Binding !!XboxSsText, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:UI.Title_Security_Sector}" />
-                <TextBox IsReadOnly="True"
-                         Text="{Binding XboxSsText, Mode=OneWay}"
-                         Background="Transparent"
-                         BorderThickness="0"
-                         Cursor="Arrow"
-                         Padding="0" />
-            </StackPanel>
-            <Button HorizontalAlignment="Right"
-                    IsVisible="{Binding SaveXboxSsVisible, Mode=OneWay}"
-                    Command="{Binding SaveXboxSsCommand, Mode=OneWay}">
-                <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Xbox_Security_Sector}" />
-            </Button>
-        </StackPanel>
-    </StackPanel>
+        </ScrollViewer>
+
+        <!-- Bottom Button -->
+        <Button Grid.Row="1"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Bottom"
+                IsVisible="{Binding SaveXboxSsVisible, Mode=OneWay}"
+                Command="{Binding SaveXboxSsCommand, Mode=OneWay}"
+                Margin="4">
+            <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Xbox_Security_Sector}" />
+        </Button>
+    </Grid>
 </UserControl>
\ No newline at end of file