diff --git a/tools/SetupFlow/DevHome.SetupFlow/Strings/en-us/Resources.resw b/tools/SetupFlow/DevHome.SetupFlow/Strings/en-us/Resources.resw
index f65fdb1356..e00543a956 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Strings/en-us/Resources.resw
+++ b/tools/SetupFlow/DevHome.SetupFlow/Strings/en-us/Resources.resw
@@ -1167,10 +1167,6 @@
     <value>Your changes won't be applied until the end</value>
     <comment>Tooltip for the next button in the repo page.</comment>
   </data>
-  <data name="LoadingScreen_SetupProgressBar_Description" xml:space="preserve">
-    <value>Number of tasks completed progress bar</value>
-    <comment>Description of the progress bar for screen readers</comment>
-  </data>
   <data name="RepoPageEditClonePathAutomationProperties" xml:space="preserve">
     <value>Edit Clone Path for Repository {0}</value>
     <comment>Dynamic description for the edit clone path button</comment>
diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/LoadingView.xaml b/tools/SetupFlow/DevHome.SetupFlow/Views/LoadingView.xaml
index ffe0a5a17d..babce2056c 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Views/LoadingView.xaml
+++ b/tools/SetupFlow/DevHome.SetupFlow/Views/LoadingView.xaml
@@ -1,16 +1,16 @@
-<!-- Copyright (c) Microsoft Corporation.. -->
-<!-- Licensed under the MIT License. -->
+<!--  Copyright (c) Microsoft Corporation..  -->
+<!--  Licensed under the MIT License.  -->
 
 <UserControl
     x:Class="DevHome.SetupFlow.Views.LoadingView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewmodels="using:DevHome.SetupFlow.ViewModels"
     xmlns:commonModels="using:DevHome.SetupFlow.Models"
-    xmlns:setupFlowBehaviors="using:DevHome.SetupFlow.Behaviors"
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:setupFlowBehaviors="using:DevHome.SetupFlow.Behaviors"
+    xmlns:viewmodels="using:DevHome.SetupFlow.ViewModels"
     setupFlowBehaviors:SetupFlowNavigationBehavior.CancelVisibility="Collapsed"
     setupFlowBehaviors:SetupFlowNavigationBehavior.PreviousVisibility="Collapsed"
     mc:Ignorable="d">
@@ -19,11 +19,14 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="ms-appx:///DevHome.SetupFlow/Styles/SetupFlowStyles.xaml" />
                 <ResourceDictionary>
-                    <converters:EmptyObjectToObjectConverter x:Key="EmptyObjectToObjectConverter" EmptyValue="Collapsed" NotEmptyValue="Visible" />
-                    <Style x:Key="DevHomeBorderStyle" TargetType="Border" >
+                    <converters:EmptyObjectToObjectConverter
+                        x:Key="EmptyObjectToObjectConverter"
+                        EmptyValue="Collapsed"
+                        NotEmptyValue="Visible" />
+                    <Style x:Key="DevHomeBorderStyle" TargetType="Border">
                         <Setter Property="BorderBrush">
                             <Setter.Value>
-                                <SolidColorBrush Opacity="{StaticResource TextControlBackgroundRestOpacity}" Color="{StaticResource TextFillColorTertiary}"/>
+                                <SolidColorBrush Opacity="{StaticResource TextControlBackgroundRestOpacity}" Color="{StaticResource TextFillColorTertiary}" />
                             </Setter.Value>
                         </Setter>
                     </Style>
@@ -34,184 +37,253 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <!-- Page split layout -->
-    <Grid RowSpacing="10" MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
+    <!--  Page split layout  -->
+    <Grid
+        MaxWidth="{ThemeResource MaxPageContentWidth}"
+        Margin="{ThemeResource ContentPageMargin}"
+        RowSpacing="10">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="2*" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <Grid
+            Grid.Row="0"
             Grid.Column="0"
             Grid.ColumnSpan="2"
+            Margin="0,0,0,20"
             ColumnSpacing="20"
