From f929aaebb7a3b7486b520c187067e65963fe78ab Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Wed, 26 Aug 2026 13:48:42 +1000
Subject: [PATCH 1/6] SCMU add instance UI changes

---
 .../AddServiceControlInstanceCommand.cs       |  32 +-
 .../UI/InstanceAdd/ServiceControlAddView.xaml |  74 +---
 .../InstanceAdd/ServiceControlAddViewModel.cs |   4 +-
 .../UI/Shell/NewInstancePopup.xaml            | 353 +++++++++++-------
 .../UI/Shell/NewInstancePopup.xaml.cs         | 223 ++++++++++-
 .../UI/Shell/ShellViewModel.cs                |   8 +
 6 files changed, 485 insertions(+), 209 deletions(-)

diff --git a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
index c8ce21013e..a3176cce56 100644
--- a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
+++ b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
@@ -1,6 +1,8 @@
-namespace ServiceControl.Config.Commands
+namespace ServiceControl.Config.Commands
 {
     using System;
+    using System.Linq;
+    using System.Threading;
     using System.Threading.Tasks;
     using Framework;
     using Framework.Commands;
@@ -27,8 +29,34 @@ public override async Task ExecuteAsync(object obj)
             await windowManager.ShowInnerDialog(instanceViewModel);
         }
 
+        public async Task ExecuteWithOptions(bool installError, bool installAudit, bool installServicePulse, CancellationToken cancellationToken = default)
+        {
+            if (!await commandChecks.CanAddInstance(true, cancellationToken))
+            {
+                return;
+            }
+
+            var instanceViewModel = addInstance();
+            instanceViewModel.InstallErrorInstance = installError;
+            instanceViewModel.InstallAuditInstance = installAudit;
+
+            if (installError)
+            {
+                var spOption = installServicePulse
+                    ? instanceViewModel.ServiceControl.EnableIntegratedServicePulseOptions.FirstOrDefault(o => o.Value)
+                    : instanceViewModel.ServiceControl.EnableIntegratedServicePulseOptions.FirstOrDefault(o => !o.Value);
+
+                if (spOption != null)
+                {
+                    instanceViewModel.ServiceControl.EnableIntegratedServicePulse = spOption;
+                }
+            }
+
+            await windowManager.ShowInnerDialog(instanceViewModel, cancellationToken: cancellationToken);
+        }
+
         readonly Func<ServiceControlAddViewModel> addInstance;
         readonly IServiceControlWindowManager windowManager;
         readonly ScmuCommandChecks commandChecks;
     }
-}
\ No newline at end of file
+}
diff --git a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddView.xaml b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddView.xaml
index 2e0edd5bfe..8b34111dc8 100644
--- a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddView.xaml
+++ b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddView.xaml
@@ -73,34 +73,14 @@
                                                   Converter={StaticResource boolToVis}}" />
                 </StackPanel>
 
-                <TextBlock Padding="0, 0, 0, 10" Visibility="{Binding OneInstanceTypeSelected, Converter={StaticResource boolToVisInverted}}"
-                            FontSize="13px"
-                            Foreground="{StaticResource ErrorBrush}"
-                            Text="Must select either an audit or an error instance." />
-
-                <StackPanel>
-                    <!-- Horizontal layout: CheckBox + Expander side by side -->
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-
-                        <CheckBox Grid.Column="0" 
-                                  Padding="0, 0, 0, 0" 
-                                  IsChecked="{Binding InstallErrorInstance}"
-                                  VerticalAlignment="Top"
-                                  Margin="0,8,8,5"/>
-
-                        <Expander Grid.Column="1" 
-                                  Header="ServiceControl" 
-                                  IsExpanded="{Binding IsServiceControlExpanded}" 
-                                  IsEnabled="{Binding InstallErrorInstance}"
-                                  Margin="0,5,0,5"
-                                  MouseDown="Button_MouseDown" 
-                                  PreviewMouseDown="Button_MouseDown" 
-                                  PreviewMouseLeftButtonDown="Button_MouseDown">
-                            <StackPanel Margin="60,0,60,0" Visibility="{Binding InstallErrorInstance, Converter={StaticResource boolToVis}}">
+                <StackPanel Visibility="{Binding InstallErrorInstance, Converter={StaticResource boolToVis}}">
+                    <Expander Header="ServiceControl"
+                              IsExpanded="{Binding IsServiceControlExpanded}"
+                              Margin="0,5,0,5"
+                              MouseDown="Button_MouseDown"
+                              PreviewMouseDown="Button_MouseDown"
+                              PreviewMouseLeftButtonDown="Button_MouseDown">
+                            <StackPanel Margin="60,0,60,0">
                                 <Border Margin="0,40,0,20"
                                 BorderBrush="{StaticResource Gray70Brush}"
                                 BorderThickness="0,0,0,1">
@@ -261,34 +241,17 @@
                                                ItemsSource="{Binding ErrorEnableIntegratedServicePulseOptions}"
                                                SelectedValue="{Binding ErrorEnableIntegratedServicePulse}" />
                             </StackPanel>
-                        </Expander>
-                    </Grid>
+                    </Expander>
                 </StackPanel>
 
