diff --git a/src/Calculator.Droid/Properties/AndroidManifest.xml b/src/Calculator.Droid/Properties/AndroidManifest.xml
index 83c5e994..0a1de5e7 100644
--- a/src/Calculator.Droid/Properties/AndroidManifest.xml
+++ b/src/Calculator.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="uno.platform.calculator" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
 	<uses-sdk android:targetSdkVersion="28" />
-	<application android:label="Calculator" android:theme="@style/AppTheme" android:icon="@mipmap/ic_launcher" android:roundIcon="@drawable/ic_launcher_round"></application>
-</manifest>
+	<application android:label="Uno Calc" android:theme="@style/AppTheme" android:icon="@mipmap/ic_launcher" android:roundIcon="@drawable/ic_launcher_round"></application>
+</manifest>
\ No newline at end of file
diff --git a/src/Calculator.Droid/Resources/values/Strings.xml b/src/Calculator.Droid/Resources/values/Strings.xml
index fc2eed15..1504dce7 100644
--- a/src/Calculator.Droid/Resources/values/Strings.xml
+++ b/src/Calculator.Droid/Resources/values/Strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="Hello">Hello World, Click Me!</string>
-    <string name="ApplicationName">Calculator</string>
+    <string name="ApplicationName">Uno Calc</string>
 </resources>
diff --git a/src/Calculator.Shared/Views/DateCalculator.xaml b/src/Calculator.Shared/Views/DateCalculator.xaml
index 83f8822a..95b5e48b 100644
--- a/src/Calculator.Shared/Views/DateCalculator.xaml
+++ b/src/Calculator.Shared/Views/DateCalculator.xaml
@@ -1,13 +1,13 @@
 <UserControl x:Class="CalculatorApp.DateCalculator"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="using:CalculatorApp.Controls"
-             xmlns:converters="using:CalculatorApp.Converters"
-             xmlns:local="using:CalculatorApp.Views"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:controls="using:CalculatorApp.Controls"
+			 xmlns:converters="using:CalculatorApp.Converters"
+			 xmlns:local="using:CalculatorApp.Views"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 Loaded="OnLoaded"
-             mc:Ignorable="">
-    
+			 mc:Ignorable="">
+
 	<UserControl.Resources>
 		<converters:BooleanNegationConverter x:Key="BooleanNegationConverter" />
 		<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -15,53 +15,53 @@
 
 		<DataTemplate x:Key="ComboBoxItemContentTemplate">
 			<TextBlock Text="{Binding}"
-								 TextWrapping="WrapWholeWords" />
+					   TextWrapping="WrapWholeWords" />
 		</DataTemplate>
 
 		<Style x:Key="DateCalculation_ComboStyle"
-					 TargetType="ComboBox">
-			
+			   TargetType="ComboBox">
+
 			<Setter Property="Padding"
-							Value="0,0,0,0" />
+					Value="0,0,0,0" />
 			<Setter Property="MinHeight"
-							Value="20" />
+					Value="20" />
 			<Setter Property="Foreground"
-							Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+					Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
 			<Setter Property="Background"
-							Value="{ThemeResource SystemControlBackgroundTransparentBrush}" />
+					Value="{ThemeResource SystemControlBackgroundTransparentBrush}" />
 			<Setter Property="BorderBrush"
-							Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" />
+					Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" />
 			<Setter Property="BorderThickness"
-							Value="0" />
+					Value="0" />
 			<Setter Property="TabNavigation"
-							Value="Once" />
+					Value="Once" />
 			<Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-							Value="Disabled" />
+					Value="Disabled" />
 			<Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-							Value="Auto" />
+					Value="Auto" />
 			<Setter Property="ScrollViewer.HorizontalScrollMode"
-							Value="Disabled" />
+					Value="Disabled" />
 			<Setter Property="ScrollViewer.VerticalScrollMode"
-							Value="Auto" />
+					Value="Auto" />
 			<Setter Property="ScrollViewer.IsVerticalRailEnabled"
-							Value="True" />
+					Value="True" />
 			<Setter Property="ScrollViewer.IsDeferredScrollingEnabled"
-							Value="False" />
+					Value="False" />
 			<Setter Property="ScrollViewer.BringIntoViewOnFocusChange"
-							Value="True" />
+					Value="True" />
 			<Setter Property="HorizontalContentAlignment"
-							Value="Left" />
+					Value="Left" />
 			<Setter Property="HorizontalAlignment"
-							Value="Left" />
+					Value="Left" />
 			<Setter Property="VerticalAlignment"
-							Value="Top" />
+					Value="Top" />
 			<Setter Property="VerticalContentAlignment"
-							Value="Center" />
+					Value="Center" />
 			<Setter Property="UseSystemFocusVisuals"
-							Value="True" />
+					Value="True" />
 			<Setter Property="FocusVisualMargin"
-							Value="-5,0,0,0" />
-			
+					Value="-5,0,0,0" />
+
 			<Setter Property="ItemsPanel">
 				<Setter.Value>
 					<ItemsPanelTemplate>
@@ -69,7 +69,7 @@
 					</ItemsPanelTemplate>
 				</Setter.Value>
 			</Setter>
-			
+
 			<Setter Property="Template">
 				<Setter.Value>
 					<ControlTemplate TargetType="ComboBox">
@@ -84,21 +84,21 @@
 									<VisualState x:Name="PointerOver">
 										<VisualState.Setters>
 											<Setter Target="BackgroundElement.Background"
-															Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+													Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
 											<Setter Target="SelectedContentPresenter.Foreground"
-															Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
 											<Setter Target="DropDownGlyph.Fill"
-															Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState x:Name="Pressed">
 										<VisualState.Setters>
 											<Setter Target="BackgroundElement.Background"
-															Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+													Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
 											<Setter Target="SelectedContentPresenter.Foreground"
-															Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
 											<Setter Target="DropDownGlyph.Fill"
-															Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState x:Name="Disabled" />
@@ -107,82 +107,82 @@
 									<VisualState x:Name="Opened">
 										<Storyboard>
 											<SplitOpenThemeAnimation ClosedTargetName="SelectedContentPresenter"
-																							 OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
-																							 OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}"
-																							 OpenedTargetName="PopupBorder" />
+																	 OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
+																	 OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}"
+																	 OpenedTargetName="PopupBorder" />
 										</Storyboard>
 									</VisualState>
 									<VisualState x:Name="Closed">
 										<Storyboard>
 											<SplitCloseThemeAnimation ClosedTargetName="SelectedContentPresenter"
-																								OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
-																								OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}"
-																								OpenedTargetName="PopupBorder" />
+																	  OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
+																	  OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}"
+																	  OpenedTargetName="PopupBorder" />
 										</Storyboard>
 									</VisualState>
 								</VisualStateGroup>
 							</VisualStateManager.VisualStateGroups>
-							
+
 							<ContentPresenter x:Name="ContentPresenter"
-																Opacity="0" />
-							
+											  Opacity="0" />
+
 							<Popup x:Name="Popup">
-								
+
 								<Border x:Name="PopupBorder"
-												Margin="0,-1,0,-1"
-												HorizontalAlignment="Stretch"
-												Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"
-												BorderBrush="{ThemeResource SystemControlForegroundChromeHighBrush}"
-												BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}">
-									
+										Margin="0,-1,0,-1"
+										HorizontalAlignment="Stretch"
+										Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"
+										BorderBrush="{ThemeResource SystemControlForegroundChromeHighBrush}"
+										BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}">
+
 									<ScrollViewer x:Name="ScrollViewer"
-																MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownContentMinWidth}"
-																Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-																AutomationProperties.AccessibilityView="Raw"
-																BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
-																HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-																HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-																IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-																IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
-																IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
-																VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-																VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-																VerticalSnapPointsAlignment="Near"
-																VerticalSnapPointsType="OptionalSingle"
-																ZoomMode="Disabled">
+												  MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownContentMinWidth}"
+												  Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
+												  AutomationProperties.AccessibilityView="Raw"
+												  BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
+												  HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+												  HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+												  IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+												  IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+												  IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+												  VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+												  VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+												  VerticalSnapPointsAlignment="Near"
+												  VerticalSnapPointsType="OptionalSingle"
+												  ZoomMode="Disabled">
 										<ItemsPresenter />
 									</ScrollViewer>
 								</Border>
 							</Popup>
-							
+
 							<Border x:Name="BackgroundElement"
-											Grid.ColumnSpan="2"
-											Background="{TemplateBinding Background}"
-											BorderBrush="{TemplateBinding BorderBrush}"
-											BorderThickness="{TemplateBinding BorderThickness}" />
-							
+									Grid.ColumnSpan="2"
+									Background="{TemplateBinding Background}"
+									BorderBrush="{TemplateBinding BorderBrush}"
+									BorderThickness="{TemplateBinding BorderThickness}" />
+
 							<TextBlock x:Name="SelectedContentPresenter"
-												 Margin="{TemplateBinding Padding}"
-												 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-												 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-												 Style="{ThemeResource BodyTextBlockStyle}"
-												 FontWeight="SemiBold"
-												 AutomationProperties.AccessibilityView="Raw"
-												 FlowDirection="{TemplateBinding FlowDirection}"
-												 Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedValue.Content}"
-												 TextWrapping="WrapWholeWords" />
-							
+									   Margin="{TemplateBinding Padding}"
+									   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+									   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+									   Style="{ThemeResource BodyTextBlockStyle}"
+									   FontWeight="SemiBold"
+									   AutomationProperties.AccessibilityView="Raw"
+									   FlowDirection="{TemplateBinding FlowDirection}"
+									   Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedValue.Content}"
+									   TextWrapping="WrapWholeWords" />
+
 							<TextBlock x:Name="DropDownGlyph"
-												 Grid.Column="1"
-												 Margin="8,3,12,0"
-												 HorizontalAlignment="Left"
-												 VerticalAlignment="Center"
-												 Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-												 FontFamily="{ThemeResource SymbolThemeFontFamily}"
-												 FontSize="12"
-												 AutomationProperties.AccessibilityView="Raw"
-												 IsHitTestVisible="False"
-												 Text="&#xE0E5;" />
+									   Grid.Column="1"
+									   Margin="8,3,12,0"
+									   HorizontalAlignment="Left"
+									   VerticalAlignment="Center"
+									   Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
+									   FontFamily="{ThemeResource SymbolThemeFontFamily}"
+									   FontSize="12"
+									   AutomationProperties.AccessibilityView="Raw"
+									   IsHitTestVisible="False"
+									   Text="&#xE0E5;" />
 						</Grid>
 					</ControlTemplate>
 				</Setter.Value>
@@ -190,25 +190,25 @@
 		</Style>
 
 		<Style x:Key="DateCalculation_CalendarPickerStyle"
-					 TargetType="CalendarDatePicker">
-			
+			   TargetType="CalendarDatePicker">
+
 			<Setter Property="Foreground"
-							Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+					Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
 			<Setter Property="Background"
-							Value="{ThemeResource SystemControlBackgroundTransparentBrush}" />
+					Value="{ThemeResource SystemControlBackgroundTransparentBrush}" />
 			<Setter Property="BorderBrush"
-							Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" />
+					Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" />
 			<Setter Property="BorderThickness"
-							Value="{ThemeResource CalendarDatePickerBorderThemeThickness}" />
+					Value="{ThemeResource CalendarDatePickerBorderThemeThickness}" />
 			<Setter Property="HorizontalAlignment"
-							Value="Left" />
+					Value="Left" />
 			<Setter Property="VerticalAlignment"
-							Value="Center" />
+					Value="Center" />
 			<Setter Property="UseSystemFocusVisuals"
-							Value="True" />
+					Value="True" />
 			<Setter Property="FocusVisualMargin"
-							Value="-5,0,0,0" />
-			
+					Value="-5,0,0,0" />
+
 			<Setter Property="Template">
 				<Setter.Value>
 					<ControlTemplate TargetType="CalendarDatePicker">
@@ -226,52 +226,52 @@
 									<VisualState x:Name="Normal">
 										<VisualState.Setters>
 											<Setter Target="DateText.Foreground"
-															Value="{ThemeResource SystemControlForegroundBaseMediumHighBrush}" />
+													Value="{ThemeResource SystemControlForegroundBaseMediumHighBrush}" />
 											<Setter Target="CalendarGlyph.Foreground"
-															Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+													Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState x:Name="PointerOver">
 										<VisualState.Setters>
 											<Setter Target="BorderElement.Background"
-															Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+													Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
 											<Setter Target="DateText.Foreground"
-															Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
 											<Setter Target="CalendarGlyph.Foreground"
-															Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState x:Name="Pressed">
 										<VisualState.Setters>
 											<Setter Target="BorderElement.Background"
-															Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+													Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
 											<Setter Target="DateText.Foreground"
-															Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
 											<Setter Target="CalendarGlyph.Foreground"
-															Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState x:Name="Disabled" />
 								</VisualStateGroup>
 							</VisualStateManager.VisualStateGroups>
-							
+
 							<FlyoutBase.AttachedFlyout>
-								
+
 								<Flyout Placement="Full">
-									
+
 									<Flyout.FlyoutPresenterStyle>
-										
+
 										<Style TargetType="FlyoutPresenter">
-											
+
 											<Setter Property="MaxHeight"
-															Value="9000" />
+													Value="9000" />
 											<Setter Property="MaxWidth"