-            RowSpacing="20"
-            Grid.Row="0"
-            Margin="0 0 0 20">
+            RowSpacing="20">
             <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Visibility="{x:Bind ViewModel.ShowOutOfRetriesBanner, Mode=OneWay}" Background="{ThemeResource ComboBoxItemBackgroundPressed}" CornerRadius="5" Height="55" Padding="10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition MinWidth="100" />
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Orientation="Horizontal" Grid.Column="0" Spacing="5" >
-                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xF167;" Foreground="{ThemeResource AccentAAFillColorDefaultBrush}" />
-                        <TextBlock x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LoadingPage_SomeTasksFailed_Header" Style="{ThemeResource BodyStrongTextBlockStyle}" VerticalAlignment="Center"/>
-                        <TextBlock x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LoadingPage_SomeTasksFailed_Body" VerticalAlignment="Center" />
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Right" Spacing="5" >
-                        <Button x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LoadingScreen_MaxRetriesReached_Button" Command="{x:Bind ViewModel.GoToSummaryPageCommand}" Style="{ThemeResource DefaultButtonStyle}" Width="120"/>
-                        <Button Command="{x:Bind ViewModel.HideMaxRetryBannerCommand}" Style="{ThemeResource AlternateCloseButtonStyle}">
-                            <Button.Content>
-                                <SymbolIcon Symbol="Cancel"/>
-                            </Button.Content>
-                        </Button>
-                    </StackPanel>
-                </Grid>
-                <StackPanel Grid.Row="1" Spacing="0" >
-                    <TextBlock Style="{ThemeResource SubtitleTextBlockStyle}" Text="{x:Bind ViewModel.HeaderText, Mode=OneWay}"/>
-                    <TextBlock Visibility="{x:Bind ViewModel.ShowSetupTarget, Mode=OneWay}" Text="{x:Bind ViewModel.SetupTargetText, Mode=OneWay}" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid
+                Grid.Row="0"
+                Height="55"
+                Padding="10"
+                Background="{ThemeResource ComboBoxItemBackgroundPressed}"
+                CornerRadius="5"
+                Visibility="{x:Bind ViewModel.ShowOutOfRetriesBanner, Mode=OneWay}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto" />
+                    <ColumnDefinition MinWidth="100" />
+                </Grid.ColumnDefinitions>
+                <StackPanel
+                    Grid.Column="0"
+                    Orientation="Horizontal"
+                    Spacing="5">
+                    <FontIcon
+                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                        Foreground="{ThemeResource AccentAAFillColorDefaultBrush}"
+                        Glyph="&#xF167;" />
+                    <TextBlock
+                        x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LoadingPage_SomeTasksFailed_Header"
+                        VerticalAlignment="Center"
+                        Style="{ThemeResource BodyStrongTextBlockStyle}" />
+                    <TextBlock x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LoadingPage_SomeTasksFailed_Body" VerticalAlignment="Center" />
+                </StackPanel>
+                <StackPanel
+                    Grid.Column="1"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal"
+                    Spacing="5">
+                    <Button
+                        x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LoadingScreen_MaxRetriesReached_Button"
+                        Width="120"
+                        Command="{x:Bind ViewModel.GoToSummaryPageCommand}"
+                        Style="{ThemeResource DefaultButtonStyle}" />
+                    <Button Command="{x:Bind ViewModel.HideMaxRetryBannerCommand}" Style="{ThemeResource AlternateCloseButtonStyle}">
+                        <Button.Content>
+                            <SymbolIcon Symbol="Cancel" />
+                        </Button.Content>
+                    </Button>
                 </StackPanel>
-                <ProgressBar Grid.Row="2" AutomationProperties.Name="ms-resource:///DevHome.SetupFlow/Resources/LoadingScreen_SetupProgressBar_Description" x:Name="SetupTaskProgressBar" IsIndeterminate="{x:Bind ViewModel.IsIndeterminateProgressBar, Mode=OneWay}" Maximum="{x:Bind ViewModel.TasksToRun.Count, Mode=OneWay}" Value="{x:Bind ViewModel.TasksCompleted, Mode=OneWay}" />
-                <TextBlock Grid.Row="3" Text="{x:Bind ViewModel.ExecutingTasks, Mode=OneWay}" />
+            </Grid>
+            <StackPanel Grid.Row="1" Spacing="0">
+                <TextBlock Style="{ThemeResource SubtitleTextBlockStyle}" Text="{x:Bind ViewModel.HeaderText, Mode=OneWay}" />
+                <TextBlock Text="{x:Bind ViewModel.SetupTargetText, Mode=OneWay}" Visibility="{x:Bind ViewModel.ShowSetupTarget, Mode=OneWay}" />
+            </StackPanel>
+            <ProgressBar
+                x:Name="SetupTaskProgressBar"
+                Grid.Row="2"
+                IsIndeterminate="{x:Bind ViewModel.IsIndeterminateProgressBar, Mode=OneWay}"
+                Maximum="{x:Bind ViewModel.TasksToRun.Count, Mode=OneWay}"
+                Value="{x:Bind ViewModel.TasksCompleted, Mode=OneWay}" />
+            <TextBlock Grid.Row="3" Text="{x:Bind ViewModel.ExecutingTasks, Mode=OneWay}" />
         </Grid>
         <Grid
             Grid.Row="1"
             Grid.ColumnSpan="2"
