diff --git a/nuget.config b/nuget.config
index 0b8604f4..e59e698f 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,9 +3,8 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="Toolkit Labs" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 4f5693fb..653eafaf 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -793,9 +793,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Labs.Uwp.SettingsControls">
-      <Version>0.0.16</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
     </PackageReference>
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 5b994de9..b94831fb 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -4714,11 +4714,11 @@
     <value>Appearance</value>
     <comment>Subtitle of appearance setting on Settings page</comment>
   </data>
-  <data name="AppThemeExpander.Header" xml:space="preserve">
+  <data name="SettingsAppThemeTitle.Text" xml:space="preserve">
     <value>App theme</value>
     <comment>Title of App theme expander</comment>
   </data>
-  <data name="AppThemeExpander.Description" xml:space="preserve">
+  <data name="SettingsAppThemeDescription.Text" xml:space="preserve">
     <value>Select which app theme to display</value>
     <comment>Description of App theme expander</comment>
   </data>
diff --git a/src/Calculator/Views/Settings.xaml b/src/Calculator/Views/Settings.xaml
index 78308de4..44848a79 100644
--- a/src/Calculator/Views/Settings.xaml
+++ b/src/Calculator/Views/Settings.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:labs="using:CommunityToolkit.Labs.WinUI"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
              xmlns:utils="using:CalculatorApp.Utils"
@@ -15,7 +14,7 @@
         <ResourceDictionary>
             <Style x:Key="SettingsContentScrollViewStyle" TargetType="ScrollViewer">
                 <Setter Property="HorizontalAlignment" Value="Stretch"/>
-                <Setter Property="VerticalAlignment" Value="Stretch"/>
+                <Setter Property="VerticalAlignment" Value="Top"/>
                 <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
                 <Setter Property="HorizontalScrollMode" Value="Disabled"/>
                 <Setter Property="IsHorizontalRailEnabled" Value="False"/>
@@ -32,19 +31,11 @@
                 <Setter Property="TextWrapping" Value="Wrap"/>
             </Style>
 
-            <Style x:Key="SettingsCategoryTitleTextBlockStyle"
-                   BasedOn="{StaticResource BodyStrongTextBlockStyle}"
-                   TargetType="TextBlock">
-                <Setter Property="Margin" Value="0,29,0,5"/>
-            </Style>
-
             <automation:NarratorNotifier x:Name="NarratorNotifier"/>
 
             <!-- Override default hyperlink button background color -->
             <StaticResource x:Key="HyperlinkButtonBackgroundPointerOver" ResourceKey="SubtleFillColorTransparentBrush"/>
             <StaticResource x:Key="HyperlinkButtonBackgroundPressed" ResourceKey="SubtleFillColorTransparentBrush"/>
-
-            <x:Double x:Key="SettingsCardSpacing">3</x:Double>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -53,6 +44,42 @@
             <RowDefinition Height="{x:Bind TitleBarHeight, Mode=OneWay}"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="LayoutVisualStates">
+                <VisualState x:Name="LargeWideView">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="690"/>
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="ColumnAbout.Width" Value="324"/>
+                        <Setter Target="AboutContentGrid.(Grid.Row)" Value="0"/>
+                        <Setter Target="AboutContentGrid.(Grid.RowSpan)" Value="3"/>
+                        <Setter Target="AboutContentGrid.(Grid.Column)" Value="1"/>
+                        <Setter Target="AboutGroupTitle.Margin" Value="0"/>
+                        <Setter Target="AboutContentGrid.Margin" Value="60,0,0,0"/>
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="SideVisible">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="632"/>
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="ColumnMain.Width" Value="*"/>
+                        <Setter Target="ColumnAbout.Width" Value="*"/>
+                        <Setter Target="AboutContentGrid.(Grid.Row)" Value="0"/>
+                        <Setter Target="AboutContentGrid.(Grid.RowSpan)" Value="3"/>
+                        <Setter Target="AboutContentGrid.(Grid.Column)" Value="1"/>
+                        <Setter Target="AboutGroupTitle.Margin" Value="0"/>
+                        <Setter Target="AboutContentGrid.Margin" Value="60,0,0,0"/>
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="DefaultLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="0"/>
+                    </VisualState.StateTriggers>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
 
         <Button x:Name="BackButton"
                 Grid.Row="0"
