From 74a039f27c3a5d6c91ec284a500578f202603fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?gabriel=2Ehuot-v=C3=A9zina?=
 <gabriel.huot-vezina@nrcan-rncan.gc.ca>
Date: Wed, 7 Jun 2023 13:37:16 -0400
Subject: [PATCH] Juniper Mesa3 UI glitches fix

---
 GSCFieldApp/Package.appxmanifest              |  2 +-
 GSCFieldApp/Styles/Custom.xaml                |  1 -
 GSCFieldApp/Views/DocumentDialog.xaml         | 12 +++----
 GSCFieldApp/Views/EarthmatDialog.xaml         |  6 ++--
 GSCFieldApp/Views/EnvironmentDialog.xaml      |  6 ++--
 GSCFieldApp/Views/FieldBookDialog.xaml        |  6 ++--
 GSCFieldApp/Views/FieldBooksPage.xaml         | 36 ++++++++-----------
 GSCFieldApp/Views/FossilDialog.xaml           |  6 ++--
 GSCFieldApp/Views/LocationDialog.xaml         |  6 ++--
 GSCFieldApp/Views/MapPage.xaml                | 30 ++++++++--------
 GSCFieldApp/Views/MineralDialog.xaml          |  6 ++--
 .../Views/MineralizationAlterationDialog.xaml |  6 ++--
 GSCFieldApp/Views/PaleoflowDialog.xaml        |  7 ++--
 GSCFieldApp/Views/PicklistDialog.xaml         |  6 ++--
 GSCFieldApp/Views/SampleDialog.xaml           |  6 ++--
 GSCFieldApp/Views/StationDialog.xaml          |  8 ++---
 GSCFieldApp/Views/StructureDialog.xaml        |  6 ++--
 17 files changed, 74 insertions(+), 82 deletions(-)

diff --git a/GSCFieldApp/Package.appxmanifest b/GSCFieldApp/Package.appxmanifest
index dc5aa297..4722650e 100644
--- a/GSCFieldApp/Package.appxmanifest
+++ b/GSCFieldApp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.3.13.0" />
+  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.3.14.0" />
   <mp:PhoneIdentity PhoneProductId="06e90cbe-1a34-4205-8fe6-3ce0ad4467db" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Geological Survey Canada Field Application</DisplayName>
diff --git a/GSCFieldApp/Styles/Custom.xaml b/GSCFieldApp/Styles/Custom.xaml
index 17c2cf02..de0d407f 100644
--- a/GSCFieldApp/Styles/Custom.xaml
+++ b/GSCFieldApp/Styles/Custom.xaml
@@ -2019,7 +2019,6 @@
                 <Setter Property="IsRightTapEnabled" Value="False" />
                 <Setter Property="IsHoldingEnabled" Value="False" />
                 <Setter Property="IsDoubleTapEnabled" Value="False" />
-
             </Style>
            
 
diff --git a/GSCFieldApp/Views/DocumentDialog.xaml b/GSCFieldApp/Views/DocumentDialog.xaml
index 0836c994..59f4eb9a 100644
--- a/GSCFieldApp/Views/DocumentDialog.xaml
+++ b/GSCFieldApp/Views/DocumentDialog.xaml
@@ -40,15 +40,15 @@
         <RelativePanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
 
-            <Controls:PageHeader x:Name="pageHeader" x:Uid="DocumentDialogHeader" Text ="" BackButtonVisibility="Collapsed" CommandBarOverflowPresenterStyle="{StaticResource CommandBarOverflowPresenterStyleDocumentPage}"
+            <Controls:PageHeader x:Name="pageHeader" x:Uid="DocumentDialogHeader" Text ="" BackButtonVisibility="Collapsed" 
+                                 CommandBarOverflowPresenterStyle="{StaticResource CommandBarOverflowPresenterStyleDocumentPage}"
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldPhotoColorBrush}"
-                            RelativePanel.AlignRightWithPanel="True"
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            RelativePanel.AlignRightWithPanel="True" EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="documentPhotoButton" Icon="Camera" Label="Camera" Foreground="White" Width="100" Height="57" IsCompact ="True" Tapped="documentPhotoButton_Tapped" x:Uid="DocumentDialogSnapshot"/>
+                    <AppBarButton x:Name="documentPhotoButton" Icon="Camera" Label="Camera" Foreground="White" Tapped="documentPhotoButton_Tapped" x:Uid="DocumentDialogSnapshot"/>
                     <AppBarSeparator Foreground="White"/>
