diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index 44e35056..9313d8f0 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -1130,14 +1130,19 @@ static NSMutableSet* hostList;
     [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.audioOnPcStack];
     
     //settingsViewController.codecStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.codecStack];
+    //[settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.codecStack];
+    [settingsViewController.codecSelector setEnabled:!_settingsExpandedInStreamView];
 
     
-    //settingsViewController.yuv444Stack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.yuv444Stack];
+    // settingsViewController.yuv444Stack.hidden = self.settingsExpandedInStreamView;
+    // [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.yuv444Stack];
+    [settingsViewController.yuv444Switch setEnabled:!_settingsExpandedInStreamView];
+
 
     //settingsViewController.HdrStack.hidden = self.settingsExpandedInStreamView;
-    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.HdrStack];
+    // [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.HdrStack];
+    [settingsViewController.hdrSwitch setEnabled:!_settingsExpandedInStreamView];
+
 
     //settingsViewController.framepacingStack.hidden = self.settingsExpandedInStreamView;
     [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.framepacingStack];
diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m
index b9e0abcc..d9a3e83c 100644
--- a/Limelight/ViewControllers/SettingsViewController.m
+++ b/Limelight/ViewControllers/SettingsViewController.m
@@ -931,10 +931,14 @@ BOOL isCustomResolution(CGSize res) {
     
 
 - (void)addSettingToFavorite:(UIStackView* )settingStack{
+    
+    if([_favoriteSettingStackIdentifiers containsObject:settingStack.accessibilityIdentifier]) return;
+    
     [_favoriteSettingStackIdentifiers addObject:settingStack.accessibilityIdentifier];
     for(NSString *identifier in _favoriteSettingStackIdentifiers){
         NSLog(@"favorite setting: %@", identifier);
     }
+    
     [self saveFavoriteSettingStackIdentifiers];
 }