-            Margin="0 0 0 10">
-            <Grid 
-                RowSpacing="5" 
-                ColumnSpacing="50" >
+            Margin="0,0,0,10">
+            <Grid ColumnSpacing="50" RowSpacing="5">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition/>
-                 </Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="50"/>
+                    <RowDefinition Height="50" />
                 </Grid.RowDefinitions>
-                <Border Grid.Column="0" Style="{StaticResource DevHomeBorderStyle}" BorderThickness="0, 0, 0, 1">
-                    <TextBlock Text="{x:Bind ViewModel.TasksTitleText, Mode=OneWay}" Style="{StaticResource BodyStrongTextBlockStyle}" VerticalAlignment="Bottom" Padding="0, 0, 0, 6"/>
+                <Border
+                    Grid.Column="0"
+                    BorderThickness="0,0,0,1"
+                    Style="{StaticResource DevHomeBorderStyle}">
+                    <TextBlock
+                        Padding="0,0,0,6"
+                        VerticalAlignment="Bottom"
+                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                        Text="{x:Bind ViewModel.TasksTitleText, Mode=OneWay}" />
                 </Border>
-                <Border Grid.Column="1" Style="{StaticResource DevHomeBorderStyle}" BorderThickness="0, 0, 0, 1">
+                <Border
+                    Grid.Column="1"
+                    BorderThickness="0,0,0,1"
+                    Style="{StaticResource DevHomeBorderStyle}">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
                         </Grid.ColumnDefinitions>
-                        <TextBlock Grid.Row="0" Grid.Column="0" x:Uid="ms-resource:///DevHome.SetupFlow/Resources/Loading_ActionCenter" VerticalAlignment="Bottom" Style="{StaticResource BodyStrongTextBlockStyle}" Padding="0, 0, 0, 6"/>
-                        <HyperlinkButton Grid.Row="0" Grid.Column="1" Visibility="{x:Bind ViewModel.ShowRetryButton, Mode=OneWay}" x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LoadingScreenRetry" Command="{x:Bind ViewModel.RestartFailedTasksCommand}" HorizontalAlignment="right" Margin="0, 8, 0, 0"/>
+                        <TextBlock
+                            x:Uid="ms-resource:///DevHome.SetupFlow/Resources/Loading_ActionCenter"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Padding="0,0,0,6"
+                            VerticalAlignment="Bottom"
+                            Style="{StaticResource BodyStrongTextBlockStyle}" />
+                        <HyperlinkButton
+                            x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LoadingScreenRetry"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Margin="0,8,0,0"
+                            HorizontalAlignment="right"
+                            Command="{x:Bind ViewModel.RestartFailedTasksCommand}"
+                            Visibility="{x:Bind ViewModel.ShowRetryButton, Mode=OneWay}" />
                     </Grid>
                 </Border>
             </Grid>
         </Grid>
-        <ScrollViewer 
-            VerticalScrollBarVisibility="Auto"
+        <ScrollViewer
+            Grid.Row="2"
             Grid.Column="0"
-            Grid.Row="2">
+            VerticalScrollBarVisibility="Auto">
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <ListView x:Name="NonExecutingTasks"  Grid.Row="0" ItemsSource="{x:Bind ViewModel.NonExecutingMessages, Mode=OneWay}" SelectionMode="Single">
+                <ListView
+                    x:Name="NonExecutingTasks"
+                    Grid.Row="0"
+                    ItemsSource="{x:Bind ViewModel.NonExecutingMessages, Mode=OneWay}"
+                    SelectionMode="Single">
                     <ListView.ItemTemplate>
                         <DataTemplate x:DataType="viewmodels:LoadingMessageViewModel">
                             <Grid ColumnSpacing="5">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="{StaticResource SymbolAndProgressRingColumnWidth}"/>
-                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="{StaticResource SymbolAndProgressRingColumnWidth}" />
+                                    <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
                                 <ImageIcon
                                     Grid.Column="0"
                                     VerticalAlignment="Center"
-                                    Source="{x:Bind StatusSymbolIcon, Mode=OneWay}"/>
-                                <TextBlock 
+                                    Source="{x:Bind StatusSymbolIcon, Mode=OneWay}" />
+                                <TextBlock
                                     Grid.Column="1"
-                                    Text="{x:Bind MessageToShow, Mode=OneWay}"
                                     VerticalAlignment="Center"
                                     Foreground="{ThemeResource TextFillColorSecondary}"