-                    <AppBarButton x:Name="documentBackButton" Icon="Clear" x:Uid="GenericCloseLabel" Label ="Close" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="documentBackButton_Tapped" />
-                    <AppBarButton x:Name="documentSaveButton" Icon="Save"  x:Uid="GenericSaveLabel" Label ="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="documentSaveButton_Tapped" />
+                    <AppBarButton x:Name="documentBackButton" Icon="Clear" x:Uid="GenericCloseLabel" Label ="Close" Foreground="White" Tapped="documentBackButton_Tapped" />
+                    <AppBarButton x:Name="documentSaveButton" Icon="Save"  x:Uid="GenericSaveLabel" Label ="Save" Foreground="White" Tapped="documentSaveButton_Tapped" />
                     
                 </Controls:PageHeader.PrimaryCommands>
                 <!--<Controls:PageHeader.SecondaryCommands/>-->
diff --git a/GSCFieldApp/Views/EarthmatDialog.xaml b/GSCFieldApp/Views/EarthmatDialog.xaml
index 8a156de6..78bfdb11 100644
--- a/GSCFieldApp/Views/EarthmatDialog.xaml
+++ b/GSCFieldApp/Views/EarthmatDialog.xaml
@@ -44,10 +44,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldEarthMatColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right" >
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="earthmatBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="earthmatBackButton_Tapped" />
-                    <AppBarButton x:Name="earthmatSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="earthmatSaveButton_Tapped" />
+                    <AppBarButton x:Name="earthmatBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White"  Tapped="earthmatBackButton_Tapped" />
+                    <AppBarButton x:Name="earthmatSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="earthmatSaveButton_Tapped" />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/EnvironmentDialog.xaml b/GSCFieldApp/Views/EnvironmentDialog.xaml
index c4355c60..8d439c20 100644
--- a/GSCFieldApp/Views/EnvironmentDialog.xaml
+++ b/GSCFieldApp/Views/EnvironmentDialog.xaml
@@ -34,10 +34,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldEnvironmentColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right">
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="envBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Height="57" IsCompact ="True" Foreground="White" Tapped="envBackButton_Tapped" Width="Auto"/>
-                    <AppBarButton x:Name="envSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Height="57" IsCompact ="True" Foreground="White" Tapped="envSaveButton_Tapped" Width="Auto"/>
+                    <AppBarButton x:Name="envBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="envBackButton_Tapped"/>
+                    <AppBarButton x:Name="envSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="envSaveButton_Tapped"/>
                 </Controls:PageHeader.PrimaryCommands>
 
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/FieldBookDialog.xaml b/GSCFieldApp/Views/FieldBookDialog.xaml
index 248e0bfc..dd7b2fd2 100644
--- a/GSCFieldApp/Views/FieldBookDialog.xaml
+++ b/GSCFieldApp/Views/FieldBookDialog.xaml
@@ -17,11 +17,11 @@
                             RelativePanel.AlignLeftWithPanel="True" 
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
 
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="userInfoCancelButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Tapped="userInfoCancelButton_TappedAsync" />
-                    <AppBarButton x:Name="userInfoSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Tapped="saveUserInfo_TappedAsync" />
+                    <AppBarButton x:Name="userInfoCancelButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="userInfoCancelButton_TappedAsync" />
+                    <AppBarButton x:Name="userInfoSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="saveUserInfo_TappedAsync" />
                 </Controls:PageHeader.PrimaryCommands>
                 
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/FieldBooksPage.xaml b/GSCFieldApp/Views/FieldBooksPage.xaml
index bdf63650..fcaab787 100644
--- a/GSCFieldApp/Views/FieldBooksPage.xaml
+++ b/GSCFieldApp/Views/FieldBooksPage.xaml
@@ -108,35 +108,29 @@
 
         <!--  header  -->
         <controls:PageHeader x:Name="projectPageHeader" Content="" x:Uid="ProjectsPageHeader"