-															Value="9000" />
+													Value="9000" />
 											<Setter Property="Padding"
-															Value="0" />
+													Value="0" />
 											<Setter Property="BorderThickness"
-															Value="0" />
-											
+													Value="0" />
+
 											<Setter Property="Template">
 												<Setter.Value>
 													<ControlTemplate TargetType="FlyoutPresenter">
@@ -283,11 +283,11 @@
 															</Grid.RowDefinitions>
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition x:Name="LeftGutter"
-																									Width="0" />
+																				  Width="0" />
 																<ColumnDefinition x:Name="C0"
-																									Width="*" />
+																				  Width="*" />
 																<ColumnDefinition x:Name="RightGutter"
-																									Width="0" />
+																				  Width="0" />
 															</Grid.ColumnDefinitions>
 															<VisualStateManager.VisualStateGroups>
 																<VisualStateGroup>
@@ -297,11 +297,11 @@
 																		</VisualState.StateTriggers>
 																		<VisualState.Setters>
 																			<Setter Target="LeftGutter.Width"
-																							Value="12" />
+																					Value="12" />
 																			<Setter Target="RightGutter.Width"
-																							Value="*" />
+																					Value="*" />
 																			<Setter Target="C0.Width"
-																							Value="336" />
+																					Value="336" />
 																		</VisualState.Setters>
 																	</VisualState>
 																	<VisualState x:Name="DefaultLayout">
@@ -311,70 +311,70 @@
 																	</VisualState>
 																</VisualStateGroup>
 															</VisualStateManager.VisualStateGroups>
-															
+
 															<ContentPresenter Grid.Row="1"
-																								Grid.Column="1"
-																								Margin="0,0,0,0"
-																								HorizontalAlignment="Stretch"
-																								VerticalAlignment="Top"
-																								Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"
-																								BorderBrush="{ThemeResource SystemControlForegroundChromeHighBrush}"
-																								BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}"
-																								Content="{TemplateBinding Content}"
-																								ContentTemplate="{TemplateBinding ContentTemplate}"
-																								ContentTransitions="{TemplateBinding ContentTransitions}" />
+																			  Grid.Column="1"
+																			  Margin="0,0,0,0"
+																			  HorizontalAlignment="Stretch"
+																			  VerticalAlignment="Top"
+																			  Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"
+																			  BorderBrush="{ThemeResource SystemControlForegroundChromeHighBrush}"
+																			  BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}"
+																			  Content="{TemplateBinding Content}"
+																			  ContentTemplate="{TemplateBinding ContentTemplate}"
+																			  ContentTransitions="{TemplateBinding ContentTransitions}" />
 														</Grid>
 													</ControlTemplate>
 												</Setter.Value>
 											</Setter>
 										</Style>
 									</Flyout.FlyoutPresenterStyle>
-									
+
 									<CalendarView x:Name="CalendarView"
-																Style="{TemplateBinding CalendarViewStyle}"
-																CalendarIdentifier="{TemplateBinding CalendarIdentifier}"
-																DayOfWeekFormat="{TemplateBinding DayOfWeekFormat}"
-																DisplayMode="{TemplateBinding DisplayMode}"
-																FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
-																IsGroupLabelVisible="{TemplateBinding IsGroupLabelVisible}"
-																IsOutOfScopeEnabled="{TemplateBinding IsOutOfScopeEnabled}"
-																IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-																MaxDate="{TemplateBinding MaxDate}"
-																MinDate="{TemplateBinding MinDate}" />
+												  Style="{TemplateBinding CalendarViewStyle}"
+												  CalendarIdentifier="{TemplateBinding CalendarIdentifier}"
+												  DayOfWeekFormat="{TemplateBinding DayOfWeekFormat}"
+												  DisplayMode="{TemplateBinding DisplayMode}"
+												  FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+												  IsGroupLabelVisible="{TemplateBinding IsGroupLabelVisible}"
+												  IsOutOfScopeEnabled="{TemplateBinding IsOutOfScopeEnabled}"
+												  IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+												  MaxDate="{TemplateBinding MaxDate}"
+												  MinDate="{TemplateBinding MinDate}" />
 								</Flyout>
 							</FlyoutBase.AttachedFlyout>
-							
+
 							<ContentPresenter x:Name="HeaderContentPresenter"
-																Margin="{ThemeResource ComboBoxHeaderThemeMargin}"
-																x:DeferLoadStrategy="Lazy"
-																Content="{TemplateBinding Header}"
-																ContentTemplate="{TemplateBinding HeaderTemplate}"
-																Visibility="Collapsed" />
-							
+											  Margin="{ThemeResource ComboBoxHeaderThemeMargin}"
+											  x:DeferLoadStrategy="Lazy"
+											  Content="{TemplateBinding Header}"
+											  ContentTemplate="{TemplateBinding HeaderTemplate}"
+											  Visibility="Collapsed" />
+
 							<Border x:Name="BorderElement"
-											Grid.Row="1"
-											Grid.ColumnSpan="2"
-											Background="{TemplateBinding Background}"
-											BorderThickness="0" />
-							
+									Grid.Row="1"
+									Grid.ColumnSpan="2"
+									Background="{TemplateBinding Background}"
+									BorderThickness="0" />
+
 							<TextBlock x:Name="DateText"
-												 Grid.Row="1"
-												 Padding="0,0,0,2"
-												 HorizontalAlignment="Right"
-												 VerticalAlignment="Center"
-												 Style="{ThemeResource BaseTextBlockStyle}"
-												 Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
-												 Text="{TemplateBinding PlaceholderText}" />
-							
+									   Grid.Row="1"
+									   Padding="0,0,0,2"
+									   HorizontalAlignment="Right"
+									   VerticalAlignment="Center"
+									   Style="{ThemeResource BaseTextBlockStyle}"
+									   Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
+									   Text="{TemplateBinding PlaceholderText}" />
+
 							<FontIcon x:Name="CalendarGlyph"
-												Grid.Row="1"
-												Grid.Column="1"
-												HorizontalAlignment="Center"
-												VerticalAlignment="Center"
-												Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-												FontFamily="{ThemeResource SymbolThemeFontFamily}"
-												FontSize="16"
-												Glyph="&#xE787;" />
+									  Grid.Row="1"
+									  Grid.Column="1"
+									  HorizontalAlignment="Center"
+									  VerticalAlignment="Center"
+									  Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
+									  FontFamily="{ThemeResource SymbolThemeFontFamily}"
+									  FontSize="16"
+									  Glyph="&#xE787;" />
 						</Grid>
 					</ControlTemplate>
 				</Setter.Value>
@@ -382,62 +382,62 @@
 		</Style>
 
 		<Style x:Key="DateCalculation_CalendarViewStyle"
-					 TargetType="CalendarView">
-			
+			   TargetType="CalendarView">
+
 			<Setter Property="FocusBorderBrush"
-							Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+					Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
 			<Setter Property="SelectedHoverBorderBrush"
-							Value="{ThemeResource SystemControlHighlightListAccentMediumBrush}" />
+					Value="{ThemeResource SystemControlHighlightListAccentMediumBrush}" />
 			<Setter Property="SelectedPressedBorderBrush"
-							Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+					Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
 			<Setter Property="SelectedBorderBrush"
-							Value="{ThemeResource SystemControlHighlightAccentBrush}" />
+					Value="{ThemeResource SystemControlHighlightAccentBrush}" />
 			<Setter Property="HoverBorderBrush"
-							Value="{ThemeResource SystemControlHighlightBaseMediumLowBrush}" />
+					Value="{ThemeResource SystemControlHighlightBaseMediumLowBrush}" />
 			<Setter Property="PressedBorderBrush"
-							Value="{ThemeResource SystemControlHighlightBaseMediumBrush}" />
+					Value="{ThemeResource SystemControlHighlightBaseMediumBrush}" />
 			<Setter Property="TodayForeground"
-							Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
+					Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
 			<Setter Property="BlackoutForeground"
-							Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
+					Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
 			<Setter Property="SelectedForeground"
-							Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
+					Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
 			<Setter Property="PressedForeground"
-							Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
+					Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
 			<Setter Property="OutOfScopeForeground"
-							Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" />
+					Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" />
 			<Setter Property="CalendarItemForeground"
-							Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+					Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
 			<Setter Property="OutOfScopeBackground"
-							Value="Transparent" />
+					Value="Transparent" />
 			<Setter Property="CalendarItemBackground"
-							Value="Transparent" />
+					Value="Transparent" />
 			<Setter Property="CalendarItemBorderBrush"
-							Value="Transparent" />
+					Value="Transparent" />
 			<Setter Property="Foreground"
-							Value="{ThemeResource SystemControlHyperlinkBaseMediumHighBrush}" />
+					Value="{ThemeResource SystemControlHyperlinkBaseMediumHighBrush}" />
 			<Setter Property="Background"
-							Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
+					Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
 			<Setter Property="BorderBrush"
-							Value="Transparent" />
+					Value="Transparent" />
 			<Setter Property="CalendarItemBorderThickness"
-							Value="2" />
+					Value="2" />
 			<Setter Property="BorderThickness"
-							Value="0" />
+					Value="0" />
 			<Setter Property="DayItemFontSize"
-							Value="18" />
+					Value="18" />
 			<Setter Property="HorizontalAlignment"
-							Value="Stretch" />
+					Value="Stretch" />
 			<Setter Property="VerticalAlignment"
-							Value="Center" />
+					Value="Center" />
 			<Setter Property="HorizontalContentAlignment"
-							Value="Stretch" />
+					Value="Stretch" />
 			<Setter Property="VerticalContentAlignment"
-							Value="Stretch" />
+					Value="Stretch" />
 			<Setter Property="Margin"
-							Value="0,12,0,12" />
+					Value="0,12,0,12" />
 			<Setter Property="IsTabStop"
-							Value="False" />
+					Value="False" />
 		</Style>
 
 		<!--TODO UNO <MenuFlyout x:Key="ResultsContextMenu"
@@ -450,20 +450,20 @@
 	</UserControl.Resources>
 
 	<Grid x:Name="DateCalculatorGrid"
-				Margin="12,0,12,0"
-				AutomationProperties.LandmarkType="Main">
+		  Margin="12,0,12,0"
+		  AutomationProperties.LandmarkType="Main">
 
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition x:Name="C0"
-												Width="*" />
+							  Width="*" />
 			<ColumnDefinition x:Name="C1"
-												Width="0" />
+							  Width="0" />
 		</Grid.ColumnDefinitions>
 
 		<Grid.RowDefinitions>
 			<RowDefinition Height="1*"
-										 MinHeight="{StaticResource HamburgerHeight}"
-										 MaxHeight="52" />
+						   MinHeight="{StaticResource HamburgerHeight}"
+						   MaxHeight="52" />
 			<RowDefinition Height="Auto" />
 			<RowDefinition Height="8*" />
 		</Grid.RowDefinitions>
@@ -476,13 +476,13 @@
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="C0.Width"
-										Value="456" />
+								Value="456" />
 						<Setter Target="C1.Width"
-										Value="*" />
+								Value="*" />
 						<Setter Target="DateDiffAllUnitsResultLabel.FontSize"
-										Value="24" />
+								Value="24" />
 						<Setter Target="DateResultLabel.FontSize"
-										Value="24" />
+								Value="24" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="DefaultLayout">
@@ -491,9 +491,9 @@
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="DateDiffAllUnitsResultLabel.FontSize"
-										Value="20" />
+								Value="20" />
 						<Setter Target="DateResultLabel.FontSize"
-										Value="20" />
+								Value="20" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
@@ -501,124 +501,124 @@
 
 		<!-- ComboBox for Date Calculation options -->
 		<ComboBox x:Name="DateCalculationOption"
-							x:Uid="DateCalculationOption"
-							Grid.Row="1"
-							Style="{ThemeResource DateCalculation_ComboStyle}"
-							SelectedIndex="0">
+				  x:Uid="DateCalculationOption"
+				  Grid.Row="1"
+				  Style="{ThemeResource DateCalculation_ComboStyle}"
+				  SelectedIndex="0">
 
 			<ComboBoxItem x:Uid="Date_DifferenceOption"
-										MinWidth="276"
-										ContentTemplate="{StaticResource ComboBoxItemContentTemplate}"
-										IsSelected="{Binding IsDateDiffMode, Mode=TwoWay}" />
+						  MinWidth="276"
+						  ContentTemplate="{StaticResource ComboBoxItemContentTemplate}"
+						  IsSelected="{Binding IsDateDiffMode, Mode=TwoWay}" />
 
 			<ComboBoxItem x:Uid="Date_AddSubtractOption"
-										MinWidth="276"
-										ContentTemplate="{StaticResource ComboBoxItemContentTemplate}"
-										IsSelected="{Binding IsDateDiffMode, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}" />
+						  MinWidth="276"
+						  ContentTemplate="{StaticResource ComboBoxItemContentTemplate}"
+						  IsSelected="{Binding IsDateDiffMode, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}" />
 		</ComboBox>
 
 		<!-- Grid to Calculate Difference between Two Dates -->
 		<Grid x:Name="DateDiffGrid"
-					Grid.Row="2"
-					Visibility="{Binding IsDateDiffMode, Converter={StaticResource BooleanToVisibilityConverter}}">
+			  Grid.Row="2"
+			  Visibility="{Binding IsDateDiffMode, Converter={StaticResource BooleanToVisibilityConverter}}">
 
 			<Grid.RowDefinitions>
 				<RowDefinition Height="1*"
