diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
index bc0cb1936..9adfff09d 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
@@ -36,7 +36,9 @@
     <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\AddBasketButton.xaml.cs">
+		<DependentUpon>AddBasketButton.xaml</DependentUpon>
+	</Compile>
     <Compile Include="Controls\CustomTabbedPage.cs" />
     <Compile Include="Controls\ToggleButton.cs" />
     <Compile Include="Behaviors\EventToCommandBehavior.cs" />
@@ -59,23 +61,57 @@
     <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="Views\Templates\BasketItemTemplate.xaml.cs">
+		<DependentUpon>BasketItemTemplate.xaml</DependentUpon>
+	</Compile>
+    <Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
+		<DependentUpon>CampaignTemplate.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\ProductTemplate.xaml.cs">
+		<DependentUpon>ProductTemplate.xaml</DependentUpon>
+	</Compile>
+    <Compile Include="Views\BasketView.xaml.cs">
+		<DependentUpon>BasketView.xaml</DependentUpon>
+	</Compile>
+    <Compile Include="Views\CampaignDetailsView.xaml.cs">
+		<DependentUpon>CampaignDetailsView.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\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="Extensions\ObservableExtension.cs" />
     <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
     <Compile Include="Models\Basket\BasketCheckout.cs" />
@@ -162,57 +198,75 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Controls\AddBasketButton.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\BasketView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\CampaignView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\CatalogView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\SettingsView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\ProfileView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\OrderDetailView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\MainView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\LoginView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+	  <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\FiltersView.xaml">
+	  <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\CustomNavigationView.xaml">
+	  <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\CheckoutView.xaml">
+	  <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>