-                             Frame="{x:Bind Frame}"
-                             RelativePanel.AlignLeftWithPanel="True" EllipsisVisibility="Collapsed"
-                             RelativePanel.AlignRightWithPanel="True"
-                             RelativePanel.AlignTopWithPanel="True" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right">
+                             Frame="{x:Bind Frame}" EllipsisVisibility="Visible" 
+                             RelativePanel.AlignLeftWithPanel="True"
+                             RelativePanel.AlignRightWithPanel="True" BackButtonVisibility="Collapsed"
+                             RelativePanel.AlignTopWithPanel="True" IsOpen="False" DefaultLabelPosition="Bottom" IsSticky="True">
 
             <controls:PageHeader.PrimaryCommands>
-                <AppBarButton x:Name="projectAddButton" Icon="Add" Label="Add" Width="100" Height="56" IsCompact ="False" VerticalAlignment="Bottom" Foreground="White" Tapped="{x:Bind ViewModel.projectAddButton_Tapped}" x:Uid="ProjectAddButtonLabel"/>
-                <AppBarButton x:Name="projectOpenButton" Icon="Accept" Label="Accept" Width="100" Height="56" IsCompact ="True" VerticalAlignment="Bottom" Foreground="White" Tapped="{x:Bind ViewModel.projectOpenButton_Tapped}" x:Uid="ProjectOpenButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
-                <AppBarButton x:Name="projectEditButton" Icon="Edit" Label="Edit" Width="100" Height="56" IsCompact ="True" VerticalAlignment="Bottom" Foreground="White" Tapped="{x:Bind ViewModel.ProjectEditButton_Tapped}" x:Uid="ProjectEditButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
-                <AppBarButton x:Name="projectDeleteButton" Icon="Delete" Label="Delete" Width="100" Height="56" IsCompact ="True" VerticalAlignment="Bottom" Foreground="White" Tapped="{x:Bind ViewModel.ProjectDeleteButton_TappedAsync}" x:Uid="ProjectDeleteButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
+                <AppBarButton x:Name="projectAddButton"  Icon="Add" Label="Add" Foreground="White" Tapped="{x:Bind ViewModel.projectAddButton_Tapped}" x:Uid="ProjectAddButtonLabel"/>
+                <AppBarButton x:Name="projectOpenButton"  Icon="Accept" Label="Accept" Foreground="White" Tapped="{x:Bind ViewModel.projectOpenButton_Tapped}" x:Uid="ProjectOpenButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
+                <AppBarButton x:Name="projectEditButton"  Icon="Edit" Label="Edit" Foreground="White" Tapped="{x:Bind ViewModel.ProjectEditButton_Tapped}" x:Uid="ProjectEditButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
+                <AppBarButton x:Name="projectDeleteButton" Icon="Delete" Label="Delete" Foreground="White" Tapped="{x:Bind ViewModel.ProjectDeleteButton_TappedAsync}" x:Uid="ProjectDeleteButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
                 
             </controls:PageHeader.PrimaryCommands>
-            <!--  comment out, will move from secondary to primary  
-            <controls:PageHeader.SecondaryCommands>
-                <AppBarButton x:Name="projectFullBackupButton" x:Uid="ProjectFullBackupButtonLabel" FontSize="14" ToolTipService.ToolTip="" Foreground="Black" Label="Full Backup" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectBackup_Tapped}" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
-                <AppBarButton x:Name="projectRestoreButton" x:Uid="ProjectRestoreButtonLabel"  FontSize="14" ToolTipService.ToolTip="" Foreground="Black" Label="Restore" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectRestore_Tapped}"/>
-                <AppBarButton x:Name="projectUpgradeButton" x:Uid="ProjectUpgradeButtonLabel"  FontSize="14" ToolTipService.ToolTip="" Foreground="Black" Label="Upgrade" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectUpgrade_Tapped}"/>
-            </controls:PageHeader.SecondaryCommands>
-            -->
+
         </controls:PageHeader>
 
