diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
index 9b2619bc9..e31d06f37 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
@@ -1,72 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid>
+    <ProjectGuid>{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}</ProjectGuid>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <UseMSBuildEngine>true</UseMSBuildEngine>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>eShopOnContainers.Core</RootNamespace>
     <AssemblyName>eShopOnContainers.Core</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
     <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Animations\Base\AnimationBase.cs" />
-    <Compile Include="Animations\Base\EasingType.cs" />
-    <Compile Include="Animations\FadeToAnimation.cs" />
-    <Compile Include="Animations\StoryBoard.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Behaviors\Base\BindableBehavior.cs" />
-    <Compile Include="Behaviors\EventToCommandBehavior.cs" />
-    <Compile Include="Controls\AddBasketButton.xaml.cs">
-      <DependentUpon>AddBasketButton.xaml</DependentUpon>
-    </Compile>
+    <Compile Include="Animations\FadeToAnimation.cs" />
+    <Compile Include="Animations\StoryBoard.cs" />
+    <Compile Include="Animations\Base\AnimationBase.cs" />
+    <Compile Include="Animations\Base\EasingType.cs" />
+    <Compile Include="Controls\AddBasketButton.xaml.cs" />
     <Compile Include="Controls\CustomTabbedPage.cs" />
     <Compile Include="Controls\ToggleButton.cs" />
-    <Compile Include="Converters\DoubleConverter.cs" />
-    <Compile Include="Converters\StringNullOrEmptyBoolConverter.cs" />
+    <Compile Include="Behaviors\EventToCommandBehavior.cs" />
+    <Compile Include="Behaviors\LineColorBehavior.cs" />
+    <Compile Include="Behaviors\Base\BindableBehavior.cs" />
     <Compile Include="Converters\CountToBoolConverter.cs" />
     <Compile Include="Converters\DatetimeConverter.cs" />
+    <Compile Include="Converters\DoubleConverter.cs" />
+    <Compile Include="Converters\FirstValidationErrorConverter.cs" />
     <Compile Include="Converters\ImageConverter.cs" />
     <Compile Include="Converters\InverseBoolConverter.cs" />
     <Compile Include="Converters\InverseCountToBoolConverter.cs" />
     <Compile Include="Converters\ItemsToHeightConverter.cs" />
     <Compile Include="Converters\ItemTappedEventArgsConverter.cs" />
+    <Compile Include="Converters\StringNullOrEmptyBoolConverter.cs" />
     <Compile Include="Converters\ToUpperConverter.cs" />
     <Compile Include="Converters\WebNavigatedEventArgsConverter.cs" />
-    <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
-    <Compile Include="Extensions\ObservableExtension.cs" />
-    <Compile Include="GlobalSettings.cs" />
+    <Compile Include="Converters\WebNavigatingEventArgsConverter.cs" />
     <Compile Include="Helpers\EasingHelper.cs" />
     <Compile Include="Helpers\RandomNumberGenerator.cs" />
     <Compile Include="Helpers\ServicesHelper.cs" />
     <Compile Include="Helpers\Settings.cs" />
+    <Compile Include="Views\Templates\BasketItemTemplate.xaml.cs" />
+    <Compile Include="Views\Templates\CampaignTemplate.xaml.cs" />
+    <Compile Include="Views\Templates\OrderItemTemplate.xaml.cs" />
+    <Compile Include="Views\Templates\OrderTemplate.xaml.cs" />
+    <Compile Include="Views\Templates\ProductTemplate.xaml.cs" />
+    <Compile Include="Views\BasketView.xaml.cs" />
+    <Compile Include="Views\CampaignDetailsView.xaml.cs" />
+    <Compile Include="Views\CampaignView.xaml.cs" />
+    <Compile Include="Views\CatalogView.xaml.cs" />
+    <Compile Include="Views\CheckoutView.xaml.cs" />
+    <Compile Include="Views\CustomNavigationView.xaml.cs" />
+    <Compile Include="Views\FiltersView.xaml.cs" />
+    <Compile Include="Views\LoginView.xaml.cs" />
+    <Compile Include="Views\MainView.xaml.cs" />
+    <Compile Include="Views\OrderDetailView.xaml.cs" />
+    <Compile Include="Views\ProfileView.xaml.cs" />
+    <Compile Include="Views\SettingsView.xaml.cs" />
+    <Compile Include="Extensions\ObservableExtension.cs" />
+    <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
     <Compile Include="Models\Basket\BasketCheckout.cs" />
     <Compile Include="Models\Basket\BasketItem.cs" />
     <Compile Include="Models\Basket\CustomerBasket.cs" />
