diff --git a/src/App/ConnectionPage.xaml b/src/App/ConnectionPage.xaml
index 77ea0df8..5be12b84 100644
--- a/src/App/ConnectionPage.xaml
+++ b/src/App/ConnectionPage.xaml
@@ -36,7 +36,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <Button x:Name="ExitButton" x:Uid="ExitButton" Grid.Row="0" VerticalAlignment="Top" HorizontalAlignment="Right">
+        <Button x:Name="ExitButton" x:Uid="ExitButton" Grid.Row="0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="Exit_Click">
             <TextBlock FontFamily="Segoe MDL2 Assets" x:Uid="ExitButton" Text="&#xE711;" FontSize="30" VerticalAlignment="Center" />
             <Button.Flyout>
                 <Flyout x:Name="ExitFlyout">
@@ -89,7 +89,7 @@
 
                 </Grid>
                 <TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="RemoteHost" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap" AutomationProperties.HeadingLevel="Level2" Style="{StaticResource TitleTextBlockStyle}"/>
-                <ListView Grid.Row="6" x:Uid="ResultsListView" x:Name="ResultsListView" BorderBrush="AntiqueWhite" BorderThickness="1"
+                <ListView Grid.Row="6" x:Uid="ResultsListView" x:Name="ResultsListView" BorderBrush="{ThemeResource TextFillColorSecondary}" BorderThickness="1"
                               MinHeight="200" Margin="0,5,0,5"
                               ItemTemplate="{StaticResource ResultsListViewTemplate}" ScrollViewer.VerticalScrollMode="Enabled" ScrollViewer.VerticalScrollBarVisibility="Auto" IsItemClickEnabled="True" SelectionMode="Single" ItemClick="ResultsListView_ItemClick"/>
                 <Grid Grid.Row="8" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5" >
diff --git a/src/App/ConnectionPage.xaml.cs b/src/App/ConnectionPage.xaml.cs
index 2cc0dcd4..85d54d3c 100644
--- a/src/App/ConnectionPage.xaml.cs
+++ b/src/App/ConnectionPage.xaml.cs
@@ -262,6 +262,11 @@ namespace Microsoft.FactoryOrchestrator.UWP
             ((App)Application.Current).Exit();
         }
 
+        private void Exit_Click(object sender, RoutedEventArgs e)
+        {
+            AutomationProperties.SetName(ConfirmExit, "ConfirmExit");
+        }
+
         private async void ValidateXMLButton_Click(object sender, RoutedEventArgs e)
         {
             var picker = new Windows.Storage.Pickers.FileOpenPicker