-        <controls:PageHeader x:Name="pageFooter" RelativePanel.AlignLeftWithPanel="True" DefaultLabelPosition="Right"
-                             RelativePanel.AlignRightWithPanel="True" RelativePanel.AlignBottomWithPanel="True" EllipsisVisibility="Collapsed" IsSticky="False" Height="40">
+        <controls:PageHeader x:Name="pageFooter" RelativePanel.AlignLeftWithPanel="True" IsOpen="False" DefaultLabelPosition="Bottom"
+                             RelativePanel.AlignRightWithPanel="True" RelativePanel.AlignBottomWithPanel="True" EllipsisVisibility="Visible" IsSticky="True" >
          
             <controls:PageHeader.PrimaryCommands>
 
-                <AppBarButton x:Name="projectFullBackupButton" Icon="Download" MinWidth="160" Width="Auto" Height="60" IsCompact ="True" VerticalAlignment="Top" x:Uid="ProjectFullBackupButtonLabel" FontSize="14" ToolTipService.ToolTip="" Foreground="White" Label="Complete Backup" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectBackup_Tapped}" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
-                <AppBarButton x:Name="projectRestoreButton" Icon="Upload" MinWidth="100" Width="Auto" Height="60" IsCompact ="True" VerticalAlignment="Top" x:Uid="ProjectRestoreButtonLabel"  FontSize="14" ToolTipService.ToolTip="" Foreground="White" Label="Restore" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectRestore_Tapped}"/>
-                <AppBarButton x:Name="projectUpgradeButton" Icon="Refresh" MinWidth="100" Width="Auto" Height="60" IsCompact ="True" VerticalAlignment="Top" x:Uid="ProjectUpgradeButtonLabel"  FontSize="14" ToolTipService.ToolTip="" Foreground="White" Label="Upgrade" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectUpgrade_Tapped}"/>
+                <AppBarButton x:Name="projectFullBackupButton" Icon="Download" x:Uid="ProjectFullBackupButtonLabel"  ToolTipService.ToolTip="" Foreground="White" Label="Complete Backup" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectBackup_Tapped}" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
+                <AppBarButton x:Name="projectRestoreButton" Icon="Upload" x:Uid="ProjectRestoreButtonLabel"   ToolTipService.ToolTip="" Foreground="White" Label="Restore" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectRestore_Tapped}"/>
+                <AppBarButton x:Name="projectUpgradeButton" Icon="Refresh"  x:Uid="ProjectUpgradeButtonLabel"  ToolTipService.ToolTip="" Foreground="White" Label="Upgrade" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectUpgrade_Tapped}"/>
             </controls:PageHeader.PrimaryCommands>
 
 
@@ -147,7 +141,7 @@
         
         <!--  content  -->
         <GridView 
-            RelativePanel.Below="projectPageHeader"     
+            RelativePanel.Below="projectPageHeader"     RelativePanel.Above="pageFooter"
             RelativePanel.AlignLeftWithPanel="True"
             RelativePanel.AlignRightWithPanel="True" Margin="15" x:Name="ProjectList" Style="{StaticResource ReportPageGridView}"
                     IsSwipeEnabled="False" AllowDrop="False" ItemContainerStyle="{StaticResource ReportPageGridViewBookItems}"
diff --git a/GSCFieldApp/Views/FossilDialog.xaml b/GSCFieldApp/Views/FossilDialog.xaml
index f8452ac9..a01bc818 100644
--- a/GSCFieldApp/Views/FossilDialog.xaml
+++ b/GSCFieldApp/Views/FossilDialog.xaml
@@ -13,11 +13,11 @@
                             RelativePanel.AlignLeftWithPanel="True" 
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right"
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right"
                             Background="{ThemeResource FieldFossilColorBrush}">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="fossilBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="fossilBackButton_Tapped" />
