diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index c073cd4f..065e3e8e 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -112,8 +112,8 @@
     <Compile Include="pages\StartPage.xaml.cs">
       <DependentUpon>StartPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="pages\webmail\Webmail.xaml.cs">
-      <DependentUpon>Webmail.xaml</DependentUpon>
+    <Compile Include="pages\webmail\WebmailPage.xaml.cs">
+      <DependentUpon>WebmailPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\AppResources.Designer.cs">
@@ -124,8 +124,6 @@
     <Compile Include="ViewModels\ItemViewModel.cs" />
     <Compile Include="ViewModels\MainViewModel.cs" />
     <Compile Include="model\mensa\MensaViewModel.cs" />
-    <Compile Include="ViewModels\PivotItem1ViewModel.cs" />
-    <Compile Include="ViewModels\PivotItem2ViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -159,9 +157,9 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="pages\webmail\Webmail.xaml">
-      <SubType>Designer</SubType>
+    <Page Include="pages\webmail\WebmailPage.xaml">
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
   <ItemGroup>
diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
index 8788ec1d..f4b319d3 100644
--- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
+++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
@@ -13,7 +13,7 @@
       <Capability Name="ID_CAP_ISV_CAMERA" />
     </Capabilities>
     <Tasks>
-      <DefaultTask Name="_default" NavigationPage="pages/campusmap/CampusMapPage.xaml" />
+      <DefaultTask Name="_default" NavigationPage="pages/StartPage.xaml" />
     </Tasks>
     <Tokens>
       <PrimaryToken TokenID="CampusAppWP8Token" TaskName="_default">
diff --git a/CampusAppWP8/CampusAppWP8/ViewModels/PivotItem1ViewModel.cs b/CampusAppWP8/CampusAppWP8/ViewModels/PivotItem1ViewModel.cs
deleted file mode 100644
index 83db7e3d..00000000
--- a/CampusAppWP8/CampusAppWP8/ViewModels/PivotItem1ViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CampusAppWP8.ViewModels
-{
-    class PivotItem1ViewModel
-    {
-    }
-}
diff --git a/CampusAppWP8/CampusAppWP8/ViewModels/PivotItem2ViewModel.cs b/CampusAppWP8/CampusAppWP8/ViewModels/PivotItem2ViewModel.cs
deleted file mode 100644
index a387d5f7..00000000
--- a/CampusAppWP8/CampusAppWP8/ViewModels/PivotItem2ViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CampusAppWP8.ViewModels
-{
-    class PivotItem2ViewModel
-    {
-    }
-}
diff --git a/CampusAppWP8/CampusAppWP8/pages/webmail/Webmail.xaml b/CampusAppWP8/CampusAppWP8/pages/webmail/WebmailPage.xaml
similarity index 100%
rename from CampusAppWP8/CampusAppWP8/pages/webmail/Webmail.xaml
rename to CampusAppWP8/CampusAppWP8/pages/webmail/WebmailPage.xaml
diff --git a/CampusAppWP8/CampusAppWP8/pages/webmail/Webmail.xaml.cs b/CampusAppWP8/CampusAppWP8/pages/webmail/WebmailPage.xaml.cs
similarity index 100%
rename from CampusAppWP8/CampusAppWP8/pages/webmail/Webmail.xaml.cs
rename to CampusAppWP8/CampusAppWP8/pages/webmail/WebmailPage.xaml.cs