diff --git a/WinUINotes/WinUINotes/MainWindow.xaml b/WinUINotes/WinUINotes/MainWindow.xaml
index c37f075..91cdc85 100644
--- a/WinUINotes/WinUINotes/MainWindow.xaml
+++ b/WinUINotes/WinUINotes/MainWindow.xaml
@@ -34,4 +34,4 @@
         <Frame x:Name="rootFrame" Grid.Row="1"
                SourcePageType="views:AllNotesPage"/>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/WinUINotes/WinUINotes/Views/AllNotesPage.xaml b/WinUINotes/WinUINotes/Views/AllNotesPage.xaml
index 7f152c0..711941d 100644
--- a/WinUINotes/WinUINotes/Views/AllNotesPage.xaml
+++ b/WinUINotes/WinUINotes/Views/AllNotesPage.xaml
@@ -7,8 +7,7 @@
     xmlns:models="using:WinUINotes.Models"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    mc:Ignorable="d">
     <Page.Resources>
         <DataTemplate x:Key="NoteItemTemplate" 
                       x:DataType="models:Note">
@@ -21,11 +20,11 @@
                         <RowDefinition Height="120"/>
                         <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
-                    <TextBlock Text="{x:Bind Text}" Margin="4"
+                    <TextBlock Text="{x:Bind Text}" Margin="12,8"
                                TextWrapping="Wrap"
                                TextTrimming="WordEllipsis"/>
-                    <Border Grid.Row="1" Padding="4,6,0,6"
-                            Background="{ThemeResource ControlAltFillColorSecondaryBrush}">
+                    <Border Grid.Row="1" Padding="8,6,0,6"
+                            Background="{ThemeResource SubtleFillColorSecondaryBrush}">
                         <TextBlock Text="{x:Bind Date}"
                             Style="{StaticResource CaptionTextBlockStyle}"
                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
@@ -44,21 +43,21 @@
             <AppBarButton Icon="Add" Label="New note"
                           Click="NewNoteButton_Click"/>
             <CommandBar.Content>
-                <TextBlock Text="Quick notes" Margin="12,8" 
+                <TextBlock Text="Quick notes" Margin="16,8" 
                    Style="{ThemeResource SubtitleTextBlockStyle}"/>
             </CommandBar.Content>
         </CommandBar>
 
         <ItemsView ItemsSource="{x:Bind notesModel.Notes}" 
-                   Grid.Row="1" Margin="24"
+                   Grid.Row="1" Padding="16"
                    ItemTemplate="{StaticResource NoteItemTemplate}"
                    SelectionMode="None"
                    IsItemInvokedEnabled="True"
                    ItemInvoked="ItemsView_ItemInvoked">
             <ItemsView.Layout>
                 <UniformGridLayout MinItemWidth="200"
-                           MinColumnSpacing="20"
-                           MinRowSpacing="20"
+                           MinColumnSpacing="12"
+                           MinRowSpacing="12"
                            ItemsJustification="Start"/>
             </ItemsView.Layout>
         </ItemsView>
diff --git a/WinUINotes/WinUINotes/Views/NotePage.xaml b/WinUINotes/WinUINotes/Views/NotePage.xaml
index d216bb6..cf856a4 100644
--- a/WinUINotes/WinUINotes/Views/NotePage.xaml
+++ b/WinUINotes/WinUINotes/Views/NotePage.xaml
@@ -6,8 +6,7 @@
     xmlns:local="using:WinUINotes"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    mc:Ignorable="d">
 
     <Grid Padding="16" RowSpacing="8">
         <Grid.RowDefinitions>
@@ -34,7 +33,7 @@
                 HorizontalAlignment="Right"
                 Spacing="4"
                 Grid.Row="1" Grid.Column="1">
-            <Button Content="Save" Click="SaveButton_Click"/>
+            <Button Content="Save" Click="SaveButton_Click" Style="{StaticResource AccentButtonStyle}"/>
             <Button Content="Delete" Click="DeleteButton_Click"/>
         </StackPanel>
     </Grid>