diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Controls/SettingsControl.xaml b/VSIX/DevWinUI_Template/DevWinUI_Template/Controls/SettingsControl.xaml
index 68076f1..4429442 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Controls/SettingsControl.xaml
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Controls/SettingsControl.xaml
@@ -37,7 +37,7 @@
                                                  Margin="0,0,16,0"
                                                  VerticalAlignment="Center"
                                                  Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                                 IsChecked="{TemplateBinding IsOn}"
+                                                 IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsOn, Mode=TwoWay}"
                                                  OffContent="Off"
                                                  OnContent="On" />
                             </Grid>
@@ -75,7 +75,7 @@
                             <ContentControl x:Name="PART_Content"
                                             Content="{TemplateBinding Item}" />
                             <ui:ToggleSwitch x:Name="PART_ToggleSwitch"
-                                             IsChecked="{TemplateBinding IsOn}"
+                                             IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsOn, Mode=TwoWay}"
                                              OffContent="Off"
                                              OnContent="On" />
                         </Grid>
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Pages/PagesPage.xaml b/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Pages/PagesPage.xaml
index 9206c0c..bae6bf4 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Pages/PagesPage.xaml
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Pages/PagesPage.xaml
@@ -14,7 +14,7 @@
             <Separator Margin="0,10,0,5"
                        HorizontalAlignment="Stretch" />
             <local:SettingsControl x:Name="tgHomePage"
-                                   Title="1. Add Home Landing Page"
+                                   Title="Add Home Landing Page"
                                    Description="Will create a landing page for your application's home screen. "
                                    Toggled="tgHomePage_Toggled">
                 <local:SettingsControl.Icon>
@@ -22,7 +22,7 @@
                 </local:SettingsControl.Icon>
             </local:SettingsControl>
             <local:SettingsControl x:Name="tgSettingsPage"
-                                   Title="2. Add SettingsPage"
+                                   Title="Add SettingsPage"
                                    Description="Will create a settings page with a BreadCrumbBar for your application"
                                    Toggled="tgSettingsPage_Toggled">
                 <local:SettingsControl.Icon>
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Pages/ResourcePage.xaml b/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Pages/ResourcePage.xaml
index 219a434..d93dc1c 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Pages/ResourcePage.xaml
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Pages/ResourcePage.xaml
@@ -11,8 +11,6 @@
     <ScrollViewer Margin="5"
                   VerticalAlignment="Top">
         <StackPanel>
-            <Separator Margin="0,10,0,10"
-                       HorizontalAlignment="Stretch" />
             <local:SettingsControl x:Name="tgDicColor"
                                    Title="Add ThemeResources.xaml Dictionary"
                                    Description="define reusable resources like colors and brushes for consistent theming across your application."