-                <StackPanel>
-                    <!-- Horizontal layout: CheckBox + Expander side by side -->
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-
-                        <CheckBox Grid.Column="0" 
-                                  Padding="0, 0, 0, 0" 
-                                  IsChecked="{Binding InstallAuditInstance}" 
-                                  IsThreeState="False"
-                                  VerticalAlignment="Top"
-                                  Margin="0,8,8,5"/>
-
-                        <Expander Grid.Column="1" 
-                                  Header="ServiceControl Audit" 
-                                  IsExpanded="{Binding IsServiceControlAuditExpanded}" 
-                                  IsEnabled="{Binding InstallAuditInstance}"
-                                  Margin="0,5,0,5"
-                                  MouseDown="Button_MouseDown" 
-                                  PreviewMouseDown="Button_MouseDown" 
-                                  PreviewMouseLeftButtonDown="Button_MouseDown">
-                            <StackPanel Margin="60,0,60,0" Visibility="{Binding InstallAuditInstance, Converter={StaticResource boolToVis}}">
+                <StackPanel Visibility="{Binding InstallAuditInstance, Converter={StaticResource boolToVis}}">
+                    <Expander Header="ServiceControl Audit"
+                              IsExpanded="{Binding IsServiceControlAuditExpanded}"
+                              Margin="0,5,0,5"
+                              MouseDown="Button_MouseDown"
+                              PreviewMouseDown="Button_MouseDown"
+                              PreviewMouseLeftButtonDown="Button_MouseDown">
+                            <StackPanel Margin="60,0,60,0">
                                 <Border Margin="0,40,0,20"
                                 BorderBrush="{StaticResource Gray70Brush}"
                                 BorderThickness="0,0,0,1">
@@ -458,8 +421,7 @@
                                                ItemsSource="{Binding AuditEnableFullTextSearchOnBodiesOptions}"
                                                SelectedValue="{Binding AuditEnableFullTextSearchOnBodies}" />
                             </StackPanel>
-                        </Expander>
-                    </Grid>
+                    </Expander>
                 </StackPanel>
             </StackPanel>
         </sie:SharedServiceControlEditorView.SharedContent>
diff --git a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModel.cs b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModel.cs
index 0b9621251b..02ddc46a89 100644
--- a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModel.cs
+++ b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModel.cs
@@ -396,9 +396,9 @@ public string AuditDatabasePath
 
         public TimeSpanUnits AuditRetentionUnits => ServiceControlAudit.AuditRetentionUnits;
 
-        public bool IsServiceControlExpanded { get; set; }
+        public bool IsServiceControlExpanded { get; set; } = true;
 
-        public bool IsServiceControlAuditExpanded { get; set; }
+        public bool IsServiceControlAuditExpanded { get; set; } = true;
 
         public double AuditRetention
         {
diff --git a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
index e33628785b..303e0b47a8 100644
--- a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
+++ b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
@@ -1,161 +1,226 @@
-<UserControl x:Class="ServiceControl.Config.UI.Shell.NewInstanceOverlay"
+<UserControl x:Class="ServiceControl.Config.UI.Shell.NewInstanceOverlay"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d"
-             d:DesignHeight="300" d:DesignWidth="600">
-    <Grid Margin="0" Background="Black">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="2*" />
-        </Grid.ColumnDefinitions>
-
-        <Grid Grid.Column="0" Margin="20">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="14" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
+             d:DesignHeight="500" d:DesignWidth="600">
+    <UserControl.Resources>
+        <Style x:Key="PresetButton" TargetType="RadioButton">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Border x:Name="border"
+                                Background="{StaticResource Gray10Brush}"
+                                BorderBrush="{StaticResource Gray20Brush}"
+                                BorderThickness="1"
+                                Padding="10,8"
+                                Cursor="Hand"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              RecognizesAccessKey="True" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Gray20Brush}" />
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource DarkThemeBrush}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource ThemeBrush}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="ComponentCheckBox" TargetType="CheckBox">
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="Margin" Value="0,8" />
+            <Setter Property="Cursor" Value="Hand" />
+        </Style>
+        <Style x:Key="ComponentLabel" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="13" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style x:Key="ComponentDescription" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="Foreground" Value="{StaticResource Gray60Brush}" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="Margin" Value="0,2,0,0" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Background="Black" MinWidth="500">
+        <Grid Margin="20">
             <Grid.RowDefinitions>
