diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index a83253c5..b979720b 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -1119,25 +1119,17 @@ static NSMutableSet* hostList;
     
     //[settingsViewController.resolutionSelector setEnabled:!self.settingsExpandedInStreamView];
     settingsViewController.resolutionStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController.framerateSelector setEnabled:!self.settingsExpandedInStreamView];
     settingsViewController.fpsStack.hidden = self.settingsExpandedInStreamView;
     [settingsViewController widget:settingsViewController.bitrateSlider setEnabled:!self.settingsExpandedInStreamView];
     //settingsViewController.bitrateStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController.optimizeSettingsSelector setEnabled:!self.settingsExpandedInStreamView];
     settingsViewController.optimizeSettingsStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController.audioOnPCSelector setEnabled:!self.settingsExpandedInStreamView];
     settingsViewController.audioOnPcStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController.codecSelector setEnabled:!self.settingsExpandedInStreamView];
     settingsViewController.codecStack.hidden = self.settingsExpandedInStreamView;
     settingsViewController.yuv444Stack.hidden = self.settingsExpandedInStreamView;
     settingsViewController.HdrStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController.framePacingSelector setEnabled:!self.settingsExpandedInStreamView];
     settingsViewController.framepacingStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController.btMouseSelector setEnabled:!self.settingsExpandedInStreamView];
     settingsViewController.citrixX1MouseStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController.externalDisplayModeSelector setEnabled:!self.settingsExpandedInStreamView];
     settingsViewController.externalDisplayModeStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController.backToStreamingButton setEnabled:self.settingsExpandedInStreamView]; // will be deprecated soon
     // [settingsViewController.unlockDisplayOrientationSelector setEnabled:!self.settingsExpandedInStreamView && [self isFullScreenRequired]];//need "requires fullscreen" enabled in the app bunddle to make runtime orientation limitation woring
 }
 
diff --git a/Limelight/ViewControllers/SettingsViewController.h b/Limelight/ViewControllers/SettingsViewController.h
index 30e8f3bc..3ade300f 100644
--- a/Limelight/ViewControllers/SettingsViewController.h
+++ b/Limelight/ViewControllers/SettingsViewController.h
@@ -89,7 +89,6 @@
 @property (strong, nonatomic) IBOutlet UISlider *mousePointerVelocityFactorSlider;
 @property (strong, nonatomic) IBOutlet UILabel *mousePointerVelocityFactorUILabel;
 @property (strong, nonatomic) IBOutlet UISegmentedControl *unlockDisplayOrientationSelector;
-@property (strong, nonatomic) IBOutlet UIButton *backToStreamingButton;
 @property (strong, nonatomic) LayoutOnScreenControlsViewController *layoutOnScreenControlsVC;
 @property (nonatomic, strong) MainFrameViewController *mainFrameViewController;
 
diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m
index 5b116bb6..cab3c322 100644
--- a/Limelight/ViewControllers/SettingsViewController.m
+++ b/Limelight/ViewControllers/SettingsViewController.m
@@ -467,12 +467,10 @@ BOOL isCustomResolution(CGSize res) {
     [self addSetting:self.resolutionStack ofId:@"resolutionStack" withInfoTag:YES withDynamicLabel:YES to:videoSection];
     [self addSetting:self.fpsStack ofId:@"fpsStack" withInfoTag:NO withDynamicLabel:NO to:videoSection];
     [self addSetting:self.bitrateStack ofId:@"bitrateStack" withInfoTag:YES withDynamicLabel:YES to:videoSection];
-    //[self addDynamicLabelForStack:self.bitrateStack];
-    
-    [self addSetting:self.codecStack ofId:@"codecStack" withInfoTag:NO withDynamicLabel:NO to:videoSection];
-    [self addSetting:self.HdrStack ofId:@"HdrStack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
-    [self addSetting:self.yuv444Stack ofId:@"yuv444Stack" withInfoTag:NO withDynamicLabel:NO to:videoSection];
     [self addSetting:self.framepacingStack ofId:@"framepacingStack" withInfoTag:NO withDynamicLabel:NO to:videoSection];
+    [self addSetting:self.codecStack ofId:@"codecStack" withInfoTag:NO withDynamicLabel:NO to:videoSection];
+    [self addSetting:self.HdrStack ofId:@"HdrStack" withInfoTag:NO withDynamicLabel:NO to:videoSection];
+    [self addSetting:self.yuv444Stack ofId:@"yuv444Stack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
     [videoSection addToParentStack:parentStack];
     [videoSection setExpanded:YES];