@@ -75,6 +86,7 @@
     <Compile Include="Models\Catalog\CatalogRoot.cs" />
     <Compile Include="Models\Catalog\CatalogType.cs" />
     <Compile Include="Models\Location\Location.cs" />
+    <Compile Include="Models\Marketing\Campaign.cs" />
     <Compile Include="Models\Marketing\CampaignItem.cs" />
     <Compile Include="Models\Marketing\CampaignRoot.cs" />
     <Compile Include="Models\Navigation\TabParameter.cs" />
@@ -83,11 +95,12 @@
     <Compile Include="Models\Orders\Order.cs" />
     <Compile Include="Models\Orders\OrderItem.cs" />
     <Compile Include="Models\Orders\OrderStatus.cs" />
+    <Compile Include="Models\Token\UserToken.cs" />
     <Compile Include="Models\User\Address.cs" />
     <Compile Include="Models\User\LogoutParameter.cs" />
     <Compile Include="Models\User\PaymentInfo.cs" />
     <Compile Include="Models\User\UserInfo.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Triggers\BeginAnimation.cs" />
     <Compile Include="Services\Basket\BasketMockService.cs" />
     <Compile Include="Services\Basket\BasketService.cs" />
     <Compile Include="Services\Basket\IBasketService.cs" />
@@ -101,9 +114,9 @@
     <Compile Include="Services\Identity\IIdentityService.cs" />
     <Compile Include="Services\Location\ILocationService.cs" />
     <Compile Include="Services\Location\LocationService.cs" />
-    <Compile Include="Services\Marketing\ICampaignService.cs" />
     <Compile Include="Services\Marketing\CampaignMockService.cs" />
     <Compile Include="Services\Marketing\CampaignService.cs" />
+    <Compile Include="Services\Marketing\ICampaignService.cs" />
     <Compile Include="Services\Navigation\INavigationService.cs" />
     <Compile Include="Services\Navigation\NavigationService.cs" />
     <Compile Include="Services\OpenUrl\IOpenUrlService.cs" />
@@ -117,11 +130,6 @@
     <Compile Include="Services\User\IUserService.cs" />
     <Compile Include="Services\User\UserMockService.cs" />
     <Compile Include="Services\User\UserService.cs" />
-    <Compile Include="Triggers\BeginAnimation.cs" />
-    <Compile Include="Validations\IsNotNullOrEmptyRule.cs" />
-    <Compile Include="Validations\IValidationRule.cs" />
-    <Compile Include="Validations\IValidity.cs" />
-    <Compile Include="Validations\ValidatableObject.cs" />
     <Compile Include="ViewModels\Base\ExtendedBindableObject.cs" />
     <Compile Include="ViewModels\Base\MessageKeys.cs" />
     <Compile Include="ViewModels\Base\ViewModelBase.cs" />
@@ -136,187 +144,92 @@
     <Compile Include="ViewModels\OrderDetailViewModel.cs" />
     <Compile Include="ViewModels\ProfileViewModel.cs" />
     <Compile Include="ViewModels\SettingsViewModel.cs" />
-    <Compile Include="Views\BasketView.xaml.cs">
-      <DependentUpon>BasketView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CampaignView.xaml.cs">
-      <DependentUpon>CampaignView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CatalogView.xaml.cs">
-      <DependentUpon>CatalogView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CampaignDetailsView.xaml.cs">
-      <DependentUpon>CampaignDetailsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CheckoutView.xaml.cs">
-      <DependentUpon>CheckoutView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomNavigationView.xaml.cs">
-      <DependentUpon>CustomNavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\FiltersView.xaml.cs">
-      <DependentUpon>FiltersView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\LoginView.xaml.cs">
-      <DependentUpon>LoginView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainView.xaml.cs">
-      <DependentUpon>MainView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\OrderDetailView.xaml.cs">
-      <DependentUpon>OrderDetailView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ProfileView.xaml.cs">
-      <DependentUpon>ProfileView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SettingsView.xaml.cs">
-      <DependentUpon>SettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\BasketItemTemplate.xaml.cs">
-      <DependentUpon>BasketItemTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\OrderItemTemplate.xaml.cs">
-      <DependentUpon>OrderItemTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\OrderTemplate.xaml.cs">
-      <DependentUpon>OrderTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
-      <DependentUpon>CampaignTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\ProductTemplate.xaml.cs">
-      <DependentUpon>ProductTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Converters\WebNavigatingEventArgsConverter.cs" />
-    <Compile Include="Converters\FirstValidationErrorConverter.cs" />
     <Compile Include="Effects\EntryLineColorEffect.cs" />