-                <RowDefinition Height="40" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Border Margin="-5,5,0,5" Height="40" Grid.Row="0" Grid.ColumnSpan="2">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="30" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-
-                    <ContentControl Grid.Column="0"
-                                    Width="16"
-                                    Height="16"
-                                    SnapsToDevicePixels="True"
-                                    Template="{StaticResource NewControlInstanceIcon}" />
-
-                    <TextBlock Grid.Column="1"
-                               Margin="10"
-                               FontSize="13"
-                               FontWeight="SemiBold"
-                               VerticalAlignment="Center">
-                        <Hyperlink Command="{Binding AddInstance}"  Style="{StaticResource UnderlinedLink}">Add ServiceControl and Audit Instances...</Hyperlink>
-                    </TextBlock>
-
-                </Grid>
-            </Border>
-
-            <TextBlock Grid.Column="0" Grid.Row="1"
-                       Margin="1,10,0,0"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Top"
-                       Text="•"
-                       Foreground="{StaticResource Gray90Brush}" />
-
-            <TextBlock Grid.Column="0" Grid.Row="2"
-                       Margin="1,10,0,0"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Top"
-                       Text="•"
-                       Foreground="{StaticResource Gray90Brush}" />
-
-            <TextBlock Grid.Column="1" Grid.Row="1"
-                       FontSize="13"
-                       Foreground="{StaticResource Gray90Brush}"
-                       Margin="0,10,10,10"
-                       Text="Collects Audited messages for visualization with ServiceInsight"
-                       TextWrapping="Wrap" />
-
-            <TextBlock Grid.Column="1" Grid.Row="2"
-                    FontSize="13"
-                    Foreground="{StaticResource Gray90Brush}"
-                    Margin="0,10,10,10"
-                    Text="Collects Failed messages to be retried with ServicePulse or ServiceInsight"
-                    TextWrapping="Wrap" />
-        </Grid>
-
-        <Rectangle Grid.Column="1"
-                   Width="1"
-                   Fill="{StaticResource Gray20Brush}"
-                   Margin="10"
-                   />
-
-        <Grid Grid.Column="2" Margin="20">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="14" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="40" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
-            <Border Margin="-5,0,5,0" Height="40" Grid.ColumnSpan="2" Grid.Row="0">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="30" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-
-                    <ContentControl Grid.Column="0"
-                                    Width="16"
-                                    Height="16"
-                                    SnapsToDevicePixels="True"
-                                    Template="{StaticResource NewMonitoringInstanceIcon}" />
-
-                    <TextBlock Grid.Column="1"
-                               Margin="10"
-                               FontSize="13"
-                               FontWeight="SemiBold"
-                               VerticalAlignment="Center">
-                        <Hyperlink Command="{Binding AddMonitoringInstance}" Style="{StaticResource UnderlinedLink}">Add monitoring instance...</Hyperlink>
-                    </TextBlock>
-
-                </Grid>
-            </Border>
-
-            <TextBlock Grid.Column="0" Grid.Row="1"
-                       Margin="1,10,0,10"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Top"
-                       Text="•"
-                       Foreground="{StaticResource Gray90Brush}" />
-
-            <TextBlock Grid.Column="1" Grid.Row="1"
-                       Foreground="{StaticResource Gray90Brush}"
-                       FontSize="13"
-                       Margin="0,10,10,10"
-                       Text="Collects Monitoring data from endpoints running the NServiceBus.Metrics.ServiceControl plugin"
-                       TextWrapping="Wrap" />
-
-            <ContentControl Grid.Column="0"
-                            Grid.Row="2"
-                            Margin="0,5,3,0"
-                            VerticalContentAlignment="Center" VerticalAlignment="Center"
-                            Width="12"
-                            Height="12"
-                            SnapsToDevicePixels="True"
-                            Foreground="White"
-                            Template="{StaticResource ExternalLink}"
-                            Visibility="Hidden" />
-
-            <TextBlock Grid.Row="2" Grid.Column="1"
-                       Margin="0,10,10,10"
+            <!-- Header -->
+            <TextBlock Grid.Row="0"
+                       FontSize="15"
+                       FontWeight="SemiBold"
+                       Foreground="White"
+                       Margin="0,0,0,15"
+                       Text="Choose a setup scenario" />
+
+            <!-- Preset Buttons -->
+            <UniformGrid Grid.Row="1" Columns="3" Margin="0,0,0,15">
+                <RadioButton x:Name="PresetMinimal"
+                             GroupName="Preset"
+                             Style="{StaticResource PresetButton}"
+                             Checked="Preset_Checked">
+                    <TextBlock FontSize="12" FontWeight="SemiBold" Foreground="White"
+                               Text="Minimal Setup" TextAlignment="Center" />
+                </RadioButton>
+                <RadioButton x:Name="PresetFull"
+                             GroupName="Preset"
+                             IsChecked="True"
+                             Style="{StaticResource PresetButton}"
+                             Checked="Preset_Checked">
+                    <TextBlock FontSize="12" FontWeight="SemiBold" Foreground="White"
+                               Text="Full Setup" TextAlignment="Center" />
+                </RadioButton>
+                <RadioButton x:Name="PresetAuditOnly"
+                             GroupName="Preset"
+                             Style="{StaticResource PresetButton}"
+                             Checked="Preset_Checked">
+                    <TextBlock FontSize="12" FontWeight="SemiBold" Foreground="White"
+                               Text="Audit Only" TextAlignment="Center" />
+                </RadioButton>
+            </UniformGrid>
+
+            <!-- "This will install:" label -->
+            <TextBlock Grid.Row="2"
                        FontSize="13"
