diff --git a/Aaru.Gui/Views/Tabs/DvdInfo.xaml b/Aaru.Gui/Views/Tabs/DvdInfo.xaml
index 20a8f6d56..d7ae9ea09 100644
--- a/Aaru.Gui/Views/Tabs/DvdInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/DvdInfo.xaml
@@ -104,27 +104,29 @@
                 </Grid>
             </TabItem>
         </TabControl>
-        <StackPanel Grid.Row="1"
-                    Orientation="Horizontal"
-                    Spacing="8"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Bottom">
+        <WrapPanel Grid.Row="1"
+                   HorizontalAlignment="Left"
+                   VerticalAlignment="Bottom">
             <Button Command="{Binding SaveDvdDmiCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdDmiVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdDmiVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Disc_Manufacturer_Information}" />
             </Button>
             <Button Command="{Binding SaveHdDvdCmiCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveHdDvdCmiVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveHdDvdCmiVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Copyright_Management_Information}" />
             </Button>
             <Button Command="{Binding SaveDvdBcaCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdBcaVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdBcaVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Burst_Cutting_Area}" />
             </Button>
             <Button Command="{Binding SaveDvdAacsCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdAacsVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdAacsVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_AACS_Information}" />
             </Button>
-        </StackPanel>
+        </WrapPanel>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
index f246b5e45..36248bb96 100644
--- a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
@@ -128,63 +128,74 @@
                 </Grid>
             </TabItem>
         </TabControl>
-        <StackPanel Grid.Row="1"
-                    Orientation="Horizontal"
-                    Spacing="8"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Bottom">
+        <WrapPanel Grid.Row="1"
+                   HorizontalAlignment="Left"
+                   VerticalAlignment="Bottom">
             <Button Command="{Binding SaveLastBorderOutRmdCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveLastBorderOutRmdVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveLastBorderOutRmdVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Last_Border_Out_RMD}" />
             </Button>
             <Button Command="{Binding SaveDvdPreRecordedInfoCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdPreRecordedInfoVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdPreRecordedInfoVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Pre_Recorded_Physical_Information}" />
             </Button>
             <Button Command="{Binding SaveDvdrMediaIdentifierCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdrMediaIdentifierVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdrMediaIdentifierVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Media_Identifier}" />
             </Button>
             <Button Command="{Binding SaveDvdrPhysicalInformationCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdrPhysicalInformationVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdrPhysicalInformationVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Recordable_Physical_Information}" />
             </Button>
             <Button Command="{Binding SaveHddvdrMediumStatusCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveHddvdrMediumStatusVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveHddvdrMediumStatusVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Medium_Status}" />
             </Button>
             <Button Command="{Binding SaveHddvdrLastRmdCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveHddvdrLastRmdVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveHddvdrLastRmdVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Last_Border_Out_RMD}" />
             </Button>
             <Button Command="{Binding SaveDvdrLayerCapacityCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdrLayerCapacityVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdrLayerCapacityVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Layer_Capacity}" />
             </Button>
             <Button Command="{Binding SaveDvdrDlMiddleZoneStartCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdrDlMiddleZoneStartVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdrDlMiddleZoneStartVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Middle_Zone_Start}" />
             </Button>
             <Button Command="{Binding SaveDvdrDlJumpIntervalSizeCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdrDlJumpIntervalSizeVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdrDlJumpIntervalSizeVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Jump_Interval_Size}" />
             </Button>
             <Button Command="{Binding SaveDvdrDlManualLayerJumpStartLbaCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdrDlManualLayerJumpStartLbaVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdrDlManualLayerJumpStartLbaVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Manual_Layer_Jump_Start_LBA}" />
             </Button>
             <Button Command="{Binding SaveDvdrDlRemapAnchorPointCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdrDlRemapAnchorPointVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdrDlRemapAnchorPointVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Remap_Anchor_Point}" />
             </Button>
             <Button Command="{Binding SaveDvdPlusAdipCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdPlusAdipVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdPlusAdipVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_ADIP}" />
             </Button>
             <Button Command="{Binding SaveDvdPlusDcbCommand, Mode=OneWay}"
-                    IsVisible="{Binding SaveDvdPlusDcbVisible, Mode=OneWay}">
+                    IsVisible="{Binding SaveDvdPlusDcbVisible, Mode=OneWay}"
+                    Margin="4">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_Disc_Control_Blocks}" />
             </Button>
-        </StackPanel>
+        </WrapPanel>
     </Grid>
 </UserControl>
\ No newline at end of file