diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index b189b4f..b08b581 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -1124,6 +1124,7 @@
             </Border.Resources>
 
             <Pivot x:Name="DockPivot"
+                   Margin="0,-3,0,0"
                    TabIndex="5"
                    Tapped="DockPanelTapped"
                    Template="{StaticResource DockPanelTemplate}">
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
index 21b7cff..ab9ec8c 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
@@ -553,7 +553,7 @@
         <Grid x:Name="LeftGrid"
               Grid.Row="1"
               Padding="0,4,0,0"
-              Visibility="{x:Bind ShouldDisplayPanel(IsSmallState, SwitchModeToggleButton.IsOn, x:True), Mode=OneWay}">
+              Visibility="{x:Bind local:GraphingCalculator.ShouldDisplayPanel(IsSmallState, SwitchModeToggleButton.IsOn, x:True), Mode=OneWay}">
             <Grid.Resources>
                 <ResourceDictionary>
                     <ResourceDictionary.ThemeDictionaries>
diff --git a/src/Calculator/Views/HistoryList.xaml b/src/Calculator/Views/HistoryList.xaml
index 89cb275..64f113a 100644
--- a/src/Calculator/Views/HistoryList.xaml
+++ b/src/Calculator/Views/HistoryList.xaml
@@ -132,9 +132,10 @@
             </Grid.RowDefinitions>
             <TextBlock x:Name="HistoryEmpty"
                        x:Uid="HistoryEmpty"
-                       Margin="12,14,24,0"
+                       Margin="16,14,24,0"
                        Style="{ThemeResource BaseTextBlockStyle}"
                        Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
+                       FontWeight="SemiLight"
                        TextWrapping="Wrap"
                        Visibility="{Binding ItemSize, Converter={StaticResource ItemSizeToVisibilityConverter}}"/>
             <ListView x:Name="HistoryListView"
diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml
index 9f453cc..1fc2fdd 100644
--- a/src/Calculator/Views/MainPage.xaml
+++ b/src/Calculator/Views/MainPage.xaml
@@ -33,6 +33,12 @@
             <Setter Property="KeyTipPlacementMode" Value="Right"/>
         </Style>
 
+        <Style x:Key="CategoryNameTextBlockStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings"/>
+        </Style>
+
         <DataTemplate x:Key="NavMenuItemPreviewDataTemplate" x:DataType="x:String">
             <StackPanel Orientation="Horizontal">
                 <TextBlock VerticalAlignment="Center" Text="{x:Bind}"/>
@@ -169,12 +175,12 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <StackPanel Margin="52,0,0,0" Orientation="Horizontal">
+                <StackPanel Margin="48,0,0,0" Orientation="Horizontal">
                     <TextBlock x:Name="Header"
                                Margin="0,-3,0,0"
                                HorizontalAlignment="Left"
                                VerticalAlignment="Center"
-                               Style="{StaticResource SubtitleTextBlockStyle}"
+                               Style="{StaticResource CategoryNameTextBlockStyle}"
                                Text="{x:Bind Model.CategoryName, Mode=OneWay}"
                                Visibility="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/>
                     <controls:PreviewTagControl Margin="10,0,0,0"
diff --git a/src/Calculator/Views/Memory.xaml b/src/Calculator/Views/Memory.xaml
index b609f9f..9ce7065 100644
--- a/src/Calculator/Views/Memory.xaml
+++ b/src/Calculator/Views/Memory.xaml
@@ -96,9 +96,10 @@
             </Grid.RowDefinitions>
             <TextBlock x:Name="MemoryPaneEmpty"
                        x:Uid="MemoryPaneEmpty"
-                       Margin="12,14,24,0"
+                       Margin="16,14,24,0"
                        Style="{ThemeResource BaseTextBlockStyle}"
                        Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
+                       FontWeight="SemiLight"
                        TextWrapping="Wrap"
                        Visibility="{Binding IsMemoryEmpty, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             <ListView x:Name="MemoryListView"