diff --git a/Widgets/ControlCenter/ControlCenterPopup.qml b/Widgets/ControlCenter/ControlCenterPopup.qml
index cb2105a7..59e59307 100644
--- a/Widgets/ControlCenter/ControlCenterPopup.qml
+++ b/Widgets/ControlCenter/ControlCenterPopup.qml
@@ -633,7 +633,11 @@ PanelWindow {
                 BluetoothTab {
                     anchors.fill: parent
                     anchors.margins: Theme.spacingM
+<<<<<<< HEAD
+                    visible: root.bluetoothAvailable && controlCenterPopup.currentTab === 2
+=======
                     visible: controlCenterPopup.currentTab === "bluetooth"
+>>>>>>> 86d4c7a429ff69eb5d4da204f98f045ed4634ad3
                     
                     // Bind properties from root
                     bluetoothEnabled: root.bluetoothEnabled
@@ -644,7 +648,11 @@ PanelWindow {
                 DisplayTab {
                     anchors.fill: parent
                     anchors.margins: Theme.spacingM
+<<<<<<< HEAD
+                    visible: controlCenterPopup.currentTab === (root.bluetoothAvailable ? 3 : 2)
+=======
                     visible: controlCenterPopup.currentTab === "display"
+>>>>>>> 86d4c7a429ff69eb5d4da204f98f045ed4634ad3
                     
                 }
             }
diff --git a/Widgets/ControlCenter/DisplayTab.qml b/Widgets/ControlCenter/DisplayTab.qml
index d2589cae..71b3f252 100644
--- a/Widgets/ControlCenter/DisplayTab.qml
+++ b/Widgets/ControlCenter/DisplayTab.qml
@@ -162,68 +162,6 @@ ScrollView {
                     }
                 }
             }
-            
-            // Top Bar Transparency Control
-            Column {
-                width: parent.width
-                spacing: Theme.spacingM
-                anchors.margins: Theme.spacingM
-                
-                Text {
-                    text: "Top Bar Transparency"
-                    font.pixelSize: Theme.fontSizeMedium
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                }
-                
-                CustomSlider {
-                    width: parent.width - (Theme.spacingM * 2)
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    value: Math.round(Prefs.topBarTransparency * 100)
-                    minimum: 0
-                    maximum: 100
-                    leftIcon: "opacity"
-                    rightIcon: "circle"
-                    unit: "%"
-                    showValue: true
-                    
-                    onSliderValueChanged: (newValue) => {
-                        let transparencyValue = newValue / 100.0
-                        // Update live preview
-                    }
-                    
-                    onSliderDragFinished: (finalValue) => {
-                        let transparencyValue = finalValue / 100.0
-                        Prefs.setTopBarTransparency(transparencyValue)
-                    }
-                }
-                
-                Text {
-                    text: "Adjust the transparency of the top bar background"
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceVariantText
-                    wrapMode: Text.WordWrap
-                    width: parent.width - (Theme.spacingM * 2)
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-            }
-
-            // Theme Picker
-            Column {
-                width: parent.width
-                spacing: Theme.spacingS
-                
-                Text {
-                    text: "Theme Color"
-                    font.pixelSize: Theme.fontSizeMedium
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                }
-                
-                ThemePicker {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-            }
         }
     }
     
diff --git a/Widgets/SettingsPopup.qml b/Widgets/SettingsPopup.qml
index af60ba8e..235c2799 100644
--- a/Widgets/SettingsPopup.qml
+++ b/Widgets/SettingsPopup.qml
@@ -98,7 +98,7 @@ PanelWindow {
                 }
                 
                 Item { 
-                    width: parent.width - 200 // Spacer to push close button to the right
+                    width: parent.width - 175 // Spacer to push close button to the right
                     height: 1
                 }