-    <Compile Include="Behaviors\LineColorBehavior.cs" />
-    <Compile Include="Models\Token\UserToken.cs" />
     <Compile Include="Effects\ThemeEffects.cs" />
+    <Compile Include="Validations\IsNotNullOrEmptyRule.cs" />
+    <Compile Include="Validations\IValidationRule.cs" />
+    <Compile Include="Validations\IValidity.cs" />
+    <Compile Include="Validations\ValidatableObject.cs" />
+    <Compile Include="GlobalSettings.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Controls\AddBasketButton.xaml">
+    <EmbeddedResource Include="App.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Include="Controls\AddBasketButton.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
-      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
-      <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
-      <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
-      <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Views\BasketView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CatalogView.xaml">
-      <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CheckoutView.xaml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CustomNavigationView.xaml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Views\CampaignView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\FiltersView.xaml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Views\CatalogView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\LoginView.xaml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Views\SettingsView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\MainView.xaml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Views\ProfileView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Views\OrderDetailView.xaml">
-      <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\ProfileView.xaml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Views\MainView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\SettingsView.xaml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Views\LoginView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="App.xaml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Views\FiltersView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CampaignView.xaml">
+    <EmbeddedResource Include="Views\CustomNavigationView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
+    <EmbeddedResource Include="Views\CheckoutView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <Folder Include="Animations\" />
+    <Folder Include="Behaviors\" />
+    <Folder Include="Animations\Base\" />
+    <Folder Include="Controls\" />
+    <Folder Include="Helpers\" />
+    <Folder Include="Views\" />
+    <Folder Include="ViewModels\" />
+    <Folder Include="Services\" />
+    <Folder Include="Behaviors\Base\" />
+    <Folder Include="Converters\" />
+    <Folder Include="Validations\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
-  </Target>
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.270\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.270\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
index eaa53c623..cbf2a07ea 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
@@ -1,15 +1,15 @@
 #pragma warning disable 1591
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 4.0.30319.42000
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
 