-											 MaxHeight="17" />
+							   MaxHeight="17" />
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="Auto"
-											 MinHeight="32" />
+							   MinHeight="32" />
 				<RowDefinition Height="1*"
-											 MaxHeight="24" />
+							   MaxHeight="24" />
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="Auto"
-											 MinHeight="32" />
+							   MinHeight="32" />
 				<RowDefinition Height="1*"
-											 MaxHeight="24" />
+							   MaxHeight="24" />
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="1*"
-											 MaxHeight="8" />
+							   MaxHeight="8" />
 				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
 
 			<!-- From Date -->
 			<TextBlock x:Name="Date_FromLabel"
-								 x:Uid="Date_FromLabel"
-								 Grid.Row="1"
-								 Margin="0,0,0,2"
-								 Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
-								 TextWrapping="Wrap" />
+					   x:Uid="Date_FromLabel"
+					   Grid.Row="1"
+					   Margin="0,0,0,2"
+					   Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
+					   TextWrapping="Wrap" />
 
 			<CalendarDatePicker x:Name="DateDiff_FromDate"
-													Grid.Row="2"
-													Style="{StaticResource DateCalculation_CalendarPickerStyle}"
-													AutomationProperties.LabeledBy="{x:Bind Date_FromLabel}"
-													CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}"
-													Closed="CalendarFlyoutClosed"
-													DateChanged="FromDate_DateChanged" />
+								Grid.Row="2"
+								Style="{StaticResource DateCalculation_CalendarPickerStyle}"
+								AutomationProperties.LabeledBy="{x:Bind Date_FromLabel}"
+								CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}"
+								Closed="CalendarFlyoutClosed"
+								DateChanged="FromDate_DateChanged" />
 
 			<!-- To Date -->
 			<TextBlock x:Name="Date_ToLabel"
-								 x:Uid="Date_ToLabel"
-								 Grid.Row="4"
-								 Margin="0,0,0,2"
-								 Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
-								 TextWrapping="Wrap" />
+					   x:Uid="Date_ToLabel"
+					   Grid.Row="4"
+					   Margin="0,0,0,2"
+					   Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
+					   TextWrapping="Wrap" />
 
 			<CalendarDatePicker x:Name="DateDiff_ToDate"
-													Grid.Row="5"
-													Margin="0,0,0,0"
-													Style="{StaticResource DateCalculation_CalendarPickerStyle}"
-													AutomationProperties.LabeledBy="{x:Bind Date_ToLabel}"
-													CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}"
-													Closed="CalendarFlyoutClosed"
-													DateChanged="ToDate_DateChanged" />
+								Grid.Row="5"
+								Margin="0,0,0,0"
+								Style="{StaticResource DateCalculation_CalendarPickerStyle}"
+								AutomationProperties.LabeledBy="{x:Bind Date_ToLabel}"
+								CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}"
+								Closed="CalendarFlyoutClosed"
+								DateChanged="ToDate_DateChanged" />
 
 			<!-- Difference Result -->
 			<TextBlock x:Uid="Date_DifferenceLabel"
-								 Grid.Row="7"
-								 Margin="0,0,0,0"
-								 Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" />
+					   Grid.Row="7"
+					   Margin="0,0,0,0"
+					   Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" />
 
 			<!--TOOD UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
 			<TextBlock x:Name="DateDiffAllUnitsResultLabel"
-								 Grid.Row="8"
-								 Style="{ThemeResource SubtitleTextBlockStyle}"
-								 FontWeight="SemiBold"
-								 AutomationProperties.LiveSetting="Polite"
-								 AutomationProperties.Name="{Binding StrDateDiffResultAutomationName}"
-								 Text="{Binding StrDateDiffResult}" />
+					   Grid.Row="8"
+					   Style="{ThemeResource SubtitleTextBlockStyle}"
+					   FontWeight="SemiBold"
+					   AutomationProperties.LiveSetting="Polite"
+					   AutomationProperties.Name="{Binding StrDateDiffResultAutomationName}"
+					   Text="{Binding StrDateDiffResult}" />
 
 			<!--TODO UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
 			<TextBlock Grid.Row="10"
-								 Style="{ThemeResource BaseTextBlockStyle}"
-								 Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-								 Text="{Binding StrDateDiffResultInDays, Mode=OneWay}"
-								 Visibility="{Binding IsDiffInDays, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
+					   Style="{ThemeResource BaseTextBlockStyle}"
+					   Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
+					   Text="{Binding StrDateDiffResultInDays, Mode=OneWay}"
+					   Visibility="{Binding IsDiffInDays, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
 		</Grid>
 
 		<!-- Grid for Add/Subtract Date -->
 		<Grid x:Name="AddSubtractDateGrid"
-					Grid.Row="2"
-					x:DeferLoadStrategy="Lazy"
-					Loaded="AddSubtractDateGrid_Loaded"
-					Visibility="{Binding IsDateDiffMode, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
+			  Grid.Row="2"
+			  x:DeferLoadStrategy="Lazy"
+			  Loaded="AddSubtractDateGrid_Loaded"
+			  Visibility="{Binding IsDateDiffMode, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
 
 			<Grid.RowDefinitions>
 				<RowDefinition Height="1*"
-											 MaxHeight="17" />
+							   MaxHeight="17" />
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="Auto"
-											 MinHeight="32" />
+							   MinHeight="32" />
 				<RowDefinition Height="1*"
-											 MaxHeight="23" />
+							   MaxHeight="23" />
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="1*"
-											 MaxHeight="29" />
+							   MaxHeight="29" />
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="1*"
-											 MaxHeight="35" />
+							   MaxHeight="35" />
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
@@ -626,21 +626,21 @@
 			<!-- From Date -->
 
 			<TextBlock x:Name="AddSubtract_Date_FromLabel"
-								 x:Uid="Date_FromLabel"
-								 Grid.Row="1"
-								 Margin="0,0,0,2"
-								 Style="{ThemeResource BodyTextBlockStyle}"
-								 Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-								 TextWrapping="Wrap" />
+					   x:Uid="Date_FromLabel"
+					   Grid.Row="1"
+					   Margin="0,0,0,2"
+					   Style="{ThemeResource BodyTextBlockStyle}"
+					   Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
+					   TextWrapping="Wrap" />
 
 			<CalendarDatePicker x:Name="AddSubtract_FromDate"
-													Grid.Row="2"
-													Margin="0,0,0,0"
-													Style="{StaticResource DateCalculation_CalendarPickerStyle}"
-													AutomationProperties.LabeledBy="{x:Bind AddSubtract_Date_FromLabel}"
-													CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}"
-													Closed="CalendarFlyoutClosed"
-													DateChanged="AddSubtract_DateChanged" />
+								Grid.Row="2"
+								Margin="0,0,0,0"
+								Style="{StaticResource DateCalculation_CalendarPickerStyle}"
+								AutomationProperties.LabeledBy="{x:Bind AddSubtract_Date_FromLabel}"
+								CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}"
+								Closed="CalendarFlyoutClosed"
+								DateChanged="AddSubtract_DateChanged" />
 
 			<Grid Grid.Row="4">
 				<Grid.ColumnDefinitions>
@@ -649,29 +649,29 @@
 				</Grid.ColumnDefinitions>
 
 				<RadioButton x:Name="AddOption"
-										 x:Uid="AddOption"
-										 MinWidth="80"
-										 MaxWidth="160"
-										 VerticalAlignment="Top"
-										 Checked="AddSubtractOption_Checked"
-										 IsChecked="{Binding IsAddMode, Mode=TwoWay}" />
+							 x:Uid="AddOption"
+							 MinWidth="80"
+							 MaxWidth="160"
+							 VerticalAlignment="Top"
+							 Checked="AddSubtractOption_Checked"
+							 IsChecked="{Binding IsAddMode, Mode=TwoWay}" />
 
 				<RadioButton x:Name="SubtractOption"
-										 x:Uid="SubtractOption"
-										 Grid.Column="1"
-										 MinWidth="80"
-										 MaxWidth="160"
-										 Margin="20,0,0,0"
-										 VerticalAlignment="Top"
-										 Checked="AddSubtractOption_Checked"
-										 IsChecked="{Binding IsAddMode, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}" />
+							 x:Uid="SubtractOption"
+							 Grid.Column="1"
+							 MinWidth="80"
+							 MaxWidth="160"
+							 Margin="20,0,0,0"
+							 VerticalAlignment="Top"
+							 Checked="AddSubtractOption_Checked"
+							 IsChecked="{Binding IsAddMode, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}" />
 
 			</Grid>
 
 			<!-- Date Offset to be Added/Subtracted -->
 
 			<Grid x:Name="DateOffsetGrid"
-						Grid.Row="6">
+				  Grid.Row="6">
 
 				<Grid.RowDefinitions>
 					<RowDefinition Height="Auto" />
@@ -685,70 +685,70 @@
 				</Grid.ColumnDefinitions>
 
 				<TextBlock x:Name="YearsLabel"
-									 x:Uid="YearsLabel"
-									 Margin="0,0,0,6"
-									 Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-									 TextWrapping="Wrap" />
+						   x:Uid="YearsLabel"
+						   Margin="0,0,0,6"
+						   Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
+						   TextWrapping="Wrap" />
 
 				<ComboBox x:Name="YearsValue"
-									Grid.Row="1"
-									MinWidth="84"
-									AutomationProperties.LabeledBy="{Binding ElementName=YearsLabel}"
-									DropDownClosed="OffsetDropDownClosed"
-									ItemsSource="{Binding OffsetValues, Mode=OneTime}"
-									SelectedIndex="{Binding YearsOffset, Mode=TwoWay}"
-									SelectionChanged="OffsetValue_Changed" />
+						  Grid.Row="1"
+						  MinWidth="84"
+						  AutomationProperties.LabeledBy="{Binding ElementName=YearsLabel}"
+						  DropDownClosed="OffsetDropDownClosed"
+						  ItemsSource="{Binding OffsetValues, Mode=OneTime}"
+						  SelectedIndex="{Binding YearsOffset, Mode=TwoWay}"
+						  SelectionChanged="OffsetValue_Changed" />
 
 				<TextBlock x:Name="MonthsLabel"
-									 x:Uid="MonthsLabel"
-									 Grid.Column="1"
-									 Margin="12,0,12,6"
-									 Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-									 TextWrapping="Wrap" />
+						   x:Uid="MonthsLabel"
+						   Grid.Column="1"
+						   Margin="12,0,12,6"
+						   Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
+						   TextWrapping="Wrap" />
 
 				<ComboBox x:Name="MonthsValue"
-									Grid.Row="1"
-									Grid.Column="1"
-									MinWidth="84"
-									Margin="12,0,12,0"
-									AutomationProperties.LabeledBy="{Binding ElementName=MonthsLabel}"
-									DropDownClosed="OffsetDropDownClosed"
-									ItemsSource="{Binding OffsetValues, Mode=OneTime}"
-									SelectedIndex="{Binding MonthsOffset, Mode=TwoWay}"
-									SelectionChanged="OffsetValue_Changed" />
+						  Grid.Row="1"
+						  Grid.Column="1"
+						  MinWidth="84"
+						  Margin="12,0,12,0"
+						  AutomationProperties.LabeledBy="{Binding ElementName=MonthsLabel}"
+						  DropDownClosed="OffsetDropDownClosed"
+						  ItemsSource="{Binding OffsetValues, Mode=OneTime}"
+						  SelectedIndex="{Binding MonthsOffset, Mode=TwoWay}"
+						  SelectionChanged="OffsetValue_Changed" />
 
 				<TextBlock x:Name="DaysLabel"
-									 x:Uid="DaysLabel"
-									 Grid.Column="2"
-									 Margin="0,0,0,6"
-									 Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-									 TextWrapping="Wrap" />
+						   x:Uid="DaysLabel"
+						   Grid.Column="2"
+						   Margin="0,0,0,6"
+						   Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
+						   TextWrapping="Wrap" />
 
 				<ComboBox x:Name="DaysValue"
-									Grid.Row="1"
-									Grid.Column="2"
-									MinWidth="84"
-									AutomationProperties.LabeledBy="{Binding ElementName=DaysLabel}"
-									DropDownClosed="OffsetDropDownClosed"
-									ItemsSource="{Binding OffsetValues, Mode=OneTime}"
-									SelectedIndex="{Binding DaysOffset, Mode=TwoWay}"
-									SelectionChanged="OffsetValue_Changed" />
+						  Grid.Row="1"
+						  Grid.Column="2"
+						  MinWidth="84"
+						  AutomationProperties.LabeledBy="{Binding ElementName=DaysLabel}"
+						  DropDownClosed="OffsetDropDownClosed"
+						  ItemsSource="{Binding OffsetValues, Mode=OneTime}"
+						  SelectedIndex="{Binding DaysOffset, Mode=TwoWay}"
+						  SelectionChanged="OffsetValue_Changed" />
 			</Grid>
 
 			<!-- Resulting Date -->
 
 			<TextBlock x:Uid="DateLabel"
-								 Grid.Row="8"
-								 Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" />
+					   Grid.Row="8"
+					   Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" />
 
 			<!--TODO UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
 			<TextBlock x:Name="DateResultLabel"