@@ -77,120 +104,160 @@
         </Grid>
 
         <ScrollViewer Grid.Row="1"
-                      Margin="0,30,0,0"
+                      Margin="0,60,0,0"
                       Padding="24,0,24,16"
                       Style="{StaticResource SettingsContentScrollViewStyle}">
+            <Grid x:Name="ContentGrid">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition x:Name="ColumnMain" Width="*"/>
+                    <ColumnDefinition x:Name="ColumnAbout" Width="0"/>
+                </Grid.ColumnDefinitions>
 
-            <StackPanel Orientation="Vertical" Spacing="{StaticResource SettingsCardSpacing}">
-                <StackPanel.ChildrenTransitions>
-                    <EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True"/>
-                    <RepositionThemeTransition IsStaggeringEnabled="False"/>
-                </StackPanel.ChildrenTransitions>
-                <TextBlock Style="{StaticResource SettingsCategoryTitleTextBlockStyle}"
+                <Grid.RowDefinitions>
+                    <RowDefinition x:Name="AppearanceTitleRow" Height="Auto"/>
+                    <RowDefinition x:Name="AppearanceExpanderRow" Height="Auto"/>
+                    <RowDefinition x:Name="AboutTitleContentRow" Height="*"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}"
                            AutomationProperties.HeadingLevel="Level1"
                            Text="{utils:ResourceString Name=SettingsAppearance/Text}"/>
-                <labs:SettingsExpander x:Name="AppThemeExpander"
-                                       Description="Select which app theme to display"
-                                       Header="App theme">
-                    <labs:SettingsExpander.HeaderIcon>
-                        <FontIcon Glyph="&#xE790;"/>
-                    </labs:SettingsExpander.HeaderIcon>
-                    <labs:SettingsExpander.Items>
-                        <labs:SettingsCard ContentAlignment="Left">
-                            <muxc:RadioButtons x:Name="ThemeRadioButtons"
-                                               Margin="0,-8,0,0"
-                                               SelectionChanged="OnThemeSelectionChanged">
-                                <RadioButton x:Name="LightThemeRadioButton"
-                                             Content="{utils:ResourceString Name=LightThemeRadioButton/Content}"
-                                             Tag="Light"/>
-                                <RadioButton x:Name="DarkThemeRadioButton"
-                                             Content="{utils:ResourceString Name=DarkThemeRadioButton/Content}"
-                                             Tag="Dark"/>
-                                <RadioButton x:Name="SystemThemeRadioButton"
-                                             Content="{utils:ResourceString Name=SystemThemeRadioButton/Content}"
-                                             Tag="Default"/>
-                            </muxc:RadioButtons>
-                        </labs:SettingsCard>
-                    </labs:SettingsExpander.Items>
-                </labs:SettingsExpander>
 
-                <TextBlock x:Name="AboutGroupTitle"
-                           Style="{ThemeResource SettingsCategoryTitleTextBlockStyle}"
-                           AutomationProperties.HeadingLevel="Level1"
-                           Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/>
-                <labs:SettingsExpander x:Name="AboutExpander">
-                    <labs:SettingsExpander.HeaderIcon>
-                        <BitmapIcon AutomationProperties.AccessibilityView="Raw" UriSource="ms-appx:///Assets/CalculatorAppList.png"/>
-                    </labs:SettingsExpander.HeaderIcon>
-                    <TextBlock x:Name="AboutBuildVersion"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                               IsTextSelectionEnabled="True"/>
-                    <labs:SettingsExpander.Items>
-                        <labs:SettingsCard ContentAlignment="Left">
-                            <StackPanel Margin="0,4,0,6"
-                                        Orientation="Vertical"
-                                        Spacing="12">
+                <muxc:Expander x:Name="AppThemeExpander"
+                               Grid.Row="1"
+                               Margin="0,8,0,0"
+                               HorizontalAlignment="Stretch"
+                               VerticalAlignment="Top"
+                               HorizontalContentAlignment="Left"
+                               AutomationProperties.Name="{utils:ResourceString Name=AppThemeExpander/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
+                               ExpandDirection="Down"
+                               IsExpanded="False">
+                    <muxc:Expander.Header>
+                        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
 
