diff --git a/Aaru.Gui/Views/Windows/ViewSector.xaml b/Aaru.Gui/Views/Windows/ViewSector.xaml
index 32fde0d87..b00a49c21 100644
--- a/Aaru.Gui/Views/Windows/ViewSector.xaml
+++ b/Aaru.Gui/Views/Windows/ViewSector.xaml
@@ -37,28 +37,38 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows"
         xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization"
+        xmlns:controls="clr-namespace:Aaru.Gui.Controls"
         mc:Ignorable="d"
         d:DesignWidth="800"
         d:DesignHeight="450"
-        Width="480"
-        Height="320"
+        Width="640"
+        Height="480"
         x:Class="Aaru.Gui.Views.Windows.ViewSector"
         Icon="/Assets/aaru-logo.png"
-        CanResize="False"
-        Title="{Binding Title}">
+        Title="{x:Static localization:UI.Title_Sector_viewer}">
     <Design.DataContext>
         <windows:ViewSectorViewModel />
     </Design.DataContext>
-    <StackPanel Orientation="Vertical">
-        <StackPanel Orientation="Horizontal">
-            <TextBlock Text="{x:Static localization:UI.Title_Sector}" />
-            <NumericUpDown Value="{Binding SectorNumber}" /> <TextBlock Text="{Binding TotalSectorsText}" />
+    <Grid RowDefinitions="Auto,Auto,*"
+          Margin="12"
+          RowSpacing="8">
+        <StackPanel Grid.Row="0"
+                    Orientation="Horizontal"
+                    Spacing="8">
+            <TextBlock Text="{x:Static localization:UI.Title_Sector}"
+                       VerticalAlignment="Center" />
+            <NumericUpDown Value="{Binding SectorNumber, Mode=TwoWay}"
+                           Width="120" />
+            <TextBlock Text="{Binding TotalSectorsText, Mode=OneWay}"
+                       VerticalAlignment="Center" />
         </StackPanel>
-        <CheckBox IsChecked="{Binding LongSectorChecked}"
-                  IsVisible="{Binding LongSectorVisible}">
+        <CheckBox Grid.Row="1"
+                  IsChecked="{Binding LongSectorChecked, Mode=TwoWay}"
+                  IsVisible="{Binding LongSectorVisible, Mode=OneWay}">
             <TextBlock Text="{x:Static localization:UI.Show_long_sector}" />
         </CheckBox>
-        <TextBox IsReadOnly="True"
-                 Text="{Binding PrintHexText}" />
-    </StackPanel>
+        <controls:HexViewPanel Grid.Row="2"
+                               ColorRanges="{Binding HighlightRanges, Mode=OneWay}"
+                               Data="{Binding SectorData, Mode=OneWay}" />
+    </Grid>
 </Window>
\ No newline at end of file
diff --git a/Aaru.Localization/UI.Designer.cs b/Aaru.Localization/UI.Designer.cs
index f69d6dac7..df6ce09c3 100644
--- a/Aaru.Localization/UI.Designer.cs
+++ b/Aaru.Localization/UI.Designer.cs
@@ -6243,5 +6243,11 @@ namespace Aaru.Localization {
                 return ResourceManager.GetString("Title_Convert_image", resourceCulture);
             }
         }
+        
+        public static string Title_Sector_viewer {
+            get {
+                return ResourceManager.GetString("Title_Sector_viewer", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Aaru.Localization/UI.es.resx b/Aaru.Localization/UI.es.resx
index 2a6ebede8..c3f653c95 100644
--- a/Aaru.Localization/UI.es.resx
+++ b/Aaru.Localization/UI.es.resx
@@ -3122,4 +3122,7 @@ Probadores:
     <data name="Title_Convert_image" xml:space="preserve">
         <value>Convertir imagen</value>
     </data>
+    <data name="Title_Sector_viewer" xml:space="preserve">
+        <value>Visor de sectores</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/Aaru.Localization/UI.resx b/Aaru.Localization/UI.resx
index 57b95b7b4..7c8d5f727 100644
--- a/Aaru.Localization/UI.resx
+++ b/Aaru.Localization/UI.resx
@@ -3198,4 +3198,7 @@ Do you want to continue?</value>
     <data name="Title_Convert_image" xml:space="preserve">
         <value>Convert image</value>
     </data>
+    <data name="Title_Sector_viewer" xml:space="preserve">
+        <value>Sector viewer</value>
+    </data>
 </root>
\ No newline at end of file