diff --git a/smx-config/DiagnosticsWidgets.cs b/smx-config/DiagnosticsWidgets.cs
index 7af0619..d53769b 100644
--- a/smx-config/DiagnosticsWidgets.cs
+++ b/smx-config/DiagnosticsWidgets.cs
@@ -377,8 +377,8 @@ namespace smx_config
         // Return all panel selection buttons.
         DiagnosticsPanelButton[] getPanelSelectionButtons()
         {
-            DiagnosticsPanelButton[] result = new DiagnosticsPanelButton[9];
-            for(int i = 0; i < 9; ++i)
+            DiagnosticsPanelButton[] result = new DiagnosticsPanelButton[18];
+            for(int i = 0; i < 18; ++i)
             {
                 result[i] = Template.FindName("Panel" + i, this) as DiagnosticsPanelButton;
             }
diff --git a/smx-config/MainWindow.xaml b/smx-config/MainWindow.xaml
index c599008..61c1a96 100644
--- a/smx-config/MainWindow.xaml
+++ b/smx-config/MainWindow.xaml
@@ -513,17 +513,17 @@ Use if the platform is too sensitive.</clr:String>
                                 <Grid x:Name="P2Diagnostics" Margin="0,50,0,0"
                                     Background="#FFE5E5E5" Width="200" Height="200"
                                       HorizontalAlignment="Center" VerticalAlignment="Top">
-                                    <controls:DiagnosticsPanelButton Panel="9" Margin="-120,-120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    <controls:DiagnosticsPanelButton Panel="10" Margin="0,-120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    <controls:DiagnosticsPanelButton Panel="11" Margin="120,-120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel9" Panel="9" Margin="-120,-120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel10" Panel="10" Margin="0,-120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel11" Panel="11" Margin="120,-120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
 
-                                    <controls:DiagnosticsPanelButton Panel="12" Margin="-120,0,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    <controls:DiagnosticsPanelButton Panel="13" Margin="0,0,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    <controls:DiagnosticsPanelButton Panel="14" Margin="120,0,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel12" Panel="12" Margin="-120,0,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel13" Panel="13" Margin="0,0,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel14" Panel="14" Margin="120,0,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
 
-                                    <controls:DiagnosticsPanelButton Panel="15" Margin="-120,120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    <controls:DiagnosticsPanelButton Panel="16" Margin="0,120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    <controls:DiagnosticsPanelButton Panel="17" Margin="120,120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel15" Panel="15" Margin="-120,120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel16" Panel="16" Margin="0,120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <controls:DiagnosticsPanelButton x:Name="Panel17" Panel="17" Margin="120,120,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
                                 </Grid>
                             </StackPanel>