-								 Grid.Row="9"
-								 Style="{ThemeResource SubtitleTextBlockStyle}"
-								 FontWeight="SemiBold"
-								 AutomationProperties.LiveSetting="Polite"
-								 AutomationProperties.Name="{Binding StrDateResultAutomationName}"
-								 Text="{Binding StrDateResult}" />
+					   Grid.Row="9"
+					   Style="{ThemeResource SubtitleTextBlockStyle}"
+					   FontWeight="SemiBold"
+					   AutomationProperties.LiveSetting="Polite"
+					   AutomationProperties.Name="{Binding StrDateResultAutomationName}"
+					   Text="{Binding StrDateResult}" />
 		</Grid>
 	</Grid>
 </UserControl>
diff --git a/src/Calculator.Shared/Views/MainPage.xaml b/src/Calculator.Shared/Views/MainPage.xaml
index 264156d5..a6928746 100644
--- a/src/Calculator.Shared/Views/MainPage.xaml
+++ b/src/Calculator.Shared/Views/MainPage.xaml
@@ -125,14 +125,11 @@
 		</StackPanel>
 
 		<!-- Title Bar -->
-		<!--
-		-->
 		<local:TitleBar x:Name="CustomTitleBar"
 						Grid.Row="0"
 						Visibility="Collapsed" />
 
-		<!--UNO TODO 
-                         -->
+		<!-- UNO TODO -->
 		<NavigationView x:Name="NavView"
 						CompactModeThresholdWidth="10000"
 						ExpandedModeThresholdWidth="10000"
diff --git a/src/Calculator.Shared/Views/NumberPad.xaml b/src/Calculator.Shared/Views/NumberPad.xaml
index ec12c899..72d45a48 100644
--- a/src/Calculator.Shared/Views/NumberPad.xaml
+++ b/src/Calculator.Shared/Views/NumberPad.xaml
@@ -1,13 +1,13 @@
 <UserControl x:Class="CalculatorApp.NumberPad"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:common="using:CalculatorApp.Common"
-             xmlns:controls="using:CalculatorApp.Controls"
-             xmlns:converters="using:CalculatorApp.Converters"
-             xmlns:local="using:CalculatorApp.Views"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             x:Name="ControlRoot"
-             mc:Ignorable="">
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:common="using:CalculatorApp.Common"
+			 xmlns:controls="using:CalculatorApp.Controls"
+			 xmlns:converters="using:CalculatorApp.Converters"
+			 xmlns:local="using:CalculatorApp.Views"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 x:Name="ControlRoot"
+			 mc:Ignorable="">
 
 	<Grid x:Name="Root">
 		<Grid.RowDefinitions>
@@ -16,7 +16,7 @@
 			<RowDefinition Height="1*" />
 			<RowDefinition Height="1*" />
 		</Grid.RowDefinitions>
-		
+
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition Width="1*" />
 			<ColumnDefinition Width="1*" />
@@ -29,85 +29,85 @@
 				<VisualState x:Name="ErrorLayout">
 					<VisualState.Setters>
 						<Setter Target="decimalSeparatorButton.IsEnabled"
-										Value="false" />
+								Value="false" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
 		</VisualStateManager.VisualStateGroups>
-		
+
 		<controls:CalculatorButton x:Name="num0Button"
-															 x:Uid="num0Button"
-															 Grid.Row="3"
-															 Grid.Column="1"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num0Button"
-															 ButtonId="Zero" />
-		
+								   x:Uid="num0Button"
+								   Grid.Row="3"
+								   Grid.Column="1"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num0Button"
+								   ButtonId="Zero" />
+
 		<controls:CalculatorButton x:Name="num1Button"
-															 x:Uid="num1Button"
-															 Grid.Row="2"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num1Button"
-															 ButtonId="One" />
-		
+								   x:Uid="num1Button"
+								   Grid.Row="2"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num1Button"
+								   ButtonId="One" />
+
 		<controls:CalculatorButton x:Name="num2Button"
-															 x:Uid="num2Button"
-															 Grid.Row="2"
-															 Grid.Column="1"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num2Button"
-															 ButtonId="Two" />
-		
+								   x:Uid="num2Button"
+								   Grid.Row="2"
+								   Grid.Column="1"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num2Button"
+								   ButtonId="Two" />
+
 		<controls:CalculatorButton x:Name="num3Button"
-															 x:Uid="num3Button"
-															 Grid.Row="2"
-															 Grid.Column="2"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num3Button"
-															 ButtonId="Three" />
-		
+								   x:Uid="num3Button"
+								   Grid.Row="2"
+								   Grid.Column="2"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num3Button"
+								   ButtonId="Three" />
+
 		<controls:CalculatorButton x:Name="num4Button"
-															 x:Uid="num4Button"
-															 Grid.Row="1"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num4Button"
-															 ButtonId="Four" />
-		
+								   x:Uid="num4Button"
+								   Grid.Row="1"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num4Button"
+								   ButtonId="Four" />
+
 		<controls:CalculatorButton x:Name="num5Button"
-															 x:Uid="num5Button"
-															 Grid.Row="1"
-															 Grid.Column="1"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num5Button"
-															 ButtonId="Five" />
-		
+								   x:Uid="num5Button"
+								   Grid.Row="1"
+								   Grid.Column="1"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num5Button"
+								   ButtonId="Five" />
+
 		<controls:CalculatorButton x:Name="num6Button"
-															 x:Uid="num6Button"
-															 Grid.Row="1"
-															 Grid.Column="2"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num6Button"
-															 ButtonId="Six" />
-		
+								   x:Uid="num6Button"
+								   Grid.Row="1"
+								   Grid.Column="2"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num6Button"
+								   ButtonId="Six" />
+
 		<controls:CalculatorButton x:Name="num7Button"
-															 x:Uid="num7Button"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num7Button"
-															 ButtonId="Seven" />
-		
+								   x:Uid="num7Button"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num7Button"
+								   ButtonId="Seven" />
+
 		<controls:CalculatorButton x:Name="num8Button"
-															 x:Uid="num8Button"
-															 Grid.Column="1"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num8Button"
-															 ButtonId="Eight" />
-		
+								   x:Uid="num8Button"
+								   Grid.Column="1"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num8Button"
+								   ButtonId="Eight" />
+
 		<controls:CalculatorButton x:Name="num9Button"
-															 x:Uid="num9Button"
-															 Grid.Column="2"
-															 Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
-															 AutomationProperties.AutomationId="num9Button"
-															 ButtonId="Nine" />
+								   x:Uid="num9Button"
+								   Grid.Column="2"
+								   Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
+								   AutomationProperties.AutomationId="num9Button"
+								   ButtonId="Nine" />
 
 		<!--
             This is the only button in all of the app that should ever have a explicit reference to KeyboardShortcutManager in Xaml
@@ -117,14 +117,14 @@
             string coming from the RESW file
         -->
 		<controls:CalculatorButton x:Name="decimalSeparatorButton"
-															 x:Uid="decimalSeparatorButton"
-															 Grid.Row="4"
-															 Grid.Column="2"
-															 Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}"
-															 Background="{ThemeResource AppBackgroundAltMediumLowBrush}"
-															 AutomationProperties.AutomationId="decimalSeparatorButton"
-															 ButtonId="Decimal"
-															 IsEnabled="{Binding IsDecimalEnabled}" />
-															 <!-- UNO TODO common:KeyboardShortcutManager.Character="."-->
+								   x:Uid="decimalSeparatorButton"
+								   Grid.Row="4"
+								   Grid.Column="2"
+								   Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}"
+								   Background="{ThemeResource AppBackgroundAltMediumLowBrush}"
+								   AutomationProperties.AutomationId="decimalSeparatorButton"
+								   ButtonId="Decimal"
+								   IsEnabled="{Binding IsDecimalEnabled}" />
+		<!-- UNO TODO common:KeyboardShortcutManager.Character="."-->
 	</Grid>
 </UserControl>
diff --git a/src/Calculator.Shared/Views/UnitConverter.xaml b/src/Calculator.Shared/Views/UnitConverter.xaml
index 933a4539..96a95b6b 100644
--- a/src/Calculator.Shared/Views/UnitConverter.xaml
+++ b/src/Calculator.Shared/Views/UnitConverter.xaml
@@ -1,70 +1,93 @@
 <UserControl x:Class="CalculatorApp.UnitConverter"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:automation="using:CalculatorApp.Common.Automation"
-             xmlns:common="using:CalculatorApp.Common"
-             xmlns:controls="using:CalculatorApp.Controls"
-             xmlns:converters="using:CalculatorApp.Converters"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="using:CalculatorApp"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:triggers="using:CalculatorApp.Views.StateTriggers"
-             xmlns:vm="using:CalculatorApp.ViewModel"
-             d:DesignHeight="658"
-             d:DesignWidth="830"
-             DataContextChanged="OnDataContextChanged"
-             FlowDirection="LeftToRight"
-             Loaded="OnLoaded"
-             mc:Ignorable="d">
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:automation="using:CalculatorApp.Common.Automation"
+			 xmlns:common="using:CalculatorApp.Common"
+			 xmlns:controls="using:CalculatorApp.Controls"
+			 xmlns:converters="using:CalculatorApp.Converters"
+			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+			 xmlns:local="using:CalculatorApp"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:triggers="using:CalculatorApp.Views.StateTriggers"
+			 xmlns:vm="using:CalculatorApp.ViewModel"
+			 d:DesignHeight="658"
+			 d:DesignWidth="830"
+			 DataContextChanged="OnDataContextChanged"
+			 FlowDirection="LeftToRight"
+			 Loaded="OnLoaded"
+			 mc:Ignorable="d">
 
 	<UserControl.Resources>
-		<common:VisibilityNegationConverter x:Key="VisibilityNegationConverter"/>
-		<common:AlwaysSelectedCollectionViewConverter x:Key="AlwaysSelectedConverter"/>
-		<common:ValidSelectedItemConverter x:Key="ValidSelectedItemConverter"/>
-		<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-		<converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/>
+		<common:VisibilityNegationConverter x:Key="VisibilityNegationConverter" />
+		<common:AlwaysSelectedCollectionViewConverter x:Key="AlwaysSelectedConverter" />
+		<common:ValidSelectedItemConverter x:Key="ValidSelectedItemConverter" />
+		<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+		<converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter" />
 		<!-- TODO UNO <automation:NarratorNotifier x:Name="NarratorNotifier" Announcement="{x:Bind Model.Announcement, Mode=OneWay}"/>-->
 
-		<DataTemplate x:Key="UnitTemplate" x:DataType="vm:Unit">
+		<DataTemplate x:Key="UnitTemplate"
+					  x:DataType="vm:Unit">
 			<TextBlock Style="{ThemeResource BodyTextBlockStyle}"
-                       Text="{x:Bind Name}"
-                       TextWrapping="NoWrap"/>
+					   Text="{x:Bind Name}"
+					   TextWrapping="NoWrap" />
 			<!--TODO UNO AutomationProperties.Name="{x:Bind AccessibleName}"-->
 		</DataTemplate>
 
-		<DataTemplate x:Key="SelectedUnitTemplate" x:DataType="vm:Unit">
+		<DataTemplate x:Key="SelectedUnitTemplate"
+					  x:DataType="vm:Unit">
 			<TextBlock Style="{ThemeResource BodyTextBlockStyle}"
-                       FontWeight="SemiBold"
-                       Text="{x:Bind Name}"
-                       TextWrapping="NoWrap"/>
+					   FontWeight="SemiBold"
+					   Text="{x:Bind Name}"
+					   TextWrapping="NoWrap" />
 			<!--TODO UNO AutomationProperties.Name="{x:Bind AccessibleName}"-->
 		</DataTemplate>
 
-		<Style x:Key="ComboStyle" TargetType="ComboBox">
-			<Setter Property="Padding" Value="12,0,0,0"/>
-			<Setter Property="MinHeight" Value="32"/>
-			<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
-			<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
-			<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"/>
-			<Setter Property="BorderThickness" Value="0"/>
-			<Setter Property="TabNavigation" Value="Once"/>
-			<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-			<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-			<Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled"/>
-			<Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto"/>
-			<Setter Property="ScrollViewer.IsVerticalRailEnabled" Value="True"/>
-			<Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False"/>
-			<Setter Property="ScrollViewer.BringIntoViewOnFocusChange" Value="True"/>
-			<Setter Property="HorizontalContentAlignment" Value="Left"/>
-			<Setter Property="HorizontalAlignment" Value="Stretch"/>
-			<Setter Property="VerticalAlignment" Value="Top"/>
-			<Setter Property="VerticalContentAlignment" Value="Center"/>
-			<Setter Property="IsTextScaleFactorEnabled" Value="True"/>
-			<Setter Property="UseSystemFocusVisuals" Value="True"/>
+		<Style x:Key="ComboStyle"
+			   TargetType="ComboBox">
+			<Setter Property="Padding"
+					Value="12,0,0,0" />
+			<Setter Property="MinHeight"
+					Value="32" />
+			<Setter Property="Foreground"
+					Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+			<Setter Property="Background"
+					Value="{ThemeResource SystemControlBackgroundTransparentBrush}" />
+			<Setter Property="BorderBrush"
+					Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" />
+			<Setter Property="BorderThickness"
+					Value="0" />
+			<Setter Property="TabNavigation"
+					Value="Once" />
+			<Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
+					Value="Disabled" />
+			<Setter Property="ScrollViewer.VerticalScrollBarVisibility"
+					Value="Auto" />
+			<Setter Property="ScrollViewer.HorizontalScrollMode"
+					Value="Disabled" />
+			<Setter Property="ScrollViewer.VerticalScrollMode"
+					Value="Auto" />
+			<Setter Property="ScrollViewer.IsVerticalRailEnabled"
+					Value="True" />
+			<Setter Property="ScrollViewer.IsDeferredScrollingEnabled"
+					Value="False" />
+			<Setter Property="ScrollViewer.BringIntoViewOnFocusChange"
+					Value="True" />
+			<Setter Property="HorizontalContentAlignment"
+					Value="Left" />
+			<Setter Property="HorizontalAlignment"
+					Value="Stretch" />
+			<Setter Property="VerticalAlignment"
+					Value="Top" />
+			<Setter Property="VerticalContentAlignment"
+					Value="Center" />
+			<Setter Property="IsTextScaleFactorEnabled"
+					Value="True" />
+			<Setter Property="UseSystemFocusVisuals"
+					Value="True" />
 			<Setter Property="ItemsPanel">
 				<Setter.Value>
 					<ItemsPanelTemplate>