-                                    TextWrapping="Wrap"
-                                    IsTextSelectionEnabled="True"/>
+                                    IsTextSelectionEnabled="True"
+                                    Text="{x:Bind MessageToShow, Mode=OneWay}"
+                                    TextWrapping="Wrap" />
                             </Grid>
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
-                <ListView x:Name="ExecutingTasks" Grid.Row="1" ItemsSource="{x:Bind ViewModel.ExecutingMessages, Mode=OneWay}" SelectionMode="None">
+                <ListView
+                    x:Name="ExecutingTasks"
+                    Grid.Row="1"
+                    ItemsSource="{x:Bind ViewModel.ExecutingMessages, Mode=OneWay}"
+                    SelectionMode="None">
                     <ListView.ItemTemplate>
                         <DataTemplate x:DataType="viewmodels:LoadingMessageViewModel">
                             <Grid ColumnSpacing="5">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="{StaticResource SymbolAndProgressRingColumnWidth}"/>
-                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="{StaticResource SymbolAndProgressRingColumnWidth}" />
+                                    <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-                                
-                                <!-- Width and Height restrict the progress ring to the column width.-->
+
+                                <!--  Width and Height restrict the progress ring to the column width.  -->
                                 <ProgressRing
                                     Grid.Column="0"
-                                    Height="{StaticResource ProgressRingWidthAndHeight}"
                                     Width="{StaticResource ProgressRingWidthAndHeight}"
-                                    IsActive="True"/>
-                                <TextBlock 
+                                    Height="{StaticResource ProgressRingWidthAndHeight}"
+                                    IsActive="True" />
+                                <TextBlock
                                     Grid.Column="1"
-                                    Text="{x:Bind MessageToShow, Mode=OneWay}"
                                     VerticalAlignment="Center"
                                     Foreground="{ThemeResource TextFillColorPrimary}"
-                                    TextWrapping="Wrap"
-                                    IsTextSelectionEnabled="True"/>
+                                    IsTextSelectionEnabled="True"
+                                    Text="{x:Bind MessageToShow, Mode=OneWay}"
+                                    TextWrapping="Wrap" />
                             </Grid>
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
             </Grid>
         </ScrollViewer>
-        <Grid 
-            Grid.Column="1"
+        <Grid
             Grid.Row="2"
+            Grid.Column="1"
             RowSpacing="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <TextBlock 
-                Grid.Row="0" 
-                Text="{x:Bind ViewModel.ActionCenterDisplay, Mode=OneWay}" Margin="18, 0, 0, 5" Foreground="{ThemeResource TextFillColorSecondary}"/>
-            <ListView Grid.Row="1" ItemsSource="{x:Bind ViewModel.ActionCenterItems, Mode=OneWay}" SelectionMode="None" Margin="0, 0, 0, 5">
+            <TextBlock
+                Grid.Row="0"
+                Margin="18,0,0,5"
+                Foreground="{ThemeResource TextFillColorSecondary}"
+                Text="{x:Bind ViewModel.ActionCenterDisplay, Mode=OneWay}" />
+            <ListView
+                Grid.Row="1"
+                Margin="0,0,0,5"
+                ItemsSource="{x:Bind ViewModel.ActionCenterItems, Mode=OneWay}"
+                SelectionMode="None">
                 <ListView.ItemTemplate>
                     <DataTemplate x:DataType="commonModels:ActionCenterMessages">
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="auto"/>
-                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="auto" />
+                                <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            <StackPanel 
-                                Visibility="{x:Bind PrimaryMessage, Converter={StaticResource EmptyObjectToObjectConverter}}"
+                            <StackPanel
                                 Grid.Row="0"
-                                Margin="0, 0, 0, 10" 
-                                Background="{ThemeResource CardBackgroundFillColorDefault}" 
-                                CornerRadius="10" 
-                                Padding="20">
-                                <TextBlock Text="{x:Bind PrimaryMessage}" Style="{StaticResource BodyStrongTextBlockStyle}" IsTextSelectionEnabled="True" TextWrapping="Wrap"/>
+                                Margin="0,0,0,10"
+                                Padding="20"
+                                Background="{ThemeResource CardBackgroundFillColorDefault}"
+                                CornerRadius="10"
+                                Visibility="{x:Bind PrimaryMessage, Converter={StaticResource EmptyObjectToObjectConverter}}">
+                                <TextBlock
+                                    IsTextSelectionEnabled="True"
+                                    Style="{StaticResource BodyStrongTextBlockStyle}"
+                                    Text="{x:Bind PrimaryMessage}"
+                                    TextWrapping="Wrap" />
                             </StackPanel>
                             <ContentControl
                                 Grid.Row="1"
-                                CornerRadius="10"
-                                Unloaded="ContentControl_Unloaded"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 HorizontalContentAlignment="Stretch"
                                 VerticalContentAlignment="Stretch"
-                                Content="{x:Bind ExtensionAdaptiveCardPanel}">
-                            </ContentControl>
+                                Content="{x:Bind ExtensionAdaptiveCardPanel}"
+                                CornerRadius="10"
+                                Unloaded="ContentControl_Unloaded" />
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>