-                                <HyperlinkButton x:Name="AboutEULA"
-                                                 Padding="0"
-                                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
-                                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
-                                    <TextBlock FontSize="{ThemeResource BodyFontSize}"
-                                               Text="{utils:ResourceString Name=AboutEULA/Text}"
-                                               TextWrapping="Wrap"/>
-                                </HyperlinkButton>
+                            <FontIcon Margin="0,0,12,0"
+                                      VerticalAlignment="Center"
+                                      Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                                      FontFamily="{ThemeResource CalculatorFontFamily}"
+                                      FontSize="16"
+                                      Glyph="&#xE790;"/>
 
-                                <HyperlinkButton x:Name="AboutControlServicesAgreement"
-                                                 Padding="0"
-                                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
-                                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
-                                    <TextBlock FontSize="{ThemeResource BodyFontSize}"
-                                               Text="{utils:ResourceString Name=AboutControlServicesAgreement/Text}"
-                                               TextWrapping="Wrap"/>
-                                </HyperlinkButton>
-
-                                <HyperlinkButton x:Name="AboutControlPrivacyStatement"
-                                                 Padding="0"
-                                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
-                                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
-                                    <TextBlock FontSize="{ThemeResource BodyFontSize}"
-                                               Text="{utils:ResourceString Name=AboutControlPrivacyStatement/Text}"
-                                               TextWrapping="Wrap"/>
-                                </HyperlinkButton>
+                            <StackPanel Grid.Column="1"
+                                        Margin="0,12"
+                                        Orientation="Vertical">
+                                <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{utils:ResourceString Name=SettingsAppThemeTitle/Text}"/>
+                                <TextBlock Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                           Text="{utils:ResourceString Name=SettingsAppThemeDescription/Text}"
+                                           TextWrapping="WrapWholeWords"/>
                             </StackPanel>
-                        </labs:SettingsCard>
-                    </labs:SettingsExpander.Items>
-                </labs:SettingsExpander>
+                        </Grid>
+                    </muxc:Expander.Header>
+                    <muxc:Expander.Content>
+                        <muxc:RadioButtons x:Name="ThemeRadioButtons"
+                                           Margin="32,0,0,0"
+                                           SelectionChanged="OnThemeSelectionChanged">
+                            <RadioButton x:Name="LightThemeRadioButton"
+                                         Content="{utils:ResourceString Name=LightThemeRadioButton/Content}"
+                                         Tag="Light"/>
+                            <RadioButton x:Name="DarkThemeRadioButton"
+                                         Content="{utils:ResourceString Name=DarkThemeRadioButton/Content}"
+                                         Tag="Dark"/>
+                            <RadioButton x:Name="SystemThemeRadioButton"
+                                         Content="{utils:ResourceString Name=SystemThemeRadioButton/Content}"
+                                         Tag="Default"/>
+                        </muxc:RadioButtons>
+                    </muxc:Expander.Content>
+                </muxc:Expander>
 
-                <HyperlinkButton x:Name="FeedbackButton"
-                                 MinWidth="120"
-                                 Margin="-12,4,0,0"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Top"
-                                 FontSize="{StaticResource BodyFontSize}"
-                                 Click="FeedbackButton_Click"
-                                 Content="{utils:ResourceString Name=FeedbackButton/Content}"/>
+                <Grid x:Name="AboutContentGrid" Grid.Row="2">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
 