-						<CarouselPanel/>
+						<CarouselPanel />
 					</ItemsPanelTemplate>
 				</Setter.Value>
 			</Setter>
@@ -74,52 +97,58 @@
 						<Grid>
 							<VisualStateManager.VisualStateGroups>
 								<VisualStateGroup x:Name="CommonStates">
-									<VisualState x:Name="Normal"/>
+									<VisualState x:Name="Normal" />
 									<VisualState x:Name="PointerOver">
 										<VisualState.Setters>
-											<Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/>
-											<Setter Target="SelectedContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}"/>
-											<Setter Target="DropDownGlyph.Fill" Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}"/>
+											<Setter Target="BackgroundElement.Background"
+													Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+											<Setter Target="SelectedContentPresenter.Foreground"
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
+											<Setter Target="DropDownGlyph.Fill"
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState x:Name="Pressed">
 										<VisualState.Setters>
-											<Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/>
-											<Setter Target="SelectedContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}"/>
-											<Setter Target="DropDownGlyph.Fill" Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}"/>
+											<Setter Target="BackgroundElement.Background"
+													Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+											<Setter Target="SelectedContentPresenter.Foreground"
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
+											<Setter Target="DropDownGlyph.Fill"
+													Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
 										</VisualState.Setters>
 									</VisualState>
-									<VisualState x:Name="Disabled"/>
+									<VisualState x:Name="Disabled" />
 								</VisualStateGroup>
 								<VisualStateGroup x:Name="DropDownStates">
 									<VisualState x:Name="Opened">
 										<Storyboard>
 											<SplitOpenThemeAnimation ClosedTargetName="SelectedContentPresenter"
-                                                                     OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
-                                                                     OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}"
-                                                                     OpenedTargetName="PopupBorder"/>
+																	 OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
+																	 OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}"
+																	 OpenedTargetName="PopupBorder" />
 										</Storyboard>
 									</VisualState>
 									<VisualState x:Name="Closed">
 										<Storyboard>
 											<SplitCloseThemeAnimation ClosedTargetName="SelectedContentPresenter"
-                                                                      OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
-                                                                      OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}"
-                                                                      OpenedTargetName="PopupBorder"/>
+																	  OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
+																	  OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}"
+																	  OpenedTargetName="PopupBorder" />
 										</Storyboard>
 									</VisualState>
 								</VisualStateGroup>
 							</VisualStateManager.VisualStateGroups>
 							<Grid>
 								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto"/>
-									<ColumnDefinition Width="*"/>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition Width="*" />
 								</Grid.ColumnDefinitions>
 								<Border x:Name="BackgroundElement"
-                                        Grid.ColumnSpan="2"
-                                        Background="{TemplateBinding Background}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        BorderThickness="{TemplateBinding BorderThickness}"/>
+										Grid.ColumnSpan="2"
+										Background="{TemplateBinding Background}"
+										BorderBrush="{TemplateBinding BorderBrush}"
+										BorderThickness="{TemplateBinding BorderThickness}" />
 								<!--
                                     This first ContentPresenter must be named "ContentPresenter" because
                                     XAML expects it in the template and has dependencies. It is not used
@@ -127,14 +156,15 @@
                                     list but XAML forces the same style.  Do not remove
                                     this element.
                                 -->
-								<ContentPresenter x:Name="ContentPresenter" Opacity="0"/>
+								<ContentPresenter x:Name="ContentPresenter"
+												  Opacity="0" />
 								<ContentPresenter x:Name="SelectedContentPresenter"
-                                                  Margin="{TemplateBinding Padding}"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  Content="{TemplateBinding SelectedItem}"
-                                                  ContentTemplate="{StaticResource SelectedUnitTemplate}"
-                                                  FlowDirection="{TemplateBinding FlowDirection}"/>
+												  Margin="{TemplateBinding Padding}"
+												  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												  Content="{TemplateBinding SelectedItem}"
+												  ContentTemplate="{StaticResource SelectedUnitTemplate}"
+												  FlowDirection="{TemplateBinding FlowDirection}" />
 								<!--TODO UNO: AutomationProperties.AccessibilityView="Raw"-->
 								<Path x:Name="DropDownGlyph"
 									  Data="M30.519004,0L32.000998,1.3439932 15.932995,19.049 0,1.4920032 1.481019,0.1489867 15.932995,16.071982z"
@@ -142,34 +172,34 @@
 									  Stretch="Uniform"
 									  Width="12"
 									  IsHitTestVisible="False"
-                                      HorizontalAlignment="Left"
-                                      VerticalAlignment="Center"
-                                      Margin="8,3,12,0"
-                                      Grid.Column="1"/>
+									  HorizontalAlignment="Left"
+									  VerticalAlignment="Center"
+									  Margin="8,3,12,0"
+									  Grid.Column="1" />
 								<!--TODO UNO: AutomationProperties.AccessibilityView="Raw"-->
 								<Popup x:Name="Popup">
 									<Border x:Name="PopupBorder"
-                                            Margin="0,-1,0,-1"
-                                            HorizontalAlignment="Stretch"
-                                            Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"
-                                            BorderBrush="{ThemeResource SystemControlForegroundChromeHighBrush}"
-                                            BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}">
+											Margin="0,-1,0,-1"
+											HorizontalAlignment="Stretch"
+											Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"
+											BorderBrush="{ThemeResource SystemControlForegroundChromeHighBrush}"
+											BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}">
 										<ScrollViewer x:Name="ScrollViewer"
-                                                      MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownContentMinWidth}"
-                                                      Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-                                                      BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
-                                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                                      HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                                                      IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                                                      IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
-                                                      IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
-                                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                                      VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                                                      VerticalSnapPointsAlignment="Near"
-                                                      VerticalSnapPointsType="OptionalSingle"
-                                                      ZoomMode="Disabled">
+													  MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownContentMinWidth}"
+													  Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
+													  BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
+													  HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+													  HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+													  IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+													  IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+													  IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+													  VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+													  VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+													  VerticalSnapPointsAlignment="Near"
+													  VerticalSnapPointsType="OptionalSingle"
+													  ZoomMode="Disabled">
 											<!--TODO UNO: AutomationProperties.AccessibilityView="Raw"-->
-											<ItemsPresenter/>
+											<ItemsPresenter />
 										</ScrollViewer>
 									</Border>
 								</Popup>
@@ -181,82 +211,114 @@
 		</Style>
 
 		<Style x:Key="ValueBaseStyle"
-               BasedOn="{StaticResource CalculationResultStyleL}"
-               TargetType="controls:CalculationResult">
-			<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
-			<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
-			<Setter Property="HorizontalContentAlignment" Value="Left"/>
-			<Setter Property="VerticalContentAlignment" Value="Bottom"/>
-			<Setter Property="FontWeight" Value="Light"/>
-			<Setter Property="MinFontSize" Value="{ThemeResource BodyFontSize}"/>
+			   BasedOn="{StaticResource CalculationResultStyleL}"
+			   TargetType="controls:CalculationResult">
+			<Setter Property="Background"
+					Value="{ThemeResource SystemControlBackgroundTransparentBrush}" />
+			<Setter Property="Foreground"
+					Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+			<Setter Property="HorizontalContentAlignment"
+					Value="Left" />
+			<Setter Property="VerticalContentAlignment"
+					Value="Bottom" />
+			<Setter Property="FontWeight"
+					Value="Light" />
+			<Setter Property="MinFontSize"
+					Value="{ThemeResource BodyFontSize}" />
 		</Style>
 		<Style x:Key="ValueLargeStyle"
-               BasedOn="{StaticResource ValueBaseStyle}"
-               TargetType="controls:CalculationResult">
-			<Setter Property="MaxFontSize" Value="46"/>
-			<Setter Property="Margin" Value="-2,0,0,0"/>
-			<Setter Property="DisplayMargin" Value="0,0,0,12"/>
+			   BasedOn="{StaticResource ValueBaseStyle}"
+			   TargetType="controls:CalculationResult">
+			<Setter Property="MaxFontSize"
+					Value="46" />
+			<Setter Property="Margin"
+					Value="-2,0,0,0" />
+			<Setter Property="DisplayMargin"
+					Value="0,0,0,12" />
 		</Style>
 		<Style x:Key="ValueMediumStyle"
-               BasedOn="{StaticResource ValueBaseStyle}"
-               TargetType="controls:CalculationResult">
-			<Setter Property="MaxFontSize" Value="46"/>
-			<Setter Property="Margin" Value="0,0,0,0"/>
-			<Setter Property="DisplayMargin" Value="0,0,0,4"/>
+			   BasedOn="{StaticResource ValueBaseStyle}"
+			   TargetType="controls:CalculationResult">
+			<Setter Property="MaxFontSize"
+					Value="46" />
+			<Setter Property="Margin"
+					Value="0,0,0,0" />
+			<Setter Property="DisplayMargin"
+					Value="0,0,0,4" />
 		</Style>
-		<Style x:Key="CurrencySymbolBaseStyle" TargetType="TextBlock">
-			<Setter Property="FontWeight" Value="Light"/>
-			<Setter Property="HorizontalAlignment" Value="Left"/>
-			<Setter Property="VerticalAlignment" Value="Bottom"/>
-			<Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
+		<Style x:Key="CurrencySymbolBaseStyle"
+			   TargetType="TextBlock">
+			<Setter Property="FontWeight"
+					Value="Light" />
+			<Setter Property="HorizontalAlignment"
+					Value="Left" />
+			<Setter Property="VerticalAlignment"
+					Value="Bottom" />
+			<Setter Property="Foreground"
+					Value="{ThemeResource SystemControlPageTextBaseHighBrush}" />
 		</Style>
 		<Style x:Key="CurrencySymbolLargeStyle"
-               BasedOn="{StaticResource CurrencySymbolBaseStyle}"
-               TargetType="TextBlock">
-			<Setter Property="FontSize" Value="32"/>
-			<Setter Property="Margin" Value="0,0,0,17"/>
+			   BasedOn="{StaticResource CurrencySymbolBaseStyle}"
+			   TargetType="TextBlock">
+			<Setter Property="FontSize"
+					Value="32" />
+			<Setter Property="Margin"
+					Value="0,0,0,17" />
 		</Style>
 		<Style x:Key="CurrencySymbolMediumStyle"
-               BasedOn="{StaticResource CurrencySymbolBaseStyle}"
-               TargetType="TextBlock">
-			<Setter Property="FontSize" Value="24"/>
-			<Setter Property="Margin" Value="0,0,0,8"/>
+			   BasedOn="{StaticResource CurrencySymbolBaseStyle}"
+			   TargetType="TextBlock">
+			<Setter Property="FontSize"
+					Value="24" />
+			<Setter Property="Margin"
+					Value="0,0,0,8" />
 		</Style>
 		<Style x:Key="CurrencySymbolSmallStyle"
-               BasedOn="{StaticResource CurrencySymbolBaseStyle}"
-               TargetType="TextBlock">
-			<Setter Property="FontSize" Value="17"/>
-			<Setter Property="Margin" Value="0,0,0,7"/>
+			   BasedOn="{StaticResource CurrencySymbolBaseStyle}"
+			   TargetType="TextBlock">
+			<Setter Property="FontSize"
+					Value="17" />
+			<Setter Property="Margin"
+					Value="0,0,0,7" />
 		</Style>
 
-		<Style x:Key="ValueContainerStyle" TargetType="Grid">
+		<Style x:Key="ValueContainerStyle"
+			   TargetType="Grid">
 			<!-- TODO UNO <Setter Property="AutomationProperties.AccessibilityView" Value="Raw"/>-->
 		</Style>
 
 		<Storyboard x:Key="AnimationStory">
 			<!--TODO UNO Storyboard.TargetName="ConverterNumPad"-->
 			<DoubleAnimationUsingKeyFrames  Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
-				<EasingDoubleKeyFrame KeyTime="0" Value="0.92">
+				<EasingDoubleKeyFrame KeyTime="0"
+									  Value="0.92">
 					<EasingDoubleKeyFrame.EasingFunction>
