diff --git a/code/test/VsEmulator/Main/MainView.xaml b/code/test/VsEmulator/Main/MainView.xaml
index dec2c05ee..f056226ca 100644
--- a/code/test/VsEmulator/Main/MainView.xaml
+++ b/code/test/VsEmulator/Main/MainView.xaml
@@ -25,15 +25,15 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
-            <StackPanel Grid.Column="0" Orientation="Horizontal">
+            <StackPanel Grid.Column="0">
                 <TextBlock>           
                     <Hyperlink Command="{Binding NewProjectCommand}">
                         <TextBlock Text="New Project..."/>
                     </Hyperlink>
                 </TextBlock>
-                <TextBlock Margin="20,0,0,0">           
+                <TextBlock>           
                     <Hyperlink Command="{Binding TemplatesContentCommand}">
-                        <TextBlock Text="Handle Templates Content"/>
+                        <TextBlock Text="Templates versioning..."/>
                     </Hyperlink>
                 </TextBlock>
             </StackPanel>
diff --git a/templates/Projects/Blank/Blank/Services/ActivationService.cs b/templates/Projects/Blank/Blank/Services/ActivationService.cs
index 9cb9d1615..7c927c140 100644
--- a/templates/Projects/Blank/Blank/Services/ActivationService.cs
+++ b/templates/Projects/Blank/Blank/Services/ActivationService.cs
@@ -46,6 +46,10 @@ namespace uct.BlankProject.Services
                 {
                     // Create a Frame to act as the navigation context and navigate to the first page
                     Window.Current.Content = _shell;
+                    NavigationService.Frame.NavigationFailed += (sender, e) =>
+                    {
+                        throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+                    };
                 } 
             }
 
diff --git a/templates/Projects/SplitView/SplitView/Services/ActivationService.cs b/templates/Projects/SplitView/SplitView/Services/ActivationService.cs
index ed5ef56a4..bd79b0075 100644
--- a/templates/Projects/SplitView/SplitView/Services/ActivationService.cs
+++ b/templates/Projects/SplitView/SplitView/Services/ActivationService.cs
@@ -46,6 +46,10 @@ namespace uct.SplitViewProject.Services
                 {
                     // Create a Frame to act as the navigation context and navigate to the first page
                     Window.Current.Content = _shell;
+                    NavigationService.Frame.NavigationFailed += (sender, e) =>
+                    {
+                        throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+                    };
                 } 
             }
 
diff --git a/templates/Projects/TabbedPivot/TabbedPivot/Services/ActivationService.cs b/templates/Projects/TabbedPivot/TabbedPivot/Services/ActivationService.cs
index ead21a7f0..ddc83a44b 100644
--- a/templates/Projects/TabbedPivot/TabbedPivot/Services/ActivationService.cs
+++ b/templates/Projects/TabbedPivot/TabbedPivot/Services/ActivationService.cs
@@ -46,6 +46,10 @@ namespace uct.TabbedPivotProject.Services
                 {
                     // Create a Frame to act as the navigation context and navigate to the first page
                     Window.Current.Content = _shell;
+                    NavigationService.Frame.NavigationFailed += (sender, e) =>
+                    {
+                        throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+                    };
                 } 
             }