-[assembly: Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.TestRunner.Droid.Resource", IsApplication=true)]
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.TestRunner.Droid.Resource", IsApplication=true)]
 
 namespace eShopOnContainers.TestRunner.Droid
 {
@@ -4297,8 +4297,7 @@ namespace eShopOnContainers.TestRunner.Droid
 		public partial class Styleable
 		{
 			
-			public static int[] ActionBar = new int[]
-			{
+			public static int[] ActionBar = new int[] {
 					2130772007,
 					2130772009,
 					2130772010,
@@ -4408,15 +4407,13 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 5
 			public const int ActionBar_titleTextStyle = 5;
 			
-			public static int[] ActionBarLayout = new int[]
-			{
+			public static int[] ActionBarLayout = new int[] {
 					16842931};
 			
 			// aapt resource value: 0
 			public const int ActionBarLayout_android_layout_gravity = 0;
 			
-			public static int[] ActionMenuItemView = new int[]
-			{
+			public static int[] ActionMenuItemView = new int[] {
 					16843071};
 			
 			// aapt resource value: 0
@@ -4424,8 +4421,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			
 			public static int[] ActionMenuView;
 			
-			public static int[] ActionMode = new int[]
-			{
+			public static int[] ActionMode = new int[] {
 					2130772007,
 					2130772013,
 					2130772014,
@@ -4451,8 +4447,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int ActionMode_titleTextStyle = 1;
 			
-			public static int[] ActivityChooserView = new int[]
-			{
+			public static int[] ActivityChooserView = new int[] {
 					2130772035,
 					2130772036};
 			
@@ -4462,8 +4457,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 0
 			public const int ActivityChooserView_initialActivityCount = 0;
 			
-			public static int[] AlertDialog = new int[]
-			{
+			public static int[] AlertDialog = new int[] {
 					16842994,
 					2130772037,
 					2130772038,
@@ -4489,8 +4483,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int AlertDialog_singleChoiceItemLayout = 4;
 			
-			public static int[] AppBarLayout = new int[]
-			{
+			public static int[] AppBarLayout = new int[] {
 					16842964,
 					2130772032,
 					2130772215};
@@ -4504,8 +4497,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int AppBarLayout_expanded = 2;
 			
-			public static int[] AppBarLayout_LayoutParams = new int[]
-			{
+			public static int[] AppBarLayout_LayoutParams = new int[] {
 					2130772216,
 					2130772217};
 			
@@ -4515,8 +4507,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int AppBarLayout_LayoutParams_layout_scrollInterpolator = 1;
 			
-			public static int[] AppCompatImageView = new int[]
-			{
+			public static int[] AppCompatImageView = new int[] {
 					16843033,
 					2130772042};
 			
@@ -4526,8 +4517,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int AppCompatImageView_srcCompat = 1;
 			
-			public static int[] AppCompatTextView = new int[]
-			{
+			public static int[] AppCompatTextView = new int[] {
 					16842804,
 					2130772043};
 			
@@ -4537,8 +4527,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int AppCompatTextView_textAllCaps = 1;
 			
-			public static int[] AppCompatTheme = new int[]
-			{
+			public static int[] AppCompatTheme = new int[] {
 					16842839,
 					16842926,
 					2130772044,
@@ -4988,8 +4977,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 3
 			public const int AppCompatTheme_windowNoTitle = 3;
 			
-			public static int[] BottomSheetBehavior_Params = new int[]
-			{
+			public static int[] BottomSheetBehavior_Params = new int[] {
 					2130772218,
 					2130772219};
 			
@@ -4999,15 +4987,13 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 0
 			public const int BottomSheetBehavior_Params_behavior_peekHeight = 0;
 			
-			public static int[] ButtonBarLayout = new int[]
-			{
+			public static int[] ButtonBarLayout = new int[] {
 					2130772154};
 			
 			// aapt resource value: 0
 			public const int ButtonBarLayout_allowStacking = 0;
 			
-			public static int[] CardView = new int[]
-			{
+			public static int[] CardView = new int[] {
 					16843071,
 					16843072,
 					2130771995,
@@ -5061,8 +5047,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 11
 			public const int CardView_contentPaddingTop = 11;
 			
-			public static int[] CollapsingAppBarLayout_LayoutParams = new int[]
-			{
+			public static int[] CollapsingAppBarLayout_LayoutParams = new int[] {
 					2130772220,
 					2130772221};
 			
@@ -5072,8 +5057,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = 1;
 			
-			public static int[] CollapsingToolbarLayout = new int[]
-			{
+			public static int[] CollapsingToolbarLayout = new int[] {
 					2130772009,
 					2130772222,
 					2130772223,
@@ -5131,8 +5115,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 10
 			public const int CollapsingToolbarLayout_toolbarId = 10;
 			
-			public static int[] CompoundButton = new int[]
-			{
+			public static int[] CompoundButton = new int[] {
 					16843015,
 					2130772155,
 					2130772156};
@@ -5146,8 +5129,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int CompoundButton_buttonTintMode = 2;
 			
-			public static int[] CoordinatorLayout = new int[]
-			{
+			public static int[] CoordinatorLayout = new int[] {
 					2130772235,
 					2130772236};
 			
@@ -5157,8 +5139,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int CoordinatorLayout_statusBarBackground = 1;
 			
-			public static int[] CoordinatorLayout_LayoutParams = new int[]
-			{
+			public static int[] CoordinatorLayout_LayoutParams = new int[] {
 					16842931,
 					2130772237,
 					2130772238,
@@ -5180,8 +5161,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 3
 			public const int CoordinatorLayout_LayoutParams_layout_keyline = 3;
 			
-			public static int[] DesignTheme = new int[]
-			{
+			public static int[] DesignTheme = new int[] {
 					2130772241,
 					2130772242,
 					2130772243};
@@ -5195,8 +5175,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int DesignTheme_textColorError = 2;
 			
-			public static int[] DrawerArrowToggle = new int[]
-			{
+			public static int[] DrawerArrowToggle = new int[] {
 					2130772157,
 					2130772158,
 					2130772159,
@@ -5230,8 +5209,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 7
 			public const int DrawerArrowToggle_thickness = 7;
 			
-			public static int[] FloatingActionButton = new int[]
-			{
+			public static int[] FloatingActionButton = new int[] {
 					2130772032,
 					2130772213,
 					2130772214,
@@ -5265,8 +5243,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 7
 			public const int FloatingActionButton_useCompatPadding = 7;
 			
-			public static int[] ForegroundLinearLayout = new int[]
-			{
+			public static int[] ForegroundLinearLayout = new int[] {
 					16843017,
 					16843264,
 					2130772249};
@@ -5280,8 +5257,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
 			
-			public static int[] LinearLayoutCompat = new int[]
-			{
+			public static int[] LinearLayoutCompat = new int[] {
 					16842927,
 					16842948,
 					16843046,
@@ -5319,8 +5295,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 7
 			public const int LinearLayoutCompat_showDividers = 7;
 			
-			public static int[] LinearLayoutCompat_Layout = new int[]
-			{
+			public static int[] LinearLayoutCompat_Layout = new int[] {
 					16842931,
 					16842996,
 					16842997,
@@ -5338,8 +5313,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int LinearLayoutCompat_Layout_android_layout_width = 1;
 			
-			public static int[] ListPopupWindow = new int[]
-			{
+			public static int[] ListPopupWindow = new int[] {
 					16843436,
 					16843437};
 			
@@ -5349,8 +5323,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
 			
-			public static int[] MediaRouteButton = new int[]
-			{
+			public static int[] MediaRouteButton = new int[] {
 					16843071,
 					16843072,
 					2130771994};
@@ -5364,8 +5337,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int MediaRouteButton_externalRouteEnabledDrawable = 2;
 			
-			public static int[] MenuGroup = new int[]
-			{
+			public static int[] MenuGroup = new int[] {
 					16842766,
 					16842960,
 					16843156,
@@ -5391,8 +5363,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int MenuGroup_android_visible = 2;
 			
-			public static int[] MenuItem = new int[]
-			{
+			public static int[] MenuItem = new int[] {
 					16842754,
 					16842766,
 					16842960,
@@ -5462,8 +5433,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 13
 			public const int MenuItem_showAsAction = 13;
 			
-			public static int[] MenuView = new int[]
-			{
+			public static int[] MenuView = new int[] {
 					16842926,
 					16843052,
 					16843053,
@@ -5497,8 +5467,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 7
 			public const int MenuView_preserveIconSpacing = 7;
 			
-			public static int[] NavigationView = new int[]
-			{
+			public static int[] NavigationView = new int[] {
 					16842964,
 					16842973,
 					16843039,
@@ -5540,8 +5509,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int NavigationView_menu = 4;
 			
-			public static int[] PopupWindow = new int[]
-			{
+			public static int[] PopupWindow = new int[] {
 					16843126,
 					2130772173};
 			
@@ -5551,15 +5519,13 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int PopupWindow_overlapAnchor = 1;
 			
-			public static int[] PopupWindowBackgroundState = new int[]
-			{
+			public static int[] PopupWindowBackgroundState = new int[] {
 					2130772174};
 			
 			// aapt resource value: 0
 			public const int PopupWindowBackgroundState_state_above_anchor = 0;
 			
-			public static int[] ProgressWheel = new int[]
-			{
+			public static int[] ProgressWheel = new int[] {
 					2130772284,
 					2130772285,
 					2130772286,
@@ -5609,8 +5575,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int ProgressWheel_ahTextSize = 2;
 			
-			public static int[] RecyclerView = new int[]
-			{
+			public static int[] RecyclerView = new int[] {
 					16842948,
 					2130771968,
 					2130771969,
@@ -5632,22 +5597,19 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int RecyclerView_stackFromEnd = 4;
 			
-			public static int[] ScrimInsetsFrameLayout = new int[]
-			{
+			public static int[] ScrimInsetsFrameLayout = new int[] {
 					2130772256};
 			
 			// aapt resource value: 0
 			public const int ScrimInsetsFrameLayout_insetForeground = 0;
 			
-			public static int[] ScrollingViewBehavior_Params = new int[]
-			{
+			public static int[] ScrollingViewBehavior_Params = new int[] {
 					2130772257};
 			
 			// aapt resource value: 0
 			public const int ScrollingViewBehavior_Params_behavior_overlapTop = 0;
 			
-			public static int[] SearchView = new int[]
-			{
+			public static int[] SearchView = new int[] {
 					16842970,
 					16843039,
 					16843296,
@@ -5717,8 +5679,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 12
 			public const int SearchView_voiceIcon = 12;
 			
-			public static int[] SnackbarLayout = new int[]
-			{
+			public static int[] SnackbarLayout = new int[] {
 					16843039,
 					2130772032,
 					2130772258};
@@ -5732,8 +5693,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int SnackbarLayout_maxActionInlineWidth = 2;
 			
-			public static int[] Spinner = new int[]
-			{
+			public static int[] Spinner = new int[] {
 					16842930,
 					16843126,
 					16843131,
@@ -5755,8 +5715,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int Spinner_popupTheme = 4;
 			
-			public static int[] SwitchCompat = new int[]
-			{
+			public static int[] SwitchCompat = new int[] {
 					16843044,
 					16843045,
 					16843074,
@@ -5798,8 +5757,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 3
 			public const int SwitchCompat_track = 3;
 			
-			public static int[] TabItem = new int[]
-			{
+			public static int[] TabItem = new int[] {
 					16842754,
 					16842994,
 					16843087};
@@ -5813,8 +5771,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int TabItem_android_text = 2;
 			
-			public static int[] TabLayout = new int[]
-			{
+			public static int[] TabLayout = new int[] {
 					2130772259,
 					2130772260,
 					2130772261,
@@ -5880,8 +5837,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 9
 			public const int TabLayout_tabTextColor = 9;
 			
-			public static int[] TextAppearance = new int[]
-			{
+			public static int[] TextAppearance = new int[] {
 					16842901,
 					16842902,
 					16842903,
@@ -5919,8 +5875,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 8
 			public const int TextAppearance_textAllCaps = 8;
 			
-			public static int[] TextInputLayout = new int[]
-			{
+			public static int[] TextInputLayout = new int[] {
 					16842906,
 					16843088,
 					2130772275,
@@ -5966,8 +5921,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int TextInputLayout_hintTextAppearance = 2;
 			
-			public static int[] Toolbar = new int[]
-			{
+			public static int[] Toolbar = new int[] {
 					16842927,
 					16843072,
 					2130772009,
@@ -6069,8 +6023,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 23
 			public const int Toolbar_titleTextColor = 23;
 			
-			public static int[] View = new int[]
-			{
+			public static int[] View = new int[] {
 					16842752,
 					16842970,
 					2130772210,
@@ -6092,8 +6045,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int View_theme = 4;
 			
-			public static int[] ViewBackgroundHelper = new int[]
-			{
+			public static int[] ViewBackgroundHelper = new int[] {
 					16842964,
 					2130772213,
 					2130772214};
@@ -6107,8 +6059,7 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int ViewBackgroundHelper_backgroundTintMode = 2;
 			
-			public static int[] ViewStubCompat = new int[]
-			{
+			public static int[] ViewStubCompat = new int[] {
 					16842960,
 					16842994,
 					16842995};
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
index fd8c23eca..e69a6340b 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F7B6A162-BC4D-4924-B16A-713F9B0344E7}</ProjectGuid>
+    <ProjectGuid>{6E4285E7-7611-4440-A1B5-3513EBB13807}</ProjectGuid>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <UseMSBuildEngine>true</UseMSBuildEngine>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>eShopOnContainers.UnitTests</RootNamespace>
     <AssemblyName>eShopOnContainers.UnitTests</AssemblyName>
-    <DefaultLanguage>es-ES</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
   </PropertyGroup>
@@ -20,52 +16,46 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Mocks\MockEventToCommandBehavior.cs" />
-    <Compile Include="Services\BasketServiceTests.cs" />
-    <Compile Include="Services\CatalogServiceTests.cs" />
-    <Compile Include="Services\MarketingServiceTests.cs" />
     <Compile Include="ViewModels\CatalogViewModelTests.cs" />
     <Compile Include="ViewModels\MainViewModelTests.cs" />
     <Compile Include="ViewModels\MarketingViewModelTests.cs" />
+    <Compile Include="ViewModels\MockViewModelTests.cs" />
     <Compile Include="ViewModels\OrderViewModelTests.cs" />
+    <Compile Include="Services\BasketServiceTests.cs" />
+    <Compile Include="Services\CatalogServiceTests.cs" />
+    <Compile Include="Services\MarketingServiceTests.cs" />
     <Compile Include="Services\OrdersServiceTests.cs" />
-    <Compile Include="Behaviors\EventToCommandBehaviorTests.cs" />
+    <Compile Include="Mocks\MockEventToCommandBehavior.cs" />
     <Compile Include="Mocks\MockViewModel.cs" />
-    <Compile Include="ViewModels\MockViewModelTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="project.json" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Mocks\" />
+    <Folder Include="Services\" />
+    <Folder Include="ViewModels\" />
+    <Folder Include="Behaviors\" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
-      <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
+      <Project>{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}</Project>
       <Name>eShopOnContainers.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/LaunchScreen.storyboard b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/LaunchScreen.storyboard
index 2a0cc5633..b071203b7 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/LaunchScreen.storyboard
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/LaunchScreen.storyboard
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="X5k-f2-b5h">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="X5k-f2-b5h">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -16,12 +17,12 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="Logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="23" misplaced="YES">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="Logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="23">
                                 <rect key="frame" x="270" y="270" width="60" height="60"/>
                                 <rect key="contentStretch" x="0.0" y="0.0" width="0.0" height="0.0"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" colorSpace="calibratedRGB" red="0.11764705882352941" green="0.6470588235294118" blue="0.615686274509804" alpha="1"/>
+                        <color key="backgroundColor" red="0.11764705882352941" green="0.6470588235294118" blue="0.61568627450980395" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="23" firstAttribute="centerY" secondItem="yd7-JS-zBw" secondAttribute="centerY" priority="1" id="39"/>
                             <constraint firstItem="23" firstAttribute="centerX" secondItem="yd7-JS-zBw" secondAttribute="centerX" priority="1" id="41"/>
@@ -34,22 +35,30 @@
         </scene>
     </scenes>
     <resources>
+        <image name="Logo.png" width="152" height="152"/>
         <image name="Icon-60.png" width="60" height="60"/>
-        <image name="app_settings.png" width="44" height="44"/>
-        <image name="Default.png" width="320" height="480"/>
+        <image name="Icon-Small-40.png" width="40" height="40"/>
+        <image name="Icon-Small.png" width="29" height="29"/>
         <image name="fake_product_01.png" width="650" height="500"/>
-        <image name="fake_product_02.png" width="650" height="500"/>
         <image name="fake_product_03.png" width="650" height="500"/>
+        <image name="fake_product_02.png" width="650" height="500"/>
         <image name="fake_product_04.png" width="650" height="427"/>
         <image name="fake_product_05.png" width="650" height="500"/>
-        <image name="Icon-Small-40.png" width="40" height="40"/>
-        <image name="Icon-Small.png" width="29" height="29"/>
         <image name="menu_cart.png" width="17" height="15"/>
         <image name="menu_filter.png" width="12" height="11"/>
         <image name="menu_profile.png" width="13" height="13"/>
         <image name="product_add.png" width="10" height="10"/>
+        <image name="app_settings.png" width="44" height="44"/>
         <image name="switchOff.png" width="23" height="11"/>
         <image name="switchOn.png" width="23" height="11"/>
-        <image name="Logo.png" width="152" height="152"/>
+        <image name="Default.png" width="320" height="480"/>
+        <image name="noimage.png" width="650" height="500"/>
+        <image name="default_product.png" width="650" height="500"/>
+        <image name="banner.png" width="500" height="632"/>
+        <image name="Default-568h.png" width="320" height="568"/>
+        <image name="Default-Portrait.png" width="768" height="1024"/>
+        <image name="Icon-76.png" width="76" height="76"/>
+        <image name="fake_campaign_01.png" width="370" height="241"/>
+        <image name="fake_campaign_02.png" width="372" height="243"/>
     </resources>
 </document>
\ No newline at end of file