diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index 2bf5bc2c..2ef85e73 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -2352,7 +2352,6 @@
                                                   Visibility="Collapsed"/>
                                 <Border x:Name="BorderElement"
                                         Grid.Row="1"
-                                        Grid.RowSpan="1"
                                         Grid.Column="0"
                                         Grid.ColumnSpan="4"
                                         MinWidth="32"
diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index d26dd34b..e5460468 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -166,6 +166,11 @@
                                           Style="{StaticResource ResultsScrollerSnapped}"
                                           AutomationProperties.AccessibilityView="Control">
                                 <Grid x:Name="ExpressionContent">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
                                     <TextBlock x:Name="EditableToken"
                                                Grid.Row="2"
                                                Margin="4,0,4,0"
@@ -409,6 +414,10 @@
     </UserControl.Resources>
 
     <Grid AutomationProperties.LandmarkType="Main">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition x:Name="ColumnMain"/>
             <ColumnDefinition x:Name="ColumnHistory"
diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml
index 8b295136..e4033a91 100644
--- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml
@@ -24,6 +24,7 @@
             <ColumnDefinition Width="1*" MaxWidth="80"/>
             <ColumnDefinition Width="1*" MaxWidth="80"/>
             <ColumnDefinition Width="1*" MaxWidth="80"/>
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
 
         <VisualStateManager.VisualStateGroups>
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
index 039b4e2a..df17f72a 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
@@ -499,6 +499,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="{StaticResource HamburgerHeightGridLength}"/>
             <RowDefinition/>
+            <RowDefinition />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="2*"/>
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
index 90987a7f..b49ff1c4 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
@@ -37,6 +37,10 @@
                             <Grid Name="LayoutRoot"
                                   Background="{ThemeResource ToggleButtonBackground}"
                                   contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
                                 <VisualStateManager.VisualStateGroups>
                                     <VisualStateGroup x:Name="CommonStates">
                                         <VisualState x:Name="Normal"/>
diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index 0d31720b..5308ed51 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -513,6 +513,10 @@
               Grid.RowSpan="5"
               Grid.Column="0"
               Grid.ColumnSpan="4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="10*"/>
                 <RowDefinition Height="7*"/>