-                    <AppBarButton x:Name="fossilSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="fossilSaveButton_Tapped" />
+                    <AppBarButton x:Name="fossilBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="fossilBackButton_Tapped" />
+                    <AppBarButton x:Name="fossilSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="fossilSaveButton_Tapped" />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/LocationDialog.xaml b/GSCFieldApp/Views/LocationDialog.xaml
index bcb77b16..bf46e0e7 100644
--- a/GSCFieldApp/Views/LocationDialog.xaml
+++ b/GSCFieldApp/Views/LocationDialog.xaml
@@ -22,10 +22,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldObsColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="LocationBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="LocationBackButton_Tapped" />
-                    <AppBarButton x:Name="LocationSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="LocationSaveButton_Tapped"  />
+                    <AppBarButton x:Name="LocationBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="LocationBackButton_Tapped" />
+                    <AppBarButton x:Name="LocationSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="LocationSaveButton_Tapped"  />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/MapPage.xaml b/GSCFieldApp/Views/MapPage.xaml
index ae961ab1..0a43178e 100644
--- a/GSCFieldApp/Views/MapPage.xaml
+++ b/GSCFieldApp/Views/MapPage.xaml
@@ -57,26 +57,26 @@
 
         <Controls:PageHeader x:Name="pageHeader" Frame="{x:Bind Frame}"
                              RelativePanel.AlignLeftWithPanel="True" RelativePanel.AlignRightWithPanel="True"  RelativePanel.AlignTopWithPanel="True" 
-                             x:Uid="MapPageHeader" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" EllipsisVisibility="Collapsed">
+                             x:Uid="MapPageHeader" IsOpen="False" DefaultLabelPosition="Bottom" IsSticky="True">
             <!--<Interactivity:Interaction.Behaviors>
                 <Behaviors:EllipsisBehavior Visibility="Collapsed" />
             </Interactivity:Interaction.Behaviors>-->
             <!--  primary commands  -->
             <Controls:PageHeader.PrimaryCommands>
 
-                <AppBarButton x:Name="MapPageStationCommandButton" Label="Station" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Icon="Map" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPageStationCommand" VerticalAlignment="Bottom" />
-                <AppBarButton x:Name="MapPageSampleCommandButton" Label="Sample" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Icon="Tag" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPageSampleCommand" IsEnabled="{x:Bind MapPageViewModel.MapPageQuickSampleEnable, Mode=TwoWay}" VerticalAlignment="Bottom" />
-                <AppBarButton x:Name="MapPagePhotoCommandButton" Label="Photo" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Icon="Pictures" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPagePhotoCommand" IsEnabled="{x:Bind MapPageViewModel.MapPageQuickPhotoEnable, Mode=TwoWay}" VerticalAlignment="Bottom" />
-                <AppBarButton x:Name="MapPageStrucCommandButton" Label="Structure" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Icon="Directions" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPageMeasureCommand" IsEnabled="{x:Bind MapPageViewModel.MapPageQuickMeasurementEnable, Mode=TwoWay}" VerticalAlignment="Bottom" />
-                <AppBarButton x:Name="AddWaypoint" Label="Waypoint" x:Uid="MapPageAddWaypoint" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Icon="Flag" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" VerticalAlignment="Bottom" />
-                <AppBarButton x:Name="MapPageLocationCommandButton" Label="Location" Width="Auto" Height="57" HorizontalContentAlignment="Right" FontSize="14" Icon="Map" Foreground="White" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPageLocationCommand" VerticalAlignment="Bottom" />
+                <AppBarButton x:Name="MapPageStationCommandButton" Label="Station"  Foreground="White" Icon="Map" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPageStationCommand"  />
+                <AppBarButton x:Name="MapPageSampleCommandButton" Label="Sample"    Foreground="White" Icon="Tag" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPageSampleCommand" IsEnabled="{x:Bind MapPageViewModel.MapPageQuickSampleEnable, Mode=TwoWay}"/>
+                <AppBarButton x:Name="MapPagePhotoCommandButton" Label="Photo"  Foreground="White" Icon="Pictures" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPagePhotoCommand" IsEnabled="{x:Bind MapPageViewModel.MapPageQuickPhotoEnable, Mode=TwoWay}" />
+                <AppBarButton x:Name="MapPageStrucCommandButton" Label="Structure"   Foreground="White" Icon="Directions" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPageMeasureCommand" IsEnabled="{x:Bind MapPageViewModel.MapPageQuickMeasurementEnable, Mode=TwoWay}" />
+                <AppBarButton x:Name="AddWaypoint" Label="Waypoint" x:Uid="MapPageAddWaypoint"  Foreground="White" Icon="Flag" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" />
+                <AppBarButton x:Name="MapPageLocationCommandButton" Label="Location"  Icon="Map" Foreground="White" Tapped="{x:Bind MapPageViewModel.MapPageQuickButtons_Tapped}" x:Uid="MapPageLocationCommand" />
             </Controls:PageHeader.PrimaryCommands>
 
         </Controls:PageHeader>
 
