diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
index 4e3573d2..22532320 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
@@ -29,7 +29,7 @@
                 <phone:PanoramaItem Name="Item1">
                 <ScrollViewer Name="scoller1"  Margin="12 -24 12 0">
                     <StackPanel>
-                        <lui:NavigateButton Name="TimeTableAppButton" Style="{StaticResource StartPageButtonLong}" Grid.Column="0" Url="{Binding Path=Constants.PathTimeTable_Day, Source={StaticResource Const}}">
+                        <lui:NavigateButton x:Name="TimeTableAppButton" Style="{StaticResource StartPageButtonLong}" Grid.Column="0" Url="{Binding Path=Constants.PathTimeTable_Day, Source={StaticResource Const}}" Click="TimeTable_Click">
                             <StackPanel Style="{StaticResource StartPageStackPanelStyleLong}">
                                 <StackPanel Background="{StaticResource PhoneAccentBrush}" Margin="0 0 12 0">
                                     <Image Source="{Binding Path=ThemelizedIcon.Schedule, Source={StaticResource ThemelizedIcons}}" Style="{StaticResource StartPageButtonImgLong}"/>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
index 8f103089..0d93b06d 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
@@ -347,6 +347,23 @@ namespace CampusAppWP8.Pages
 
         #endregion
 
+        private void TimeTable_Click(object sender, RoutedEventArgs e)
+        {
+            if(this.Orientation.Equals(PageOrientation.Landscape)
+            || this.Orientation.Equals(PageOrientation.LandscapeLeft)
+            || this.Orientation.Equals(PageOrientation.LandscapeRight))
+            {
+                this.TimeTableAppButton.Url = Constants.PathTimeTable_Week;
+            }
+            else
+            if(this.Orientation.Equals(PageOrientation.Portrait)
+            || this.Orientation.Equals(PageOrientation.PortraitDown)
+            || this.Orientation.Equals(PageOrientation.PortraitUp))
+            {
+                this.TimeTableAppButton.Url = Constants.PathTimeTable_Day;
+            }
+        }
+
         #endregion
     }
 }
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml
index 2462168c..827aa3c0 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml
@@ -11,15 +11,16 @@
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
-    SupportedOrientations="Portrait"  Orientation="Portrait"
-    shell:SystemTray.IsVisible="True">
+    SupportedOrientations="PortraitOrLandscape"  Orientation="Portrait"
+    shell:SystemTray.IsVisible="True"
+    OrientationChanged="PhoneApplicationPage_OrientationChanged">
 
     <!--LayoutRoot ist das Stammraster, in dem alle anderen Seiteninhalte platziert werden-->
     <Grid x:Name="LayoutRoot" Background="Transparent">
         <phone:Pivot x:Name="ThePivot" Title="{Binding Path=LocalizedResources.TimeTableApp_Title, Source={StaticResource LocalizedStrings}}">
             <phone:Pivot.HeaderTemplate>
                 <DataTemplate>
-                    <Border BorderThickness="0" Width="440">
+                    <Border BorderThickness="0" MinWidth="360">
                         <TextBlock Text="{Binding Path=Day, Mode=OneWay, StringFormat='ddd dd.MM.yy'}"/>
                     </Border>
                 </DataTemplate>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml.cs
index 9d175186..0b1998ba 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml.cs
@@ -329,5 +329,15 @@ namespace CampusAppWP8.Pages.TimeTable
                 }
             }
         }
+
+        private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)
+        {
+            if(e.Orientation.Equals(PageOrientation.Landscape)
+            || e.Orientation.Equals(PageOrientation.LandscapeLeft)
+            || e.Orientation.Equals(PageOrientation.LandscapeRight))
+            {
+                NavigationService.Navigate(new Uri(Constants.PathTimeTable_Week, UriKind.Relative));
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml
index 9a39756a..f72c89ba 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml
@@ -11,10 +11,10 @@
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
-    SupportedOrientations="Landscape" Orientation="Landscape"
+    SupportedOrientations="PortraitOrLandscape" Orientation="Landscape"
     mc:Ignorable="d"
     shell:SystemTray.IsVisible="True"
-    >
+    OrientationChanged="PhoneApplicationPage_OrientationChanged">
 
     <!--LayoutRoot ist das Stammraster, in dem alle anderen Seiteninhalte platziert werden-->
     <Grid x:Name="LayoutRoot" Background="Transparent">
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs
index 5b0f6c4c..4dfe2080 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs
@@ -391,5 +391,15 @@ namespace CampusAppWP8.Pages.TimeTable
                 }
             }
         }
+
+        private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)
+        {
+            if (e.Orientation.Equals(PageOrientation.Portrait)
+            || e.Orientation.Equals(PageOrientation.PortraitDown)
+            || e.Orientation.Equals(PageOrientation.PortraitUp))
+            {
+                NavigationService.Navigate(new Uri(Constants.PathTimeTable_Day, UriKind.Relative));
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/NavigateButton.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/NavigateButton.cs
index 9a03e8a9..5eec4a12 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/NavigateButton.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/NavigateButton.cs
@@ -76,7 +76,22 @@ namespace CampusAppWP8.Utility.Lui.Button
         /// <seealso cref="M:System.Windows.Controls.Button.OnClick()"/>
         protected override void OnClick()
         {
-            string urlString = this.Url as string;
+            base.OnClick();
+
+            string urlString = string.Empty;
+
+            if (this.Url is string)
+            {
+                urlString = this.Url as string;
+            }
+            else if (this.Url is Uri)
+            {
+                urlString = ((Uri)this.Url).OriginalString;
+            }
+            else
+            {
+                throw new NotSupportedException("Url has a unsupported type");
+            }
 
             if (this.QuerryStringName != null && this.QuerryStringValue != null)
             {
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs
index 810cd1be..86907d6b 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs
@@ -40,7 +40,7 @@ namespace CampusAppWPortalLib8.Model.Utility
         {
             if (userSettings)
             {
-                this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.UserSettingCampus).ToString(), AppResources.Campus_UserSetting);
+                this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.UserSettingCampus).ToString(), AppResources.Campus_UserSetting));
             }
 
             this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN).ToString(), AppResources.Campus_CBMain));