-                       FontWeight="Normal"
-                       TextWrapping="Wrap"
-                       VerticalAlignment="Center"
-                       Visibility="Hidden">
-                <Hyperlink Foreground="White"
-                           TextDecorations="Underline"
-                           Command="{Binding}">Learn more about monitoring</Hyperlink>
-            </TextBlock>
+                       FontWeight="SemiBold"
+                       Foreground="{StaticResource Gray70Brush}"
+                       Margin="0,0,0,5"
+                       Text="This will install:" />
+
+            <!-- ServiceControl Instance checkbox -->
+            <CheckBox x:Name="CbServiceControl"
+                      Grid.Row="3"
+                      Style="{StaticResource ComponentCheckBox}"
+                      IsChecked="True"
+                      Checked="ServiceControlCheckBox_Changed"
+                      Unchecked="ServiceControlCheckBox_Changed">
+                <StackPanel Margin="5,0,0,0">
+                    <TextBlock Style="{StaticResource ComponentLabel}" Text="ServiceControl Instance" />
+                    <TextBlock Style="{StaticResource ComponentDescription}"
+                               Text="Collects failed messages for retry and management" />
+                </StackPanel>
+            </CheckBox>
+
+            <!-- Integrated ServicePulse checkbox -->
+            <CheckBox x:Name="CbServicePulse"
+                      Grid.Row="4"
+                      Style="{StaticResource ComponentCheckBox}"
+                      IsChecked="True"
+                      Checked="ComponentCheckBox_Changed"
+                      Unchecked="ComponentCheckBox_Changed">
+                <StackPanel Margin="5,0,0,0">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock x:Name="LblServicePulse" Style="{StaticResource ComponentLabel}" Text="Integrated ServicePulse" />
+                        <TextBlock FontSize="12"
+                                   Foreground="{StaticResource Gray50Brush}"
+                                   FontStyle="Italic"
+                                   Margin="6,0,0,0"
+                                   Text="(requires ServiceControl Instance)" />
+                    </StackPanel>
+                    <TextBlock Style="{StaticResource ComponentDescription}"
+                               Text="Built-in web UI hosted by the error instance for managing failed messages" />
+                </StackPanel>
+            </CheckBox>
+
+            <!-- ServiceControl Audit Instance checkbox -->
+            <CheckBox x:Name="CbAudit"
+                      Grid.Row="5"
+                      Style="{StaticResource ComponentCheckBox}"
+                      IsChecked="True"
+                      Checked="ComponentCheckBox_Changed"
+                      Unchecked="ComponentCheckBox_Changed">
+                <StackPanel Margin="5,0,0,0">
+                    <TextBlock Style="{StaticResource ComponentLabel}" Text="ServiceControl Audit Instance" />
+                    <TextBlock Style="{StaticResource ComponentDescription}"
+                               Text="Collects audited messages for visualization with ServiceInsight" />
+                </StackPanel>
+            </CheckBox>
+
+            <!-- Separator: "Or install separately" -->
+            <Grid Grid.Row="6" Margin="0,15,0,8">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Rectangle Grid.Column="0" Height="1" Fill="{StaticResource Gray20Brush}" VerticalAlignment="Center" />
+                <TextBlock Grid.Column="1"
+                           FontSize="11"
+                           Foreground="{StaticResource Gray50Brush}"
+                           FontWeight="SemiBold"
+                           Margin="10,0"
+                           Text="OR INSTALL SEPARATELY" />
+                <Rectangle Grid.Column="2" Height="1" Fill="{StaticResource Gray20Brush}" VerticalAlignment="Center" />
+            </Grid>
+
+            <!-- Monitoring checkbox -->
+            <CheckBox x:Name="CbMonitoring"
+                      Grid.Row="7"
+                      Style="{StaticResource ComponentCheckBox}"
+                      Checked="MonitoringCheckBox_Checked"
+                      Unchecked="MonitoringCheckBox_Unchecked">
+                <StackPanel Margin="5,0,0,0">
+                    <TextBlock Style="{StaticResource ComponentLabel}" Text="Monitoring Instance" />
+                    <TextBlock Style="{StaticResource ComponentDescription}"
+                               Text="Collects monitoring data from endpoints running the NServiceBus.Metrics.ServiceControl plugin" />
+                </StackPanel>
+            </CheckBox>
+
+            <!-- Monitoring info box (hidden by default) -->
+            <Border x:Name="MonitoringInfoBox"
+                    Grid.Row="8"
+                    Background="#0d2818"
+                    BorderBrush="{StaticResource SuccessBrush}"
+                    BorderThickness="1"
+                    CornerRadius="2"
+                    Padding="12"
+                    Margin="0,4,0,0"
+                    Visibility="Collapsed">
+                <TextBlock FontSize="12"
+                           Foreground="{StaticResource Gray90Brush}"
+                           TextWrapping="Wrap"
+                           Text="Monitoring instances are installed separately and cannot be combined with Error or Audit instances in the same setup. Selecting this option will start a dedicated monitoring instance installation." />
+            </Border>
 
+            <!-- Next / Cancel buttons -->
+            <StackPanel Grid.Row="10"
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Right"
+                        Margin="0,15,0,5">
+                <Button Content="Cancel"
+                        Style="{StaticResource BasicButton}"
+                        Padding="30,8"
+                        Click="Cancel_Click" />
+                <Button x:Name="NextButton"
+                        Content="Next"
+                        Style="{StaticResource HiliteButton}"
+                        Padding="30,8"
+                        Margin="10,0,0,0"
+                        Click="Next_Click" />
+            </StackPanel>
         </Grid>
-
     </Grid>
 </UserControl>