-						<ExponentialEase EasingMode="EaseOut" Exponent="5"/>
+						<ExponentialEase EasingMode="EaseOut"
+										 Exponent="5" />
 					</EasingDoubleKeyFrame.EasingFunction>
 				</EasingDoubleKeyFrame>
-				<EasingDoubleKeyFrame KeyTime="0:0:0.367" Value="1">
+				<EasingDoubleKeyFrame KeyTime="0:0:0.367"
+									  Value="1">
 					<EasingDoubleKeyFrame.EasingFunction>
-						<ExponentialEase EasingMode="EaseOut" Exponent="5"/>
+						<ExponentialEase EasingMode="EaseOut"
+										 Exponent="5" />
 					</EasingDoubleKeyFrame.EasingFunction>
 				</EasingDoubleKeyFrame>
 			</DoubleAnimationUsingKeyFrames>
 			<!--TODO UNO Storyboard.TargetName="ConverterNumPad"-->
 			<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleY)">
-				<EasingDoubleKeyFrame KeyTime="0" Value="0.92">
+				<EasingDoubleKeyFrame KeyTime="0"
+									  Value="0.92">
 					<EasingDoubleKeyFrame.EasingFunction>
-						<ExponentialEase EasingMode="EaseOut" Exponent="5"/>
+						<ExponentialEase EasingMode="EaseOut"
+										 Exponent="5" />
 					</EasingDoubleKeyFrame.EasingFunction>
 				</EasingDoubleKeyFrame>
-				<EasingDoubleKeyFrame KeyTime="0:0:0.367" Value="1">
+				<EasingDoubleKeyFrame KeyTime="0:0:0.367"
+									  Value="1">
 					<EasingDoubleKeyFrame.EasingFunction>
-						<ExponentialEase EasingMode="EaseOut" Exponent="5"/>
+						<ExponentialEase EasingMode="EaseOut"
+										 Exponent="5" />
 					</EasingDoubleKeyFrame.EasingFunction>
 				</EasingDoubleKeyFrame>
 			</DoubleAnimationUsingKeyFrames>
@@ -265,9 +327,9 @@
 		<Storyboard x:Key="TimestampFadeInAnimation">
 			<!--TODO UNO Storyboard.TargetName="CurrencyTimestampTextBlock"-->
 			<DoubleAnimation Duration="0:0:1"
-                             From="0"
-                             Storyboard.TargetProperty="Opacity"
-                             To="1"/>
+							 From="0"
+							 Storyboard.TargetProperty="Opacity"
+							 To="1" />
 		</Storyboard>
 
 		<!--
@@ -285,251 +347,324 @@
 	</UserControl.Resources>
 
 	<Grid x:Name="UnitConverterRootGrid"
-          HorizontalAlignment="Stretch"
-          >
+		  HorizontalAlignment="Stretch">
 		<!--TODO UNO: AutomationProperties.LandmarkType="Main"-->
 		<Grid.RowDefinitions>
-			<RowDefinition x:Name="RowTopNav" Height="{StaticResource HamburgerHeightGridLength}"/>
+			<RowDefinition x:Name="RowTopNav"
+						   Height="{StaticResource HamburgerHeightGridLength}" />
 			<RowDefinition x:Name="RowDisplay1"
-                           Height="56*"
-                           MinHeight="56"/>
+						   Height="56*"
+						   MinHeight="56" />
 			<RowDefinition x:Name="RowUnit1"
-                           Height="32*"
-                           MinHeight="32"/>
+						   Height="32*"
+						   MinHeight="32" />
 			<RowDefinition x:Name="RowDisplay2"
-                           Height="56*"
-                           MinHeight="56"/>
+						   Height="56*"
+						   MinHeight="56" />
 			<RowDefinition x:Name="RowUnit2"
-                           Height="32*"
-                           MinHeight="32"/>
+						   Height="32*"
+						   MinHeight="32" />
 			<RowDefinition x:Name="RowDltrUnits"
-                           Height="Auto"
-                           MinHeight="48"/>
-			<RowDefinition x:Name="RowNumPad" Height="272*"/>
+						   Height="Auto"
+						   MinHeight="48" />
+			<RowDefinition x:Name="RowNumPad"
+						   Height="272*" />
 		</Grid.RowDefinitions>
 		<Grid.ColumnDefinitions>
-			<ColumnDefinition x:Name="GutterLeft" Width="0"/>
-			<ColumnDefinition x:Name="ColumnLeft" Width="1*"/>
-			<ColumnDefinition x:Name="ColumnRight" Width="0"/>
-			<ColumnDefinition x:Name="GutterRight" Width="0"/>
+			<ColumnDefinition x:Name="GutterLeft"
+							  Width="0" />
+			<ColumnDefinition x:Name="ColumnLeft"
+							  Width="1*" />
+			<ColumnDefinition x:Name="ColumnRight"
+							  Width="0" />
+			<ColumnDefinition x:Name="GutterRight"
+							  Width="0" />
 		</Grid.ColumnDefinitions>
 		<!-- End ConverterNumPad -->
 
 		<VisualStateManager.VisualStateGroups>
 			<VisualStateGroup x:Name="Layout">
-				<VisualState x:Name="PortraitLayout"/>
+				<VisualState x:Name="PortraitLayout" />
 				<VisualState x:Name="LandscapeLayout">
 					<VisualState.StateTriggers>
 						<triggers:AspectRatioTrigger ActiveIfEqual="True"
-                                                     NumeratorAspect="Width"
-                                                     Source="{x:Bind}"
-                                                     Threshold="1"/>
+													 NumeratorAspect="Width"
+													 Source="{x:Bind}"
+													 Threshold="1" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
-						<Setter Target="GutterTop.Height" Value="0.5*"/>
-						<Setter Target="GutterBottom.Height" Value="0.5*"/>
-						<Setter Target="GutterLeft.Width" Value="48"/>
-						<Setter Target="GutterRight.Width" Value="48"/>
-						<Setter Target="ColumnLeft.Width" Value="1*"/>
-						<Setter Target="ColumnRight.Width" Value="1*"/>
-						<Setter Target="RowDisplay1.Height" Value="4*"/>
-						<Setter Target="RowUnit1.Height" Value="2*"/>
-						<Setter Target="RowDisplay2.Height" Value="4*"/>
-						<Setter Target="RowUnit2.Height" Value="2*"/>
-						<Setter Target="RowDltrUnits.Height" Value="2*"/>
-						<Setter Target="CurrencyLoadingGrid.(Grid.ColumnSpan)" Value="2"/>
-						<Setter Target="ConverterNumPad.(Grid.Row)" Value="1"/>
-						<Setter Target="ConverterNumPad.(Grid.RowSpan)" Value="5"/>
-						<Setter Target="ConverterNumPad.(Grid.Column)" Value="2"/>
-						<Setter Target="ConverterNumPad.(Grid.ColumnSpan)" Value="2"/>
-						<Setter Target="SupplementaryResults.VerticalAlignment" Value="Top"/>
-						<Setter Target="RowNumPad.MinHeight" Value="0"/>
-						<Setter Target="RowNumPad.Height" Value="0"/>
+						<Setter Target="GutterTop.Height"
+								Value="0.5*" />
+						<Setter Target="GutterBottom.Height"
+								Value="0.5*" />
+						<Setter Target="GutterLeft.Width"
+								Value="48" />
+						<Setter Target="GutterRight.Width"
+								Value="48" />
+						<Setter Target="ColumnLeft.Width"
+								Value="1*" />
+						<Setter Target="ColumnRight.Width"
+								Value="1*" />
+						<Setter Target="RowDisplay1.Height"
+								Value="4*" />
+						<Setter Target="RowUnit1.Height"
+								Value="2*" />
+						<Setter Target="RowDisplay2.Height"
+								Value="4*" />
+						<Setter Target="RowUnit2.Height"
+								Value="2*" />
+						<Setter Target="RowDltrUnits.Height"
+								Value="2*" />
+						<Setter Target="CurrencyLoadingGrid.(Grid.ColumnSpan)"
+								Value="2" />
+						<Setter Target="ConverterNumPad.(Grid.Row)"
+								Value="1" />
+						<Setter Target="ConverterNumPad.(Grid.RowSpan)"
+								Value="5" />
+						<Setter Target="ConverterNumPad.(Grid.Column)"
+								Value="2" />
+						<Setter Target="ConverterNumPad.(Grid.ColumnSpan)"
+								Value="2" />
+						<Setter Target="SupplementaryResults.VerticalAlignment"
+								Value="Top" />
+						<Setter Target="RowNumPad.MinHeight"
+								Value="0" />
+						<Setter Target="RowNumPad.Height"
+								Value="0" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
 			<VisualStateGroup x:Name="Sizing">
 				<VisualState x:Name="Wide">
 					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowHeight="768" MinWindowWidth="1280"/>
+						<AdaptiveTrigger MinWindowHeight="768"
+										 MinWindowWidth="1280" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
-						<Setter Target="Value1.Style" Value="{ThemeResource ValueLargeStyle}"/>
-						<Setter Target="Value2.Style" Value="{ThemeResource ValueLargeStyle}"/>
-						<Setter Target="CurrencySymbol1Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
-						<Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
-						<Setter Target="Units1.Height" Value="44"/>
-						<Setter Target="Units2.Height" Value="44"/>
-						<Setter Target="ConverterNegateButton.FontSize" Value="24"/>
-						<Setter Target="ClearEntryButtonPos0.FontSize" Value="24"/>
-						<Setter Target="BackSpaceButtonSmall.FontSize" Value="24"/>
-						<Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle46}"/>
+						<Setter Target="Value1.Style"
+								Value="{ThemeResource ValueLargeStyle}" />
+						<Setter Target="Value2.Style"
+								Value="{ThemeResource ValueLargeStyle}" />
+						<Setter Target="CurrencySymbol1Block.Style"
+								Value="{ThemeResource CurrencySymbolLargeStyle}" />
+						<Setter Target="CurrencySymbol2Block.Style"
+								Value="{ThemeResource CurrencySymbolLargeStyle}" />
+						<Setter Target="Units1.Height"
+								Value="44" />
+						<Setter Target="Units2.Height"
+								Value="44" />
+						<Setter Target="ConverterNegateButton.FontSize"
+								Value="24" />
+						<Setter Target="ClearEntryButtonPos0.FontSize"
+								Value="24" />
+						<Setter Target="BackSpaceButtonSmall.FontSize"
+								Value="24" />
+						<Setter Target="NumberPad.ButtonStyle"
+								Value="{StaticResource NumericButtonStyle46}" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="Portrait">
 					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowHeight="1024" MinWindowWidth="640"/>
+						<AdaptiveTrigger MinWindowHeight="1024"
+										 MinWindowWidth="640" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
-						<Setter Target="SupplementaryResults.VerticalAlignment" Value="Top"/>
-						<Setter Target="Value1.Style" Value="{ThemeResource ValueLargeStyle}"/>
-						<Setter Target="Value2.Style" Value="{ThemeResource ValueLargeStyle}"/>
-						<Setter Target="CurrencySymbol1Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
-						<Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
-						<Setter Target="Units1.Height" Value="44"/>
-						<Setter Target="Units2.Height" Value="44"/>
-						<Setter Target="ConverterNegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-						<Setter Target="ClearEntryButtonPos0.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-						<Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
+						<Setter Target="SupplementaryResults.VerticalAlignment"
+								Value="Top" />
+						<Setter Target="Value1.Style"
+								Value="{ThemeResource ValueLargeStyle}" />
+						<Setter Target="Value2.Style"
+								Value="{ThemeResource ValueLargeStyle}" />
+						<Setter Target="CurrencySymbol1Block.Style"
+								Value="{ThemeResource CurrencySymbolLargeStyle}" />
+						<Setter Target="CurrencySymbol2Block.Style"
+								Value="{ThemeResource CurrencySymbolLargeStyle}" />
+						<Setter Target="Units1.Height"
+								Value="44" />
+						<Setter Target="Units2.Height"
+								Value="44" />
+						<Setter Target="ConverterNegateButton.FontSize"
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+						<Setter Target="ClearEntryButtonPos0.FontSize"
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+						<Setter Target="NumberPad.ButtonStyle"
+								Value="{StaticResource NumericButtonStyle34}" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="Wide640">
 					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="640"/>
+						<AdaptiveTrigger MinWindowHeight="0"
+										 MinWindowWidth="640" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
-						<Setter Target="Value1.Style" Value="{ThemeResource ValueLargeStyle}"/>
-						<Setter Target="Value2.Style" Value="{ThemeResource ValueLargeStyle}"/>
-						<Setter Target="CurrencySymbol1Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
-						<Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
-						<Setter Target="Units1.Height" Value="44"/>
-						<Setter Target="Units2.Height" Value="44"/>
-						<Setter Target="ConverterNegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-						<Setter Target="ClearEntryButtonPos0.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-						<Setter Target="BackSpaceButtonSmall.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-						<Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
+						<Setter Target="Value1.Style"
+								Value="{ThemeResource ValueLargeStyle}" />
+						<Setter Target="Value2.Style"
+								Value="{ThemeResource ValueLargeStyle}" />
+						<Setter Target="CurrencySymbol1Block.Style"
+								Value="{ThemeResource CurrencySymbolLargeStyle}" />
+						<Setter Target="CurrencySymbol2Block.Style"
+								Value="{ThemeResource CurrencySymbolLargeStyle}" />
+						<Setter Target="Units1.Height"
+								Value="44" />
+						<Setter Target="Units2.Height"
+								Value="44" />
+						<Setter Target="ConverterNegateButton.FontSize"
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+						<Setter Target="ClearEntryButtonPos0.FontSize"
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+						<Setter Target="BackSpaceButtonSmall.FontSize"
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+						<Setter Target="NumberPad.ButtonStyle"
+								Value="{StaticResource NumericButtonStyle34}" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="MinSizeLayout">
 					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}" MinWindowWidth="{StaticResource AppMinWindowWidth}"/>