-                <RichTextBlock x:Name="AboutContribute"
-                               Grid.Row="2"
-                               Margin="1,9,0,0"
-                               Style="{StaticResource SettingsRichTextBlockStyle}">
-                    <Paragraph>
-                        <!--
-                            Note: don't put Hyperlink element start to the next line
-                            otherwise unexpected whitespace will be add.
-                        -->
-                        <Run x:Name="ContributeRunBeforeLink"/><Hyperlink Foreground="{x:Bind AboutEULA.Foreground, Mode=OneWay}"
-                                   NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
-                                   TextDecorations="None"
-                                   ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939"
-                                   UnderlineStyle="None">
-                            <Run x:Name="ContributeRunLink"/>
-                        </Hyperlink><Run x:Name="ContributeRunAfterLink"/>
-                    </Paragraph>
-                </RichTextBlock>
+                    <TextBlock x:Name="AboutGroupTitle"
+                               Margin="0,20,0,0"
+                               Style="{ThemeResource BodyStrongTextBlockStyle}"
+                               AutomationProperties.HeadingLevel="Level1"
+                               Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/>
+                    <StackPanel Grid.Row="1"
+                                Margin="0,8,0,0"
+                                Orientation="Vertical">
+                        <RichTextBlock x:Name="AboutContentBody" Style="{StaticResource SettingsRichTextBlockStyle}">
+                            <Paragraph>
+                                <Run x:Name="AboutBuildVersion"/>
+                                <LineBreak/>
+                                <Run x:Name="AboutControlCopyrightRun"/>
+                            </Paragraph>
+                        </RichTextBlock>
 
-            </StackPanel>
+                        <HyperlinkButton x:Name="AboutEULA"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
+                            <TextBlock FontSize="{ThemeResource BodyFontSize}"
+                                       Text="{utils:ResourceString Name=AboutEULA/Text}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
+                        <HyperlinkButton x:Name="AboutControlServicesAgreement"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
+                            <TextBlock FontSize="{ThemeResource BodyFontSize}"
+                                       Text="{utils:ResourceString Name=AboutControlServicesAgreement/Text}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
+                        <HyperlinkButton x:Name="AboutControlPrivacyStatement"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
+                            <TextBlock FontSize="{ThemeResource BodyFontSize}"
+                                       Text="{utils:ResourceString Name=AboutControlPrivacyStatement/Text}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
+                        <Button x:Name="FeedbackButton"
+                                MinWidth="120"
+                                Margin="0,24,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                FontSize="{StaticResource BodyFontSize}"
+                                Click="FeedbackButton_Click"
+                                Content="{utils:ResourceString Name=FeedbackButton/Content}"/>
+                    </StackPanel>
+                    <RichTextBlock x:Name="AboutContribute"
+                                   Grid.Row="2"
+                                   Margin="0,16,0,0"
+                                   Style="{StaticResource SettingsRichTextBlockStyle}">
+                        <Paragraph>
+                            <!--
+                                Note: don't put Hyperlink element start to the next line
+                                otherwise unexpected whitespace will be add.
+                            -->
+                            <Run x:Name="ContributeRunBeforeLink"/>
+                            <Hyperlink Foreground="{x:Bind AboutEULA.Foreground, Mode=OneWay}"
+                                       NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
+                                       TextDecorations="None"
+                                       ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939"
+                                       UnderlineStyle="None">
+                                <Run x:Name="ContributeRunLink"/>
+                            </Hyperlink>
+                            <Run x:Name="ContributeRunAfterLink"/>
+                        </Paragraph>
+                    </RichTextBlock>
+                </Grid>
+            </Grid>
         </ScrollViewer>
     </Grid>
 </UserControl>
diff --git a/src/Calculator/Views/Settings.xaml.cs b/src/Calculator/Views/Settings.xaml.cs
index b68a8f6b..0889b09a 100644
--- a/src/Calculator/Views/Settings.xaml.cs
+++ b/src/Calculator/Views/Settings.xaml.cs
@@ -45,7 +45,7 @@ namespace CalculatorApp
 
             var copyrightText =
                 LocalizationStringUtil.GetLocalizedString(resourceLoader.GetResourceString("AboutControlCopyright"), BUILD_YEAR);
-            AboutExpander.Description = copyrightText;
+            AboutControlCopyrightRun.Text = copyrightText;
 
             InitializeContributeTextBlock();
         }
@@ -108,8 +108,8 @@ namespace CalculatorApp
         private void SetVersionString()
         {
             PackageVersion version = Package.Current.Id.Version;
-            AboutExpander.Header = AppResourceProvider.GetInstance().GetResourceString("AppName");
-            AboutBuildVersion.Text = version.Major + "." + version.Minor + "." + version.Build + "." + version.Revision;
+            string appName = AppResourceProvider.GetInstance().GetResourceString("AppName");
+            AboutBuildVersion.Text = appName + " " + version.Major + "." + version.Minor + "." + version.Build + "." + version.Revision;
         }
 
         private void InitializeContributeTextBlock()