diff --git a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
index d5cc45dd44..4877875697 100644
--- a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
+++ b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
@@ -1,13 +1,226 @@
-namespace ServiceControl.Config.UI.Shell
+namespace ServiceControl.Config.UI.Shell
 {
-    /// <summary>
-    /// Interaction logic for NewInstanceOverlay.xaml
-    /// </summary>
+    using System.Windows;
+    using System.Windows.Controls.Primitives;
+
     public partial class NewInstanceOverlay
     {
         public NewInstanceOverlay()
         {
             InitializeComponent();
+            IsVisibleChanged += OnIsVisibleChanged;
         }
+
+        void OnIsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if ((bool)e.NewValue)
+            {
+                ResetToDefaults();
+            }
+        }
+
+        void ResetToDefaults()
+        {
+            suppressCheckBoxEvents = true;
+
+            CbMonitoring.IsChecked = false;
+            MonitoringInfoBox.Visibility = Visibility.Collapsed;
+            SetServiceControlCheckboxesEnabled(true);
+
+            CbServiceControl.IsChecked = true;
+            CbServicePulse.IsChecked = true;
+            CbAudit.IsChecked = true;
+
+            CbServicePulse.Opacity = 1.0;
+            NextButton.IsEnabled = true;
+
+            suppressPresetEvents = true;
+            PresetFull.IsChecked = true;
+            suppressPresetEvents = false;
+
+            suppressCheckBoxEvents = false;
+        }
+
+        public bool InstallServiceControl => CbServiceControl.IsChecked == true;
+        public bool InstallServicePulse => CbServicePulse.IsChecked == true;
+        public bool InstallAudit => CbAudit.IsChecked == true;
+        public bool InstallMonitoring => CbMonitoring.IsChecked == true;
+
+        void Preset_Checked(object sender, RoutedEventArgs e)
+        {
+            if (CbServiceControl == null || suppressPresetEvents)
+            {
+                return;
+            }
+
+            suppressCheckBoxEvents = true;
+
+            CbMonitoring.IsChecked = false;
+            MonitoringInfoBox.Visibility = Visibility.Collapsed;
+            SetServiceControlCheckboxesEnabled(true);
+
+            if (sender == PresetMinimal)
+            {
+                CbServiceControl.IsChecked = true;
+                CbServicePulse.IsChecked = true;
+                CbAudit.IsChecked = false;
+            }
+            else if (sender == PresetFull)
+            {
+                CbServiceControl.IsChecked = true;
+                CbServicePulse.IsChecked = true;
+                CbAudit.IsChecked = true;
+            }
+            else if (sender == PresetAuditOnly)
+            {
+                CbServiceControl.IsChecked = false;
+                CbServicePulse.IsChecked = false;
+                CbAudit.IsChecked = true;
+            }
+
+            UpdateServicePulseEnabled();
+            UpdateNextButton();
+            suppressCheckBoxEvents = false;
+        }
+
+        void ServiceControlCheckBox_Changed(object sender, RoutedEventArgs e)
+        {
+            if (suppressCheckBoxEvents || !IsLoaded)
+            {
+                return;
+            }
+
+            UpdateServicePulseEnabled();
+            SyncPresetSelection();
+            UpdateNextButton();
+        }
+
+        void ComponentCheckBox_Changed(object sender, RoutedEventArgs e)
+        {
+            if (suppressCheckBoxEvents || !IsLoaded)
+            {
+                return;
+            }
+
+            SyncPresetSelection();
+            UpdateNextButton();
+        }
+
+        void MonitoringCheckBox_Checked(object sender, RoutedEventArgs e)
+        {
+            suppressCheckBoxEvents = true;
+
+            CbServiceControl.IsChecked = false;
+            CbServicePulse.IsChecked = false;
+            CbAudit.IsChecked = false;
+            SetServiceControlCheckboxesEnabled(false);
+            SyncPresetSelection();
+            MonitoringInfoBox.Visibility = Visibility.Visible;
+            UpdateNextButton();
+
+            suppressCheckBoxEvents = false;
+        }
+
+        void MonitoringCheckBox_Unchecked(object sender, RoutedEventArgs e)
+        {
+            MonitoringInfoBox.Visibility = Visibility.Collapsed;
+            PresetFull.IsChecked = true;
+        }
+
+        void Next_Click(object sender, RoutedEventArgs e)
+        {
+            ClosePopup();
+
+            if (DataContext is ShellViewModel shell)
+            {
+                if (InstallMonitoring)
+                {
+                    shell.AddMonitoringInstance.Execute(null);
+                }
+                else
+                {
+                    _ = shell.LaunchServiceControlAdd(InstallServiceControl, InstallAudit, InstallServicePulse);
+                }
+            }
+        }
+
+        void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            ClosePopup();
+        }
+
+        void ClosePopup()
+        {
+            if (Parent is Popup popup)
+            {
+                popup.IsOpen = false;
+            }
+        }
+
+        void UpdateServicePulseEnabled()
+        {
+            if (!IsLoaded)
+            {
+                return;
+            }
+
+            var errorChecked = CbServiceControl.IsChecked == true;
+            CbServicePulse.IsEnabled = errorChecked;
+            CbServicePulse.Opacity = errorChecked ? 1.0 : 0.4;
+            if (!errorChecked)
+            {
+                CbServicePulse.IsChecked = false;
+            }
+        }
+
+        void SetServiceControlCheckboxesEnabled(bool enabled)
+        {
+            CbServiceControl.IsEnabled = enabled;
+            CbServicePulse.IsEnabled = enabled;
+            CbAudit.IsEnabled = enabled;
+        }
+
+        void SyncPresetSelection()
+        {
+            var sc = CbServiceControl.IsChecked == true;
+            var sp = CbServicePulse.IsChecked == true;
+            var audit = CbAudit.IsChecked == true;
+
+            suppressPresetEvents = true;
+
+            if (sc && sp && audit)
+            {
+                PresetFull.IsChecked = true;
+            }
+            else if (sc && sp && !audit)
+            {
+                PresetMinimal.IsChecked = true;
+            }
+            else if (!sc && !sp && audit)
+            {
+                PresetAuditOnly.IsChecked = true;
+            }
+            else
+            {
+                PresetMinimal.IsChecked = false;
+                PresetFull.IsChecked = false;
+                PresetAuditOnly.IsChecked = false;
+            }
+
+            suppressPresetEvents = false;
+        }
+
+        void UpdateNextButton()
+        {
+            if (!IsLoaded)
+            {
+                return;
+            }
+
+            NextButton.IsEnabled = InstallServiceControl || InstallAudit || InstallMonitoring;
+        }
+
+        bool suppressCheckBoxEvents;
+        bool suppressPresetEvents;
     }
-}
\ No newline at end of file
+}
diff --git a/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs b/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
index fb50e3a731..2759a20fc4 100644
--- a/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
+++ b/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
@@ -28,6 +28,7 @@ IEventAggregator eventAggregator
         {
             this.listInstances = listInstances;
             this.noInstances = noInstances;
+            this.addInstance = addInstance;
             OpenUrl = new OpenURLCommand();
             AddInstance = addInstance;
             AddMonitoringInstance = addMonitoringInstance;
@@ -47,6 +48,12 @@ IEventAggregator eventAggregator
             });
         }
 
+        public async Task LaunchServiceControlAdd(bool installError, bool installAudit, bool installServicePulse, CancellationToken cancellationToken = default)
+        {
+            ShowingMenuOverlay = false;
+            await addInstance.ExecuteWithOptions(installError, installAudit, installServicePulse, cancellationToken);
+        }
+
         public object ActiveContext { get; set; }
 
         public bool IsModal { get; set; }
@@ -171,5 +178,6 @@ async Task CheckForUpdates(CancellationToken cancellationToken)
         Task updateCheckTask;
         readonly ListInstancesViewModel listInstances;
         readonly NoInstancesViewModel noInstances;
+        readonly AddServiceControlInstanceCommand addInstance;
     }
 }

From 5213fa3ee9afc484dd4ccb23e0471a2914895bd1 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Wed, 26 Aug 2026 13:55:50 +1000
Subject: [PATCH 2/6] add some tests

---
 .../ServiceControlAddScreenLoadedTests.cs     | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/src/ServiceControl.Config.Tests/ServiceControlAddScreenLoadedTests.cs b/src/ServiceControl.Config.Tests/ServiceControlAddScreenLoadedTests.cs