-        <Controls:PageHeader x:Name="pageFooter" RelativePanel.AlignLeftWithPanel="True" DefaultLabelPosition="Right" RelativePanel.AlignRightWithPanel="True" RelativePanel.AlignBottomWithPanel="True" 
-                             EllipsisVisibility="Collapsed" IsOpen="True" Height="40">
-            <AppBarButton x:Name="LatLongUTM" Label="" x:Uid="MapPageLatLongUTM" ToolTipService.ToolTip="" MaxWidth="100" Height="70" IsCompact ="True" VerticalAlignment="Top" Foreground="White" Icon="Read">
+        <Controls:PageHeader x:Name="pageFooter" IsSticky="True" RelativePanel.AlignLeftWithPanel="True" DefaultLabelPosition="Bottom" RelativePanel.AlignRightWithPanel="True" RelativePanel.AlignBottomWithPanel="True" 
+                             IsOpen="False" >
+            <AppBarButton x:Name="LatLongUTM" Label="" x:Uid="MapPageLatLongUTM" ToolTipService.ToolTip=""  VerticalAlignment="Top" Foreground="White" Icon="Read">
                 <AppBarButton.Flyout>
                     <MenuFlyout>
                         <MenuFlyoutItem Text="" Click="LatLongDMSButtonClicked" x:Uid="MapPageLatLongDMSButton"/>
@@ -85,8 +85,8 @@
                     </MenuFlyout>
                 </AppBarButton.Flyout>
             </AppBarButton>
-            <AppBarButton Foreground="White" Icon="OpenFile" MaxWidth="120" Height="55" IsCompact ="True" VerticalAlignment="Top" x:Uid="MapPageAddMaps" x:Name="MapPageAddMap" Tapped="MapPageAddMap_Tapped" ToolTipService.ToolTip=""/>
-            <AppBarButton x:Name="AddMaps" Label="" x:Uid="MapPageMapMenu" Foreground="White" MaxWidth="100" Height="50" IsCompact ="True" VerticalAlignment="Top" ToolTipService.ToolTip="" Style="{StaticResource AppBarHiddenChevron}">
+            <AppBarButton Foreground="White" Icon="OpenFile"    x:Uid="MapPageAddMaps" x:Name="MapPageAddMap" Tapped="MapPageAddMap_Tapped" ToolTipService.ToolTip=""/>
+            <AppBarButton x:Name="AddMaps" Label="" x:Uid="MapPageMapMenu" Foreground="White"   VerticalAlignment="Top" ToolTipService.ToolTip="" Style="{StaticResource AppBarHiddenChevron}">
                     <AppBarButton.Icon>
                     <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE81E;"/>
                 </AppBarButton.Icon>
@@ -108,8 +108,8 @@
 
                 </AppBarButton.Flyout>
             </AppBarButton>