+						<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
+										 MinWindowWidth="{StaticResource AppMinWindowWidth}" />
 					</VisualState.StateTriggers>
 				</VisualState>
 				<VisualState x:Name="DefaultLayout">
 					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="0"/>
+						<AdaptiveTrigger MinWindowHeight="0"
+										 MinWindowWidth="0" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
-						<Setter Target="ClearEntryButtonPos0.Margin" Value="1"/>
-						<Setter Target="BackSpaceButtonSmall.Margin" Value="1"/>
-						<Setter Target="ConverterNegateButton.Margin" Value="1"/>
+						<Setter Target="ClearEntryButtonPos0.Margin"
+								Value="1" />
+						<Setter Target="BackSpaceButtonSmall.Margin"
+								Value="1" />
+						<Setter Target="ConverterNegateButton.Margin"
+								Value="1" />
 
-						<Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle18}"/>
+						<Setter Target="NumberPad.ButtonStyle"
+								Value="{StaticResource NumericButtonStyle18}" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
 			<VisualStateGroup x:Name="CurrencyTimestampStates">
 				<VisualState x:Name="DefaultTimestamp">
 					<VisualState.Setters>
-						<Setter Target="CurrencyTimestampTextBlock.Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
-						<Setter Target="CurrencyTimestampTextBlock.FontWeight" Value="Normal"/>
+						<Setter Target="CurrencyTimestampTextBlock.Foreground"
+								Value="{ThemeResource SystemControlPageTextBaseHighBrush}" />
+						<Setter Target="CurrencyTimestampTextBlock.FontWeight"
+								Value="Normal" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="WeekOldTimestamp">
 					<VisualState.Setters>
-						<Setter Target="CurrencyTimestampTextBlock.Foreground" Value="{ThemeResource AppControlPageTextRedColorBrush}"/>
-						<Setter Target="CurrencyTimestampTextBlock.FontWeight" Value="SemiBold"/>
+						<Setter Target="CurrencyTimestampTextBlock.Foreground"
+								Value="{ThemeResource AppControlPageTextRedColorBrush}" />
+						<Setter Target="CurrencyTimestampTextBlock.FontWeight"
+								Value="SemiBold" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
 			<VisualStateGroup x:Name="CurrencySecondaryStatusStates">
 				<VisualState x:Name="ChargesMayApplyCurrencyStatus">
 					<VisualState.Setters>
-						<Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextBaseHighColorBrush}"/>
+						<Setter Target="CurrencySecondaryStatus.Foreground"
+								Value="{ThemeResource AppControlPageTextBaseHighColorBrush}" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="FailedCurrencyStatus">
 					<VisualState.Setters>
-						<Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextRedColorBrush}"/>
+						<Setter Target="CurrencySecondaryStatus.Foreground"
+								Value="{ThemeResource AppControlPageTextRedColorBrush}" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
 			<VisualStateGroup x:Name="CurrencySymbolStates">
-				<VisualState x:Name="CurrencySymbolLeftState"/>
+				<VisualState x:Name="CurrencySymbolLeftState" />
 				<VisualState x:Name="CurrencySymbolRightState">
 					<VisualState.Setters>
-						<Setter Target="CurrencySymbol1Block.Padding" Value="0,0,12,0"/>
-						<Setter Target="CurrencySymbol2Block.Padding" Value="0,0,12,0"/>
-						<Setter Target="CurrencySymbol1Block.(Grid.Column)" Value="2"/>
-						<Setter Target="CurrencySymbol2Block.(Grid.Column)" Value="2"/>
+						<Setter Target="CurrencySymbol1Block.Padding"
+								Value="0,0,12,0" />
+						<Setter Target="CurrencySymbol2Block.Padding"
+								Value="0,0,12,0" />
+						<Setter Target="CurrencySymbol1Block.(Grid.Column)"
+								Value="2" />
+						<Setter Target="CurrencySymbol2Block.(Grid.Column)"
+								Value="2" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
 		</VisualStateManager.VisualStateGroups>
 
 		<Grid x:Name="CurrencyLoadingGrid"
-              Grid.Row="1"
-              Grid.RowSpan="5"
-              Grid.Column="0"
-              Grid.ColumnSpan="4"
-              Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
+			  Grid.Row="1"
+			  Grid.RowSpan="5"
+			  Grid.Column="0"
+			  Grid.ColumnSpan="4"
+			  Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
 			<Grid.RowDefinitions>
-				<RowDefinition Height="10*"/>
-				<RowDefinition Height="7*"/>
-				<RowDefinition Height="10*"/>
+				<RowDefinition Height="10*" />
+				<RowDefinition Height="7*" />
+				<RowDefinition Height="10*" />
 			</Grid.RowDefinitions>
 			<ProgressRing x:Name="CurrencyLoadingProgressRing"
-                          Grid.Row="1"
-                          Grid.Column="1"
-                          MaxWidth="140"
-                          MaxHeight="140"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Stretch"
-                          IsActive="False"/>
+						  Grid.Row="1"
+						  Grid.Column="1"
+						  MaxWidth="140"
+						  MaxHeight="140"
+						  HorizontalAlignment="Stretch"
+						  VerticalAlignment="Stretch"
+						  IsActive="False" />
 		</Grid>
 
-		<!--TODO UNO: HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" --> 
+		<!--TODO UNO: HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" -->
 		<Grid x:Name="Value1Container"
-              Grid.Row="1"
-              Grid.Column="1"
-              HorizontalAlignment="Stretch"
-              Style="{ThemeResource ValueContainerStyle}"
-              Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
+			  Grid.Row="1"
+			  Grid.Column="1"
+			  HorizontalAlignment="Stretch"
+			  Style="{ThemeResource ValueContainerStyle}"
+			  Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
 			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto"/>
-				<ColumnDefinition Width="*"/>
-				<ColumnDefinition Width="Auto"/>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="Auto" />
 			</Grid.ColumnDefinitions>
 			<TextBlock x:Name="CurrencySymbol1Block"
-                       Grid.Column="0"
-                       Padding="12,0,0,0"
-                       Style="{ThemeResource CurrencySymbolMediumStyle}"
-                       Text="{x:Bind Model.CurrencySymbol1, Mode=OneWay}"
-                       Visibility="{x:Bind Model.CurrencySymbolVisibility, Mode=OneWay}"/>
+					   Grid.Column="0"
+					   Padding="12,0,0,0"
+					   Style="{ThemeResource CurrencySymbolMediumStyle}"
+					   Text="{x:Bind Model.CurrencySymbol1, Mode=OneWay}"
+					   Visibility="{x:Bind Model.CurrencySymbolVisibility, Mode=OneWay}" />
 			<!--TODO UNO: AutomationProperties.AccessibilityView="Raw"-->
 			<controls:CalculationResult x:Name="Value1"
-                                        Grid.Column="1"
-                                        Style="{ThemeResource ValueMediumStyle}"
-                                        ContextCanceled="OnContextCanceled"
-                                        ContextRequested="OnContextRequested"
-                                        DisplayValue="{x:Bind Model.Value1, Mode=OneWay}"
-                                        ExpressionVisibility="Collapsed"
-                                        FlowDirection="{x:Bind LayoutDirection}"
+										Grid.Column="1"
+										Style="{ThemeResource ValueMediumStyle}"
+										ContextCanceled="OnContextCanceled"
+										ContextRequested="OnContextRequested"
+										DisplayValue="{x:Bind Model.Value1, Mode=OneWay}"
+										ExpressionVisibility="Collapsed"
+										FlowDirection="{x:Bind LayoutDirection}"
 										FontSize="{StaticResource CalcResultFontSizeM}"
-                                        IsActive="{Binding Value1Active, Mode=TwoWay}"
-                                        KeyDown="OnValueKeyDown"
-                                        ValueSelected="OnValueSelected"
-                                        TabIndex="1"/>
+										IsActive="{Binding Value1Active, Mode=TwoWay}"
+										KeyDown="OnValueKeyDown"
+										ValueSelected="OnValueSelected"
+										TabIndex="1" />
 			<!--TODO UNO
 			                                        AutomationProperties.AutomationId="Value1"
                                         AutomationProperties.Name="{x:Bind Model.Value1AutomationName, Mode=OneWay}"-->
 		</Grid>
 
 		<ComboBox x:Name="Units1"
-                  Grid.Row="2"
-                  Grid.Column="1"
-                  HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
-                  Style="{ThemeResource ComboStyle}"
-                  DropDownClosed="UpdateDropDownState"
-                  DropDownOpened="UpdateDropDownState"
-                  FlowDirection="{x:Bind LayoutDirection}"
-                  IsEnabled="{Binding IsDropDownEnabled}"
-                  IsEnabledChanged="Units1_IsEnabledChanged"
-                  ItemTemplate="{StaticResource UnitTemplate}"
-                  ItemsSource="{Binding Units}"
-                  SelectedItem="{Binding Unit1, Mode=TwoWay}"
-                  TabIndex="2"
-                  Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
+				  Grid.Row="2"
+				  Grid.Column="1"
+				  HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
+				  Style="{ThemeResource ComboStyle}"
+				  DropDownClosed="UpdateDropDownState"
+				  DropDownOpened="UpdateDropDownState"
+				  FlowDirection="{x:Bind LayoutDirection}"
+				  IsEnabled="{Binding IsDropDownEnabled}"
+				  IsEnabledChanged="Units1_IsEnabledChanged"
+				  ItemTemplate="{StaticResource UnitTemplate}"
+				  ItemsSource="{Binding Units}"
+				  SelectedItem="{Binding Unit1, Mode=TwoWay}"
+				  TabIndex="2"
+				  Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
 		<!--TODO UNO
 		ItemsSource="{Binding Units, Converter={StaticResource AlwaysSelectedConverter}}"
 		SelectedItem="{Binding Unit1, Mode=TwoWay, Converter={StaticResource ValidSelectedItemConverter}}"
@@ -538,36 +673,36 @@
 
 		<!--TODO UNO: HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" -->
 		<Grid x:Name="Value2Container"
-              Grid.Row="3"
-              Grid.Column="1"
-              HorizontalAlignment="Stretch"
-              Style="{ThemeResource ValueContainerStyle}"
-              Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
+			  Grid.Row="3"
+			  Grid.Column="1"
+			  HorizontalAlignment="Stretch"
+			  Style="{ThemeResource ValueContainerStyle}"
+			  Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
 			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto"/>
-				<ColumnDefinition Width="*"/>
-				<ColumnDefinition Width="Auto"/>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="Auto" />
 			</Grid.ColumnDefinitions>
 			<TextBlock x:Name="CurrencySymbol2Block"
-                       Grid.Column="0"
-                       Padding="12,0,0,0"
-                       Style="{ThemeResource CurrencySymbolMediumStyle}"
-                       Text="{x:Bind Model.CurrencySymbol2, Mode=OneWay}"
-                       Visibility="{x:Bind Model.CurrencySymbolVisibility, Mode=OneWay}"/>
+					   Grid.Column="0"
+					   Padding="12,0,0,0"
+					   Style="{ThemeResource CurrencySymbolMediumStyle}"
+					   Text="{x:Bind Model.CurrencySymbol2, Mode=OneWay}"
+					   Visibility="{x:Bind Model.CurrencySymbolVisibility, Mode=OneWay}" />
 			<!--TODO UNO AutomationProperties.AccessibilityView="Raw"-->
 			<controls:CalculationResult x:Name="Value2"
-                                        Grid.Column="1"
+										Grid.Column="1"
 										Style="{ThemeResource ValueMediumStyle}"
-                                        ContextCanceled="OnContextCanceled"
-                                        ContextRequested="OnContextRequested"
-                                        DisplayValue="{x:Bind Model.Value2, Mode=OneWay}"
-                                        ExpressionVisibility="Collapsed"
-                                        FlowDirection="{x:Bind LayoutDirection}"
+										ContextCanceled="OnContextCanceled"
+										ContextRequested="OnContextRequested"
+										DisplayValue="{x:Bind Model.Value2, Mode=OneWay}"
+										ExpressionVisibility="Collapsed"
+										FlowDirection="{x:Bind LayoutDirection}"
 										FontSize="{StaticResource CalcResultFontSizeM}"
-                                        IsActive="{Binding Value2Active, Mode=TwoWay}"
-                                        KeyDown="OnValueKeyDown"
-                                        ValueSelected="OnValueSelected"
-                                        TabIndex="3"/>
+										IsActive="{Binding Value2Active, Mode=TwoWay}"
+										KeyDown="OnValueKeyDown"
+										ValueSelected="OnValueSelected"
+										TabIndex="3" />
 			<!--TODO UNO
 			AutomationProperties.AutomationId="Value2"
                                         AutomationProperties.LiveSetting="Polite"
