diff --git a/Limelight/Limelight-Info.plist b/Limelight/Limelight-Info.plist
index ff9d66f..0fa11f2 100644
--- a/Limelight/Limelight-Info.plist
+++ b/Limelight/Limelight-Info.plist
@@ -34,6 +34,8 @@
 	</array>
 	<key>UIStatusBarHidden</key>
 	<true/>
+	<key>UIStatusBarHidden~ipad</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
diff --git a/Limelight/MainFrameViewController.m b/Limelight/MainFrameViewController.m
index 7ad189c..2d25685 100644
--- a/Limelight/MainFrameViewController.m
+++ b/Limelight/MainFrameViewController.m
@@ -173,4 +173,26 @@ static StreamConfiguration* streamConfig;
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
+
+- (BOOL)shouldAutorotate {
+    return YES;
+}
+
+- (NSUInteger)supportedInterfaceOrientations {
+    NSString *deviceType = [UIDevice currentDevice].model;
+    if ([deviceType containsString:@"iPhone"] || [deviceType containsString:@"iPod"]) {
+        return UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown;
+    } else {
+        return UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight;
+    }
+}
+
+- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
+    NSString *deviceType = [UIDevice currentDevice].model;
+    if ([deviceType containsString:@"iPhone"] || [deviceType containsString:@"iPod"]) {
+        return UIInterfaceOrientationPortrait;
+    } else {
+        return UIInterfaceOrientationLandscapeLeft;
+    }
+}
 @end
diff --git a/Limelight/StreamFrameViewController.m b/Limelight/StreamFrameViewController.m
index 4bf4b5b..8514e3f 100644
--- a/Limelight/StreamFrameViewController.m
+++ b/Limelight/StreamFrameViewController.m
@@ -40,4 +40,16 @@
     // Dispose of any resources that can be recreated.
 }
 
+- (BOOL)shouldAutorotate {
+    return YES;
+}
+
+- (NSUInteger)supportedInterfaceOrientations {
+    return UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight;
+}
+
+- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
+    return UIInterfaceOrientationLandscapeLeft;
+}
+
 @end
diff --git a/MainFrame-iPhone.storyboard b/MainFrame-iPhone.storyboard
index ebb9dc2..f21e6c6 100644
--- a/MainFrame-iPhone.storyboard
+++ b/MainFrame-iPhone.storyboard
@@ -50,7 +50,7 @@
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0xb-lk-PHK">
-                                <rect key="frame" x="0.0" y="269" width="320" height="162"/>
+                                <rect key="frame" x="0.0" y="307" width="320" height="162"/>
                                 <connections>
                                     <outlet property="dataSource" destination="dgh-JZ-Q7z" id="R0Y-EX-neJ"/>
                                     <outlet property="delegate" destination="dgh-JZ-Q7z" id="mkk-oI-y7K"/>
@@ -65,8 +65,8 @@
                             <constraint firstAttribute="centerX" secondItem="0xb-lk-PHK" secondAttribute="centerX" id="By0-u3-3MA"/>
                             <constraint firstItem="0xb-lk-PHK" firstAttribute="centerX" secondItem="J5M-pv-UHA" secondAttribute="centerX" id="Gab-EA-Il5"/>
                             <constraint firstItem="unc-nO-WPH" firstAttribute="leading" secondItem="J5M-pv-UHA" secondAttribute="leading" id="Qk0-0J-79M"/>
-                            <constraint firstItem="0xb-lk-PHK" firstAttribute="top" secondItem="J5M-pv-UHA" secondAttribute="bottom" constant="8" id="RNw-zD-7u7"/>
-                            <constraint firstItem="0xb-lk-PHK" firstAttribute="top" secondItem="ATh-Tf-xRL" secondAttribute="bottom" constant="-30" id="TN4-kv-Yli"/>
+                            <constraint firstItem="0xb-lk-PHK" firstAttribute="top" secondItem="J5M-pv-UHA" secondAttribute="bottom" constant="46" id="RNw-zD-7u7"/>
+                            <constraint firstItem="0xb-lk-PHK" firstAttribute="top" secondItem="ATh-Tf-xRL" secondAttribute="bottom" constant="8" id="TN4-kv-Yli"/>
                             <constraint firstItem="J5M-pv-UHA" firstAttribute="top" secondItem="nFR-to-qQs" secondAttribute="bottom" constant="-5" id="Vcz-ix-cdp"/>
                             <constraint firstItem="nFR-to-qQs" firstAttribute="top" secondItem="0HR-9w-kvY" secondAttribute="bottom" id="XWH-Vw-VfH"/>
                             <constraint firstItem="0xb-lk-PHK" firstAttribute="centerX" secondItem="ATh-Tf-xRL" secondAttribute="centerX" id="bEv-zi-oip"/>