-            <AppBarButton x:Name="MapInfo" Label="" x:Uid="MapPageDisplayInfo" ToolTipService.ToolTip="" MaxWidth="100" Height="70" IsCompact ="True" VerticalAlignment="Top" Foreground="White" Icon="ViewAll" Click="MapInfoButtonClicked"/>
-            <AppBarButton x:Name="GPSMode" Label="" x:Uid="MapPageGPSModes" ToolTipService.ToolTip="" Foreground="White" MaxWidth="120" Height="65" IsCompact ="True" VerticalAlignment="Top" Tapped="GPSMode_TappedAsync" >
+            <AppBarButton x:Name="MapInfo" Label="" x:Uid="MapPageDisplayInfo" ToolTipService.ToolTip=""   Foreground="White" Icon="ViewAll" Click="MapInfoButtonClicked"/>
+            <AppBarButton x:Name="GPSMode" Label="" x:Uid="MapPageGPSModes" ToolTipService.ToolTip="" Foreground="White"  VerticalAlignment="Top" Tapped="GPSMode_TappedAsync" >
                 <AppBarButton.Icon>
                     <SymbolIcon Symbol="{x:Bind MapPageViewModel.GPSModeSymbol, Mode=TwoWay}" x:Name="GPSModeIcon"/>
                 </AppBarButton.Icon>
@@ -122,7 +122,7 @@
                     </Flyout>
                 </AppBarButton.Flyout>-->
             </AppBarButton>
-            <AppBarButton x:Name="MapRecenter" x:Uid="MapPageCenter" Label="Recenter" ToolTipService.ToolTip="" Icon="MapPin" Foreground="White" MaxWidth="120" Height="65" IsCompact ="True" VerticalAlignment="Top" Tapped="{x:Bind MapPageViewModel.MapRecenter_Tapped}">
+            <AppBarButton x:Name="MapRecenter" x:Uid="MapPageCenter" Label="Recenter" ToolTipService.ToolTip="" Icon="MapPin" Foreground="White"  Tapped="{x:Bind MapPageViewModel.MapRecenter_Tapped}">
 
 
             </AppBarButton>
diff --git a/GSCFieldApp/Views/MineralDialog.xaml b/GSCFieldApp/Views/MineralDialog.xaml
index 9b91c5f7..c43cc1a3 100644
--- a/GSCFieldApp/Views/MineralDialog.xaml
+++ b/GSCFieldApp/Views/MineralDialog.xaml
@@ -33,10 +33,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldMineralColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="mineralBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="mineralBackButton_Tapped"  />
-                    <AppBarButton x:Name="mineralSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="mineralSaveButton_Tapped"  />
+                    <AppBarButton x:Name="mineralBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="mineralBackButton_Tapped"  />
+                    <AppBarButton x:Name="mineralSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="mineralSaveButton_Tapped"  />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/MineralizationAlterationDialog.xaml b/GSCFieldApp/Views/MineralizationAlterationDialog.xaml
index 82eeda54..f2439ce3 100644
--- a/GSCFieldApp/Views/MineralizationAlterationDialog.xaml
+++ b/GSCFieldApp/Views/MineralizationAlterationDialog.xaml
@@ -31,10 +31,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldMineralAlterationColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right">
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="mineralAltBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="mineralAltBackButton_Tapped"  />
-                    <AppBarButton x:Name="mineralAltSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="mineralAltSaveButton_Tapped"  />
+                    <AppBarButton x:Name="mineralAltBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="mineralAltBackButton_Tapped"  />
+                    <AppBarButton x:Name="mineralAltSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="mineralAltSaveButton_Tapped"  />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/PaleoflowDialog.xaml b/GSCFieldApp/Views/PaleoflowDialog.xaml
index e406c46d..9aaafe9f 100644
--- a/GSCFieldApp/Views/PaleoflowDialog.xaml
+++ b/GSCFieldApp/Views/PaleoflowDialog.xaml
@@ -14,12 +14,11 @@
                             RelativePanel.AlignLeftWithPanel="True" 
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            DefaultLabelPosition="Right"
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" 
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right" 
                                  Background="{ThemeResource FieldPflowColorBrush}">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="pflowBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="pflowBackButton_Tapped" />