@@ -575,19 +710,19 @@
 		</Grid>
 
 		<ComboBox x:Name="Units2"
-                  Grid.Row="4"
-                  Grid.Column="1"
-                  HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
-                  Style="{ThemeResource ComboStyle}"
-                  DropDownClosed="UpdateDropDownState"
-                  DropDownOpened="UpdateDropDownState"
-                  FlowDirection="{x:Bind LayoutDirection}"
-                  IsEnabled="{Binding IsDropDownEnabled}"
-                  ItemTemplate="{StaticResource UnitTemplate}"
-                  ItemsSource="{Binding Units}"
-                  SelectedItem="{Binding Unit2, Mode=TwoWay}"
-                  TabIndex="4"
-                  Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
+				  Grid.Row="4"
+				  Grid.Column="1"
+				  HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
+				  Style="{ThemeResource ComboStyle}"
+				  DropDownClosed="UpdateDropDownState"
+				  DropDownOpened="UpdateDropDownState"
+				  FlowDirection="{x:Bind LayoutDirection}"
+				  IsEnabled="{Binding IsDropDownEnabled}"
+				  ItemTemplate="{StaticResource UnitTemplate}"
+				  ItemsSource="{Binding Units}"
+				  SelectedItem="{Binding Unit2, Mode=TwoWay}"
+				  TabIndex="4"
+				  Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
 		<!--TODO UNO:
 		ItemsSource="{Binding Units, Converter={StaticResource AlwaysSelectedConverter}}"
 		SelectedItem="{Binding Unit2, Mode=TwoWay, Converter={StaticResource ValidSelectedItemConverter}}"
@@ -595,142 +730,145 @@
                   AutomationProperties.Name="{x:Bind Model.Unit2AutomationName, Mode=OneWay}"-->
 
 		<StackPanel x:Name="SupplementaryResultsPanelInGrid"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    MinHeight="48"
-                    Padding="12,0,6,0"
-                    HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
-                    VerticalAlignment="Top"
-                    FlowDirection="{x:Bind LayoutDirection}"
-                    SizeChanged="SupplementaryResultsPanelInGrid_SizeChanged"
-                    Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
+					Grid.Row="5"
+					Grid.Column="1"
+					MinHeight="48"
+					Padding="12,0,6,0"
+					HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
+					VerticalAlignment="Top"
+					FlowDirection="{x:Bind LayoutDirection}"
+					SizeChanged="SupplementaryResultsPanelInGrid_SizeChanged"
+					Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
 			<local:SupplementaryResults x:Name="SupplementaryResults"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Results="{x:Bind Model.SupplementaryResults, Mode=OneWay}"
-                                        Visibility="{x:Bind Model.SupplementaryVisibility, Mode=OneWay}"/>
+										HorizontalAlignment="Left"
+										VerticalAlignment="Center"
+										Results="{x:Bind Model.SupplementaryResults, Mode=OneWay}"
+										Visibility="{x:Bind Model.SupplementaryVisibility, Mode=OneWay}" />
 			<StackPanel Visibility="{x:Bind Model.IsCurrencyCurrentCategory, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
 				<!-- Currency Ratio Equality -->
 				<TextBlock x:Name="CurrencyRatioEqualityBlock"
-                           Style="{ThemeResource CaptionTextBlockStyle}"
-                           Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
-                           AutomationProperties.Name="{x:Bind Model.CurrencyRatioEqualityAutomationName, Mode=OneWay}"
-                           Text="{x:Bind Model.CurrencyRatioEquality, Mode=OneWay}"/>
+						   Style="{ThemeResource CaptionTextBlockStyle}"
+						   Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
+						   AutomationProperties.Name="{x:Bind Model.CurrencyRatioEqualityAutomationName, Mode=OneWay}"
+						   Text="{x:Bind Model.CurrencyRatioEquality, Mode=OneWay}" />
 
 				<!-- Currency Timestamp -->
 				<TextBlock x:Name="CurrencyTimestampTextBlock"
-                           Style="{ThemeResource CaptionTextBlockStyle}"
-                           Text="{x:Bind Model.CurrencyTimestamp, Mode=OneWay}"/>
+						   Style="{ThemeResource CaptionTextBlockStyle}"
+						   Text="{x:Bind Model.CurrencyTimestamp, Mode=OneWay}" />
 
 				<!-- Currency Refresh button and additional status text -->
 				<ContentControl x:Name="CurrencyRefreshBlockControl"
-                                IsTabStop="False"
-                                TabIndex="5"
-                                Visibility="Collapsed">
+								IsTabStop="False"
+								TabIndex="5"
+								Visibility="Collapsed">
 					<StackPanel Orientation="Horizontal">
 						<HyperlinkButton x:Name="CurrencyRefreshBlock"
-                                         x:Uid="RefreshButtonText"
-                                         Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
-                                         Click="CurrencyRefreshButton_Click"/>
-						<TextBlock Margin="3,7,0,0" Style="{ThemeResource CaptionTextBlockStyle}">
+										 x:Uid="RefreshButtonText"
+										 Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
+										 Click="CurrencyRefreshButton_Click" />
+						<TextBlock Margin="3,7,0,0"
+								   Style="{ThemeResource CaptionTextBlockStyle}">
                             <Run x:Name="CurrencySecondaryStatus"
-                                 FontWeight="SemiBold"
-                                 Text=""/>
+								 FontWeight="SemiBold"
+								 Text="" />
 						</TextBlock>
 					</StackPanel>
 				</ContentControl>
 
 				<!-- Offline TextBlock -->
 				<ContentControl x:Name="OfflineBlock"
-                                IsTabStop="False"
-                                TabIndex="5"
-                                Visibility="Collapsed">
+								IsTabStop="False"
+								TabIndex="5"
+								Visibility="Collapsed">
 					<TextBlock Style="{ThemeResource CaptionTextBlockStyle}"
-                               Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
-                               AutomationProperties.AccessibilityView="Raw">
-                        <Run x:Name="OfflineRunBeforeLink"/>
+							   Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
+							   AutomationProperties.AccessibilityView="Raw">
+                        <Run x:Name="OfflineRunBeforeLink" />
                         <Hyperlink NavigateUri="ms-settings:network-status">
-                            <Run x:Name="OfflineRunLink"/>
+                            <Run x:Name="OfflineRunLink" />
                         </Hyperlink>
-                        <Run x:Name="OfflineRunAfterLink"/>
+                        <Run x:Name="OfflineRunAfterLink" />
 					</TextBlock>
 				</ContentControl>
 			</StackPanel>
 		</StackPanel>
 
 		<Grid x:Name="ConverterNumPad"
-              Grid.Row="6"
-              Grid.Column="1"
-              Margin="0,0,0,6"
-              FlowDirection="LeftToRight"
-              RenderTransformOrigin="0.5,0.5">
+			  Grid.Row="6"
+			  Grid.Column="1"
+			  Margin="0,0,0,6"
+			  FlowDirection="LeftToRight"
+			  RenderTransformOrigin="0.5,0.5">
 			<Grid.RenderTransform>
-				<CompositeTransform/>
+				<CompositeTransform />
 			</Grid.RenderTransform>
 			<Grid.RowDefinitions>
-				<RowDefinition x:Name="GutterTop" Height="0"/>
-				<RowDefinition Height="1*"/>
-				<RowDefinition Height="1*"/>
-				<RowDefinition Height="1*"/>
-				<RowDefinition Height="1*"/>
-				<RowDefinition Height="1*"/>
-				<RowDefinition x:Name="GutterBottom" Height="0"/>
+				<RowDefinition x:Name="GutterTop"
+							   Height="0" />
+				<RowDefinition Height="1*" />
+				<RowDefinition Height="1*" />
+				<RowDefinition Height="1*" />
+				<RowDefinition Height="1*" />
+				<RowDefinition Height="1*" />
+				<RowDefinition x:Name="GutterBottom"
+							   Height="0" />
 			</Grid.RowDefinitions>
 			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="0.25*"/>
-				<ColumnDefinition Width="1*"/>
-				<ColumnDefinition Width="1*"/>
-				<ColumnDefinition Width="1*"/>
-				<ColumnDefinition Width="0.25*"/>
+				<ColumnDefinition Width="0.25*" />
+				<ColumnDefinition Width="1*" />
+				<ColumnDefinition Width="1*" />
+				<ColumnDefinition Width="1*" />
+				<ColumnDefinition Width="0.25*" />
 			</Grid.ColumnDefinitions>
 			<Grid x:Uid="DisplayControls"
-                  Grid.Row="1"
-                  Grid.Column="2"
-                  Grid.ColumnSpan="2"
-                  AutomationProperties.HeadingLevel="Level1">
+				  Grid.Row="1"
+				  Grid.Column="2"
+				  Grid.ColumnSpan="2"
+				  AutomationProperties.HeadingLevel="Level1">
 				<Grid.ColumnDefinitions>
-					<ColumnDefinition/>
-					<ColumnDefinition/>
+					<ColumnDefinition />
+					<ColumnDefinition />
 				</Grid.ColumnDefinitions>
 				<controls:CalculatorButton x:Name="ClearEntryButtonPos0"
-                                           x:Uid="clearEntryButton"
-                                           HorizontalAlignment="Stretch"
-                                           Style="{StaticResource OperatorButtonStyle}"
-                                           FontSize="16"
-                                           ButtonId="Clear"
-                                           Content="CE"
-                                           TabIndex="7"/>
+										   x:Uid="clearEntryButton"
+										   HorizontalAlignment="Stretch"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   FontSize="16"
+										   ButtonId="Clear"
+										   Content="CE"
+										   TabIndex="7" />
 				<controls:CalculatorButton x:Name="BackSpaceButtonSmall"
-                                           x:Uid="backSpaceButton"
-                                           Grid.Column="1"
-                                           Style="{StaticResource SymbolOperatorButtonStyle}"
-                                           FontSize="16"
-                                           ButtonId="Backspace"
+										   x:Uid="backSpaceButton"
+										   Grid.Column="1"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   FontSize="16"
+										   ButtonId="Backspace"
 										   Content="&#xE94F;"
-                                           TabIndex="8"/>
+										   TabIndex="8" />
 			</Grid>
 
 			<local:NumberPad x:Name="NumberPad"
-                             x:Uid="NumberPad"
-                             Grid.Row="2"
-                             Grid.RowSpan="4"
-                             Grid.Column="1"
-                             Grid.ColumnSpan="3"
-                             VerticalAlignment="Stretch"
-                             AutomationProperties.HeadingLevel="Level1"
-                             ButtonStyle="{StaticResource NumericButtonStyle24}"
-                             TabIndex="10"
-                             TabNavigation="Local"/>
+							 x:Uid="NumberPad"
+							 Grid.Row="2"
+							 Grid.RowSpan="4"
+							 Grid.Column="1"
+							 Grid.ColumnSpan="3"
+							 VerticalAlignment="Stretch"
+							 AutomationProperties.HeadingLevel="Level1"
+							 ButtonStyle="{StaticResource NumericButtonStyle24}"
+							 TabIndex="10"
+							 TabNavigation="Local" />
 			<controls:CalculatorButton x:Name="ConverterNegateButton"
-                                       x:Uid="converterNegateButton"
-                                       Grid.Row="5"
-                                       Grid.Column="1"
-                                       Style="{StaticResource SymbolOperatorButtonStyle}"
-                                       FontSize="16"
-                                       ButtonId="Negate"
-                                       Content="&#xe94d;"
-                                       TabIndex="6"
-                                       Visibility="{x:Bind Model.CurrentCategory.NegateVisibility, Mode=OneWay}"/>
+									   x:Uid="converterNegateButton"
+									   Grid.Row="5"
+									   Grid.Column="1"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   FontSize="16"
+									   ButtonId="Negate"
+									   Content="&#xe94d;"
+									   TabIndex="6"
+									   Visibility="{x:Bind Model.CurrentCategory.NegateVisibility, Mode=OneWay}" />
 		</Grid>
 		<!-- End ConverterNumPad -->
 	</Grid>
diff --git a/src/Calculator.UWP/Package.appxmanifest b/src/Calculator.UWP/Package.appxmanifest
index c47c8418..b1e6cffd 100644
--- a/src/Calculator.UWP/Package.appxmanifest
+++ b/src/Calculator.UWP/Package.appxmanifest
@@ -31,7 +31,7 @@
     <Application Id="App"
       Executable="CalculatorApp.exe" EntryPoint="CalculatorApp.App">
       <uap:VisualElements
-        DisplayName="Calculator"
+        DisplayName="Uno Calc"
         Square150x150Logo="Assets\Square150x150Logo.png"
         Square44x44Logo="Assets\Square44x44Logo.png"
         Description="Windows Calculator"
diff --git a/src/Calculator.iOS/Info.plist b/src/Calculator.iOS/Info.plist
index e6704bf1..4a75e45e 100644
--- a/src/Calculator.iOS/Info.plist
+++ b/src/Calculator.iOS/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
   <dict>
     <key>CFBundleDisplayName</key>
-    <string>Uno Calculator</string>
+    <string>Uno Calc</string>
     <key>CFBundleIdentifier</key>
     <string>uno.platform.calculator</string>
     <key>CFBundleShortVersionString</key>