diff --git a/Aaru.Gui/Views/Panels/ImageInfo.xaml b/Aaru.Gui/Views/Panels/ImageInfo.xaml
index 6776ba4aa..266a0c9ab 100644
--- a/Aaru.Gui/Views/Panels/ImageInfo.xaml
+++ b/Aaru.Gui/Views/Panels/ImageInfo.xaml
@@ -45,24 +45,24 @@
     <Design.DataContext>
         <panels:ImageInfoViewModel />
     </Design.DataContext>
-    <StackPanel Margin="12"
-                Spacing="8">
-        <Image Width="128"
+    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto" Margin="12"
+                RowSpacing="8">
+        <Image Grid.Row="0" Width="128"
                Height="128"
                HorizontalAlignment="Center"
                VerticalAlignment="Center"
                Source="{Binding MediaLogo, Mode=OneWay}" />
-        <controls:SpectreTextBlock Text="{x:Static localization:UI.Title_Image_information}"
+        <controls:SpectreTextBlock Grid.Row="1" Text="{x:Static localization:UI.Title_Image_information}"
                                    FontWeight="Bold" />
-        <controls:SpectreTextBlock Text="{Binding ImagePathText, Mode=OneWay}" />
-        <controls:SpectreTextBlock Text="{Binding FilterText, Mode=OneWay}" />
-        <controls:SpectreTextBlock Text="{Binding ImageIdentifiedText, Mode=OneWay}" />
-        <TabControl>
-            <TabItem>
+        <controls:SpectreTextBlock Grid.Row="2" Text="{Binding ImagePathText, Mode=OneWay}" />
+        <controls:SpectreTextBlock Grid.Row="3" Text="{Binding FilterText, Mode=OneWay}" />
+        <controls:SpectreTextBlock Grid.Row="4" Text="{Binding ImageIdentifiedText, Mode=OneWay}" />
+        <TabControl Grid.Row="5">
+            <TabItem Margin="8">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:UI.Title_General}" />
                 </TabItem.Header>
-                <StackPanel Spacing="8">
+                <StackPanel Spacing="8" Margin="8">
                     <controls:SpectreTextBlock Text="{Binding ImageFormatText, Mode=OneWay}"
                                                IsVisible="{Binding !!ImageFormatText, Mode=OneWay}" />
                     <controls:SpectreTextBlock Text="{Binding ApplicationText, Mode=OneWay}"
@@ -161,7 +161,7 @@
                           IsReadOnly="True"
                           Height="400"
                           VerticalAlignment="Stretch"
-                          HorizontalAlignment="Stretch">
+                          HorizontalAlignment="Stretch" Margin="8">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.HeaderTemplate>
@@ -255,7 +255,7 @@
                           IsReadOnly="True"
                           Height="400"
                           VerticalAlignment="Stretch"
-                          HorizontalAlignment="Stretch">
+                          HorizontalAlignment="Stretch" Margin="8">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.HeaderTemplate>
@@ -394,7 +394,7 @@
                 </TabItem.Header>
                 <DataGrid ItemsSource="{Binding DumpHardwareList, Mode=OneWay}"
                           IsVisible="{Binding !!DumpHardwareList.Count, Mode=OneWay}"
-                          IsReadOnly="True">
+                          IsReadOnly="True" Margin="8">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.HeaderTemplate>
@@ -547,59 +547,59 @@
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:UI.Title_SCSI}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding ScsiInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding ScsiInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!AtaInfo, Mode=OneWay}">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:UI.Title_ATA_ATAPI}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding AtaInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding AtaInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!CompactDiscInfo, Mode=OneWay}">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:Core.Title_CompactDisc}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding CompactDiscInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding CompactDiscInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!DvdInfo, Mode=OneWay}">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:Core.Title_DVD_HD_DVD}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding DvdInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding DvdInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!DvdWritableInfo, Mode=OneWay}">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:Core.Title_DVD_Plus_Dash_R_W}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding DvdWritableInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding DvdWritableInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!BlurayInfo, Mode=OneWay}">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:Core.Title_Blu_ray}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding BlurayInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding BlurayInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!PcmciaInfo, Mode=OneWay}">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:UI.Title_PCMCIA}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding PcmciaInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding PcmciaInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!SdMmcInfo, Mode=OneWay}">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:UI.Title_SD_MMC}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding SdMmcInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding SdMmcInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!XboxInfo, Mode=OneWay}">
                 <TabItem.Header>
                     <TextBlock Text="{x:Static localization:Core.Title_Xbox}" />
                 </TabItem.Header>
-                <ContentControl Content="{Binding XboxInfo, Mode=OneWay}" />
+                <ContentControl Content="{Binding XboxInfo, Mode=OneWay}" Margin="8" />
             </TabItem>
         </TabControl>
-        <StackPanel Orientation="Horizontal"
-                    Spacing="8">
+        <StackPanel Grid.Row="6" Orientation="Horizontal"
+                    Spacing="8" VerticalAlignment="Bottom" HorizontalAlignment="Right">
             <Button Command="{Binding EntropyCommand, Mode=OneWay}">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Calculate_entropy}" />
             </Button>
@@ -622,5 +622,5 @@
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Decode_media_tags}" />
             </Button>
         </StackPanel>
-    </StackPanel>
+    </Grid>
 </UserControl>
\ No newline at end of file