-                    <AppBarButton x:Name="pflowSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="pflowSaveButton_Tapped" />
+                    <AppBarButton x:Name="pflowBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="pflowBackButton_Tapped" />
+                    <AppBarButton x:Name="pflowSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="pflowSaveButton_Tapped" />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/PicklistDialog.xaml b/GSCFieldApp/Views/PicklistDialog.xaml
index 1b2e6a35..28af8f19 100644
--- a/GSCFieldApp/Views/PicklistDialog.xaml
+++ b/GSCFieldApp/Views/PicklistDialog.xaml
@@ -39,10 +39,10 @@
                             RelativePanel.AlignLeftWithPanel="True" 
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right"  >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right" >
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="picklistBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="picklistBackButton_TappedAsync" />
-                    <AppBarButton x:Name="picklistSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="PicklistSaveButton_TappedAsync" />
+                    <AppBarButton x:Name="picklistBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="picklistBackButton_TappedAsync" />
+                    <AppBarButton x:Name="picklistSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="PicklistSaveButton_TappedAsync" />
                 </Controls:PageHeader.PrimaryCommands>
 
                 <!--  secondary commands  -->
diff --git a/GSCFieldApp/Views/SampleDialog.xaml b/GSCFieldApp/Views/SampleDialog.xaml
index 93432529..7cffd8c5 100644
--- a/GSCFieldApp/Views/SampleDialog.xaml
+++ b/GSCFieldApp/Views/SampleDialog.xaml
@@ -32,10 +32,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldSampleColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="sampleBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="sampleBackButton_Tapped" />
-                    <AppBarButton x:Name="sampleSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="sampleSaveButton_Tapped" />
+                    <AppBarButton x:Name="sampleBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="sampleBackButton_Tapped" />
+                    <AppBarButton x:Name="sampleSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="sampleSaveButton_Tapped" />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>
diff --git a/GSCFieldApp/Views/StationDialog.xaml b/GSCFieldApp/Views/StationDialog.xaml
index 39f23163..a2b998a1 100644
--- a/GSCFieldApp/Views/StationDialog.xaml
+++ b/GSCFieldApp/Views/StationDialog.xaml
@@ -34,11 +34,11 @@
             <Controls:PageHeader x:Name="pageHeader" x:Uid="FieldworkTableStation" Text ="" BackButtonVisibility="Collapsed"
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldStationColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
-                            RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right">
+                            RelativePanel.AlignTopWithPanel="True"
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="stationBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Height="57" IsCompact ="True" Foreground="White" Tapped="stationBackButton_Tapped" Width="Auto"/>
-                    <AppBarButton x:Name="stationSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Height="57" IsCompact ="True" Foreground="White" Tapped="stationSaveButton_Tapped" Width="Auto"/>
+                    <AppBarButton x:Name="stationBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="stationBackButton_Tapped" />
+                    <AppBarButton x:Name="stationSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save"  Foreground="White" Tapped="stationSaveButton_Tapped" />
                 </Controls:PageHeader.PrimaryCommands>
 
                 <Controls:PageHeader.SecondaryCommands>
diff --git a/GSCFieldApp/Views/StructureDialog.xaml b/GSCFieldApp/Views/StructureDialog.xaml
index d17e2b59..f90bc3bc 100644
--- a/GSCFieldApp/Views/StructureDialog.xaml
+++ b/GSCFieldApp/Views/StructureDialog.xaml
@@ -19,11 +19,11 @@
                             RelativePanel.AlignLeftWithPanel="True" 
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right"
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right"
                                  Background="{ThemeResource FieldStructureColorBrush}">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="structBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="structBackButton_Tapped" />
-                    <AppBarButton x:Name="structSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="structSaveButton_Tapped" />
+                    <AppBarButton x:Name="structBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="structBackButton_Tapped" />
+                    <AppBarButton x:Name="structSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="structSaveButton_Tapped" />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>