diff --git a/Limelight/AppDelegate.m b/Limelight/AppDelegate.m
index 5db73f57..41b6c710 100644
--- a/Limelight/AppDelegate.m
+++ b/Limelight/AppDelegate.m
@@ -7,6 +7,7 @@
 //
 
 #import "AppDelegate.h"
+#import "MainFrameViewController.h"
 
 @implementation AppDelegate
 
@@ -22,17 +23,22 @@ static NSString* DB_NAME = @"Moonlight_tvOS.bin";
 static NSString* DB_NAME = @"Limelight_iOS.sqlite";
 #endif
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-#if !TARGET_OS_TV
-    UIApplicationShortcutItem* shortcut = [launchOptions valueForKey:UIApplicationLaunchOptionsShortcutItemKey];
-    if (shortcut != nil) {
-        _pcUuidToLoad = (NSString*)[shortcut.userInfo objectForKey:@"UUID"];
-    }
-#endif
-    return YES;
-}
 
 #if !TARGET_OS_TV
+// orietation limitatioin test
+/*- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window {
+    UIViewController *topController = window.rootViewController;
+    while (topController.presentedViewController) {
+        topController = topController.presentedViewController;
+    }
+    return [topController supportedInterfaceOrientations];
+}*/
+
+- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window {
+        return UIInterfaceOrientationMaskLandscape;
+}
+
+
 - (void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL succeeded))completionHandler {
     _pcUuidToLoad = (NSString*)[shortcutItem.userInfo objectForKey:@"UUID"];
     _shortcutCompletionHandler = completionHandler;
diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index 29676339..03860526 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -892,6 +892,13 @@ static NSMutableSet* hostList;
     }
 }
 
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    // Return the supported interface orientations based on the current state
+    NSLog(@"orchange test");
+    return  UIInterfaceOrientationMaskLandscape;
+}
+
+
 - (void)handleOrientationChange {
     double delayInSeconds = 0.7;
     // Convert the delay into a dispatch_time_t value
@@ -903,6 +910,9 @@ static NSMutableSet* hostList;
 }
 
 - (void)revealController:(SWRevealViewController *)revealController didMoveToPosition:(FrontViewPosition)position {
+    [self setNeedsUpdateOfSupportedInterfaceOrientations];
+
+    
     // If we moved back to the center position, we should save the settings
     SettingsViewController* settingsViewController = (SettingsViewController*)[revealController rearViewController];
     settingsViewController.mainFrameViewController = self;
@@ -1004,10 +1014,10 @@ static NSMutableSet* hostList;
 
 - (void)viewDidLoad
 {
-    [OrientationHelper updateOrientationToLandscape];
+    //[OrientationHelper updateOrientationToLandscape];
+    
     [super viewDidLoad];
     [self attachWaterMark];
-
 #if !TARGET_OS_TV
     _settingsExpandedInStreamView = false; // init this flag