diff --git a/Sample Applications/WPFGallery/Views/Layout/BorderPage.xaml b/Sample Applications/WPFGallery/Views/Layout/BorderPage.xaml
index 12e7a6ec..aec39f7e 100644
--- a/Sample Applications/WPFGallery/Views/Layout/BorderPage.xaml	
+++ b/Sample Applications/WPFGallery/Views/Layout/BorderPage.xaml	
@@ -19,6 +19,12 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
+    <Page.Resources>
+        <Style TargetType="TextBlock">
+            <Setter Property="TextWrapping" Value="Wrap"/>
+        </Style>
+    </Page.Resources>
+
     <Grid x:Name="ContentPagePane" Height="Auto">
 
         <Grid.RowDefinitions>
diff --git a/Sample Applications/WPFGallery/Views/Layout/GridPage.xaml b/Sample Applications/WPFGallery/Views/Layout/GridPage.xaml
index ea8e42fc..91088d43 100644
--- a/Sample Applications/WPFGallery/Views/Layout/GridPage.xaml	
+++ b/Sample Applications/WPFGallery/Views/Layout/GridPage.xaml	
@@ -10,6 +10,12 @@
       Title="GridPage"
       Foreground="{DynamicResource TextFillColorPrimaryBrush}">
 
+    <Page.Resources>
+        <Style TargetType="TextBlock">
+            <Setter Property="TextWrapping" Value="Wrap"/>
+        </Style>
+    </Page.Resources>
+
     <Grid x:Name="ContentPagePane" Height="Auto">
 
         <Grid.RowDefinitions>
diff --git a/Sample Applications/WPFGallery/Views/Layout/GroupBoxPage.xaml b/Sample Applications/WPFGallery/Views/Layout/GroupBoxPage.xaml
index d9393801..9ebbeca7 100644
--- a/Sample Applications/WPFGallery/Views/Layout/GroupBoxPage.xaml	
+++ b/Sample Applications/WPFGallery/Views/Layout/GroupBoxPage.xaml	
@@ -26,7 +26,7 @@
    Header=&quot;User Information&quot; &#10;
    HorizontalAlignment=&quot;Left&quot; &#10;
    VerticalAlignment=&quot;Center&quot; &#10;
-   Width=&quot;400&quot;&gt;&#10;
+   MaxWidth=&quot;400&quot;&gt;&#10;
     &lt;StackPanel&gt;&#10;
         &lt;StackPanel Orientation=&quot;Horizontal&quot;&gt;&#10;
             &lt;TextBlock Width=&quot;100&quot; Text=&quot;Name:&quot; /&gt;&#10;
@@ -42,7 +42,7 @@
                           Header="User Information" 
                           HorizontalAlignment="Left" 
                           VerticalAlignment="Center" 
-                          Width="400">
+                          MaxWidth="400">
                             <StackPanel>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Width="100" Text="Name:" />
diff --git a/Sample Applications/WPFGallery/Views/Layout/ResizeGripPage.xaml b/Sample Applications/WPFGallery/Views/Layout/ResizeGripPage.xaml
index ac83f616..90d3b648 100644
--- a/Sample Applications/WPFGallery/Views/Layout/ResizeGripPage.xaml	
+++ b/Sample Applications/WPFGallery/Views/Layout/ResizeGripPage.xaml	
@@ -10,6 +10,12 @@
       Title="ResizeGripPage"
       Foreground="{DynamicResource TextFillColorPrimaryBrush}">
 
+    <Page.Resources>
+        <Style TargetType="TextBlock">
+            <Setter Property="TextWrapping" Value="Wrap"/>
+        </Style>
+    </Page.Resources>
+
     <Grid>
         <Grid x:Name="ContentPagePane" Height="Auto">
             <Grid.RowDefinitions>