index 3c97a982ec..cf18a3c496 100644
--- a/src/ServiceControl.Config.Tests/ServiceControlAddScreenLoadedTests.cs
+++ b/src/ServiceControl.Config.Tests/ServiceControlAddScreenLoadedTests.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.ComponentModel;
+    using System.Linq;
     using NUnit.Framework;
     using ServiceControlInstaller.Engine.Configuration.ServiceControl;
     using UI.InstanceAdd;
@@ -277,5 +278,86 @@ public void Full_text_search_on_bodies_is_enabled()
                 Assert.That(viewModel.AuditEnableFullTextSearchOnBodies.Value, Is.EqualTo(true));
             }
         }
+
+        [Test]
+        public void Instance_sections_are_expanded_by_default()
+        {
+            var viewModel = new ServiceControlAddViewModel();
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(viewModel.IsServiceControlExpanded, Is.True);
+                Assert.That(viewModel.IsServiceControlAuditExpanded, Is.True);
+            }
+        }
+
+        [Test]
+        public void Integrated_ServicePulse_is_enabled_by_default()
+        {
+            var viewModel = new ServiceControlAddViewModel();
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(viewModel.ErrorEnableIntegratedServicePulseOptions, Is.Not.Empty);
+                Assert.That(viewModel.ErrorEnableIntegratedServicePulse.Value, Is.True);
+            }
+        }
+
+        [Test]
+        public void Integrated_ServicePulse_can_be_disabled()
+        {
+            var viewModel = new ServiceControlAddViewModel();
+
+            var offOption = viewModel.ErrorEnableIntegratedServicePulseOptions.First(o => !o.Value);
+            viewModel.ServiceControl.EnableIntegratedServicePulse = offOption;
+
+            Assert.That(viewModel.ErrorEnableIntegratedServicePulse.Value, Is.False);
+        }
+
+        [Test]
+        public void Audit_only_configuration_has_no_validation_errors_for_error_fields()
+        {
+            var viewModel = new ServiceControlAddViewModel(() => [])
+            {
+                InstallErrorInstance = false,
+                InstallAuditInstance = true,
+                SubmitAttempted = true
+            };
+
+            var notifyErrorInfo = (INotifyDataErrorInfo)viewModel;
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorInstanceName)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorHostName)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorPortNumber)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorDestinationPath)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorLogPath)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorDatabasePath)), Is.Empty);
+            }
+        }
+
+        [Test]
+        public void Error_only_configuration_has_no_validation_errors_for_audit_fields()
+        {
+            var viewModel = new ServiceControlAddViewModel(() => [])
+            {
+                InstallErrorInstance = true,
+                InstallAuditInstance = false,
+                SubmitAttempted = true
+            };
+
+            var notifyErrorInfo = (INotifyDataErrorInfo)viewModel;
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditInstanceName)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditHostName)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditPortNumber)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditDestinationPath)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditLogPath)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditDatabasePath)), Is.Empty);
+            }
+        }
     }
 }

From 024ccfed6c0948c54c06d037a7e0be2efdabd559 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Wed, 26 Aug 2026 16:08:57 +1000
Subject: [PATCH 3/6] some code cleanup

---
 .../UI/Shell/NewInstancePopup.xaml            |  7 +++---
 .../UI/Shell/NewInstancePopup.xaml.cs         | 22 +++++++------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
index 303e0b47a8..5bf0bea454 100644
--- a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
+++ b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
@@ -65,7 +65,6 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <!-- Header -->
@@ -115,8 +114,8 @@
                       Grid.Row="3"
                       Style="{StaticResource ComponentCheckBox}"
                       IsChecked="True"
-                      Checked="ServiceControlCheckBox_Changed"
-                      Unchecked="ServiceControlCheckBox_Changed">
+                      Checked="ComponentCheckBox_Changed"
+                      Unchecked="ComponentCheckBox_Changed">
                 <StackPanel Margin="5,0,0,0">
                     <TextBlock Style="{StaticResource ComponentLabel}" Text="ServiceControl Instance" />
                     <TextBlock Style="{StaticResource ComponentDescription}"
@@ -206,7 +205,7 @@
             </Border>
 
             <!-- Next / Cancel buttons -->
-            <StackPanel Grid.Row="10"
+            <StackPanel Grid.Row="9"
                         Orientation="Horizontal"
                         HorizontalAlignment="Right"
                         Margin="0,15,0,5">
diff --git a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
index 4877875697..ff8cf355ba 100644
--- a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
+++ b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
@@ -29,9 +29,9 @@ void ResetToDefaults()
 
             CbServiceControl.IsChecked = true;
             CbServicePulse.IsChecked = true;
+            CbServicePulse.Opacity = 1.0;
             CbAudit.IsChecked = true;
 
-            CbServicePulse.Opacity = 1.0;
             NextButton.IsEnabled = true;
 
             suppressPresetEvents = true;
@@ -48,7 +48,7 @@ void ResetToDefaults()
 
         void Preset_Checked(object sender, RoutedEventArgs e)
         {
-            if (CbServiceControl == null || suppressPresetEvents)
+            if (!IsLoaded || suppressPresetEvents)
             {
                 return;
             }
@@ -78,28 +78,21 @@ void Preset_Checked(object sender, RoutedEventArgs e)
                 CbAudit.IsChecked = true;
             }
 
-            UpdateServicePulseEnabled();
+            UpdateServicePulseState();
             UpdateNextButton();
             suppressCheckBoxEvents = false;
         }
 
-        void ServiceControlCheckBox_Changed(object sender, RoutedEventArgs e)
+        void ComponentCheckBox_Changed(object sender, RoutedEventArgs e)
         {
             if (suppressCheckBoxEvents || !IsLoaded)
             {
                 return;
             }
 
-            UpdateServicePulseEnabled();
-            SyncPresetSelection();
-            UpdateNextButton();
-        }
-
-        void ComponentCheckBox_Changed(object sender, RoutedEventArgs e)
-        {
-            if (suppressCheckBoxEvents || !IsLoaded)
+            if (sender == CbServiceControl)
             {
-                return;
+                UpdateServicePulseState();
             }
 
             SyncPresetSelection();
@@ -114,6 +107,7 @@ void MonitoringCheckBox_Checked(object sender, RoutedEventArgs e)
             CbServicePulse.IsChecked = false;
             CbAudit.IsChecked = false;
             SetServiceControlCheckboxesEnabled(false);
+            UpdateServicePulseState();
             SyncPresetSelection();
             MonitoringInfoBox.Visibility = Visibility.Visible;
             UpdateNextButton();
@@ -157,7 +151,7 @@ void ClosePopup()
             }
         }
 
-        void UpdateServicePulseEnabled()
+        void UpdateServicePulseState()
         {
             if (!IsLoaded)
             {

From 835ebbf60ee61fd0446af581aee3830f77551109 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Wed, 26 Aug 2026 16:18:07 +1000
Subject: [PATCH 4/6] remove unused name

---
 src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
index 5bf0bea454..49e18160fd 100644
--- a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
+++ b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
@@ -132,7 +132,7 @@
                       Unchecked="ComponentCheckBox_Changed">
                 <StackPanel Margin="5,0,0,0">
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock x:Name="LblServicePulse" Style="{StaticResource ComponentLabel}" Text="Integrated ServicePulse" />
+                        <TextBlock Style="{StaticResource ComponentLabel}" Text="Integrated ServicePulse" />
                         <TextBlock FontSize="12"
                                    Foreground="{StaticResource Gray50Brush}"
                                    FontStyle="Italic"

From ee4b9c7f88bcc4d21d9ea7fddc6910e18c535af1 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Wed, 26 Aug 2026 16:35:45 +1000
Subject: [PATCH 5/6] remove more of unused code

---
 .../AddServiceControlInstanceCommand.cs       |  8 +------
 .../UI/NoInstances/NoInstancesView.xaml       | 21 +++----------------
 .../UI/NoInstances/NoInstancesViewModel.cs    | 15 +++----------
 .../UI/Shell/ShellView.xaml                   |  8 +------
 .../UI/Shell/ShellViewModel.cs                |  4 ----
 5 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
index a3176cce56..a6f67574ae 100644
--- a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
+++ b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
@@ -20,13 +20,7 @@ public AddServiceControlInstanceCommand(IServiceControlWindowManager windowManag
 
         public override async Task ExecuteAsync(object obj)
         {
-            if (!await commandChecks.CanAddInstance(true))
-            {
-                return;
-            }
-
-            var instanceViewModel = addInstance();
-            await windowManager.ShowInnerDialog(instanceViewModel);
+            await ExecuteWithOptions(installError: true, installAudit: true, installServicePulse: true);
         }
 
         public async Task ExecuteWithOptions(bool installError, bool installAudit, bool installServicePulse, CancellationToken cancellationToken = default)
diff --git a/src/ServiceControl.Config/UI/NoInstances/NoInstancesView.xaml b/src/ServiceControl.Config/UI/NoInstances/NoInstancesView.xaml
index a602496fcc..6721feccc1 100644
--- a/src/ServiceControl.Config/UI/NoInstances/NoInstancesView.xaml
+++ b/src/ServiceControl.Config/UI/NoInstances/NoInstancesView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ServiceControl.Config.UI.NoInstances.NoInstancesView"
+<UserControl x:Class="ServiceControl.Config.UI.NoInstances.NoInstancesView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -7,26 +7,11 @@
              d:DesignWidth="600"
              mc:Ignorable="d">
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
         <TextBlock Margin="10"
                    HorizontalAlignment="Center"
-                   VerticalAlignment="Bottom"
+                   VerticalAlignment="Center"
                    FontSize="20"
                    Foreground="{StaticResource Gray60Brush}"
                    Text="No service instances installed" />
-
-        <Button Grid.Row="1"
-                Margin="10"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Top"
-                Command="{Binding AddInstance}"
-                Content="Add new instance"
-                Style="{StaticResource HiliteButton}"
-                Visibility="{Binding ShowMonitoringInstances,
-                             Converter={StaticResource boolToVisInverted}}" />
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/ServiceControl.Config/UI/NoInstances/NoInstancesViewModel.cs b/src/ServiceControl.Config/UI/NoInstances/NoInstancesViewModel.cs
index 1ade6d7782..6ebf3873b8 100644
--- a/src/ServiceControl.Config/UI/NoInstances/NoInstancesViewModel.cs
+++ b/src/ServiceControl.Config/UI/NoInstances/NoInstancesViewModel.cs
@@ -1,21 +1,12 @@
-namespace ServiceControl.Config.UI.NoInstances
+namespace ServiceControl.Config.UI.NoInstances
 {
-    using System.Windows.Input;
-    using Commands;
     using Framework.Rx;
 
     class NoInstancesViewModel : RxScreen
     {
-        public NoInstancesViewModel(AddServiceControlInstanceCommand addInstance)
+        public NoInstancesViewModel()
         {
             DisplayName = "DEPLOYED INSTANCES";
-
-            AddInstance = addInstance;
         }
-
-        public ICommand AddInstance { get; }
-
-        [FeatureToggle(Feature.MonitoringInstances)]
-        public bool ShowMonitoringInstances { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ServiceControl.Config/UI/Shell/ShellView.xaml b/src/ServiceControl.Config/UI/Shell/ShellView.xaml
index dea57a4a05..1281d5b11a 100644
--- a/src/ServiceControl.Config/UI/Shell/ShellView.xaml
+++ b/src/ServiceControl.Config/UI/Shell/ShellView.xaml
@@ -73,15 +73,9 @@
                         Visibility="{Binding IsModal,
                                              Converter={StaticResource boolToVisInverted}}">
 
-                <Button Command="{Binding AddInstance}" Style="{StaticResource OriginalNewButton}"
-                        Visibility="{Binding ShowMonitoringInstances,
-                                     Converter={StaticResource boolToVisInverted}}" />
-
                 <ToggleButton Name="AddInstanceButton"
                               Style="{StaticResource NewButton}"
-                              IsChecked="{Binding ShowingMenuOverlay, Mode=TwoWay}"
-                              Visibility="{Binding ShowMonitoringInstances,
-                                                   Converter={StaticResource boolToVis}}" />
+                              IsChecked="{Binding ShowingMenuOverlay, Mode=TwoWay}" />
 
                 <Popup PlacementTarget="{Binding ElementName=RootBorder}"
                        Focusable="False"
diff --git a/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs b/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
index 2759a20fc4..70b684b22c 100644
--- a/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
+++ b/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
@@ -30,14 +30,12 @@ IEventAggregator eventAggregator
             this.noInstances = noInstances;
             this.addInstance = addInstance;
             OpenUrl = new OpenURLCommand();
-            AddInstance = addInstance;
             AddMonitoringInstance = addMonitoringInstance;
             LicenseStatusManager = licenseStatusManager;
             DisplayName = "ServiceControl Config";
             IsModal = false;
             LoadAppVersion();
             CopyrightInfo = $"{DateTime.UtcNow.Year} © Particular Software";
-            addInstance.OnCommandExecuting = () => ShowingMenuOverlay = false;
             addMonitoringInstance.OnCommandExecuting = () => ShowingMenuOverlay = false;
 
             RefreshInstancesCmd = Command.Create(async () =>
@@ -75,8 +73,6 @@ public async Task LaunchServiceControlAdd(bool installError, bool installAudit,
         [FeatureToggle(Feature.MonitoringInstances)]
         public bool ShowMonitoringInstances { get; set; }
 
-        public ICommand AddInstance { get; private set; }
-
         public ICommand AddMonitoringInstance { get; private set; }
 
         public ICommand OpenUrl { get; private set; }

From 5b3c06ad4f72d2947ed06652d25ad633514be8bf Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Wed, 26 Aug 2026 16:41:54 +1000
Subject: [PATCH 6/6] cleaner code

---
 .../AddServiceControlInstanceCommand.cs       |  5 +-
 .../UI/Shell/NewInstancePopup.xaml.cs         | 64 ++++++++-----------
 2 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
index a6f67574ae..1f4a26638f 100644
--- a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
+++ b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
@@ -36,9 +36,8 @@ public async Task ExecuteWithOptions(bool installError, bool installAudit, bool
 
             if (installError)
             {
-                var spOption = installServicePulse
-                    ? instanceViewModel.ServiceControl.EnableIntegratedServicePulseOptions.FirstOrDefault(o => o.Value)
-                    : instanceViewModel.ServiceControl.EnableIntegratedServicePulseOptions.FirstOrDefault(o => !o.Value);
+                var spOption = instanceViewModel.ServiceControl.EnableIntegratedServicePulseOptions
+                    .FirstOrDefault(o => o.Value == installServicePulse);
 
                 if (spOption != null)
                 {
diff --git a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
index ff8cf355ba..6ebc237086 100644
--- a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
+++ b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
@@ -59,24 +59,17 @@ void Preset_Checked(object sender, RoutedEventArgs e)
             MonitoringInfoBox.Visibility = Visibility.Collapsed;
             SetServiceControlCheckboxesEnabled(true);
 
-            if (sender == PresetMinimal)
+            var (sc, sp, audit) = sender switch
             {
-                CbServiceControl.IsChecked = true;
-                CbServicePulse.IsChecked = true;
-                CbAudit.IsChecked = false;
-            }
-            else if (sender == PresetFull)
-            {
-                CbServiceControl.IsChecked = true;
-                CbServicePulse.IsChecked = true;
-                CbAudit.IsChecked = true;
-            }
-            else if (sender == PresetAuditOnly)
-            {
-                CbServiceControl.IsChecked = false;
-                CbServicePulse.IsChecked = false;
-                CbAudit.IsChecked = true;
-            }
+                _ when sender == PresetMinimal => (true, true, false),
+                _ when sender == PresetFull => (true, true, true),
+                _ when sender == PresetAuditOnly => (false, false, true),
+                _ => (false, false, false)
+            };
+
+            CbServiceControl.IsChecked = sc;
+            CbServicePulse.IsChecked = sp;
+            CbAudit.IsChecked = audit;
 
             UpdateServicePulseState();
             UpdateNextButton();
@@ -176,29 +169,24 @@ void SetServiceControlCheckboxesEnabled(bool enabled)
 
         void SyncPresetSelection()
         {
-            var sc = CbServiceControl.IsChecked == true;
-            var sp = CbServicePulse.IsChecked == true;
-            var audit = CbAudit.IsChecked == true;
-
             suppressPresetEvents = true;
 
-            if (sc && sp && audit)
-            {
-                PresetFull.IsChecked = true;
-            }
-            else if (sc && sp && !audit)
-            {
-                PresetMinimal.IsChecked = true;
-            }
-            else if (!sc && !sp && audit)
-            {
-                PresetAuditOnly.IsChecked = true;
-            }
-            else
-            {
-                PresetMinimal.IsChecked = false;
-                PresetFull.IsChecked = false;
-                PresetAuditOnly.IsChecked = false;
+            switch (InstallServiceControl, InstallServicePulse, InstallAudit)
+            {
+                case (true, true, true):
+                    PresetFull.IsChecked = true;
+                    break;
+                case (true, true, false):
+                    PresetMinimal.IsChecked = true;
+                    break;
+                case (false, false, true):
+                    PresetAuditOnly.IsChecked = true;
+                    break;
+                default:
+                    PresetMinimal.IsChecked = false;
+                    PresetFull.IsChecked = false;
+                    PresetAuditOnly.IsChecked = false;
+                    break;
             }
 
             suppressPresetEvents = false;