diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml
index 55a63f4..7219391 100644
--- a/Widgets/NComboBox.qml
+++ b/Widgets/NComboBox.qml
@@ -22,7 +22,6 @@ ColumnLayout {
   Layout.fillWidth: true
 
   ColumnLayout {
-    id: mainColumn
     spacing: Style.marginTiniest * scaling
     Layout.fillWidth: true
 
@@ -38,7 +37,6 @@ ColumnLayout {
       font.pointSize: Style.fontSizeSmall * scaling
       color: Colors.textSecondary
       wrapMode: Text.WordWrap
-      Layout.fillWidth: true
     }
   }
 
diff --git a/Widgets/NPanel.qml b/Widgets/NPanel.qml
index 97b3eb0..58353b1 100644
--- a/Widgets/NPanel.qml
+++ b/Widgets/NPanel.qml
@@ -19,7 +19,7 @@ PanelWindow {
   }
 
   function show() {
-    // Ensure only one panel is visible at a time using Settings as ephemeral store
+    // Ensure only one panel is visible at a time using PanelManager as ephemeral storage
     try {
       if (PanelManager.openedPanel && PanelManager.openedPanel !== root && PanelManager.openedPanel.hide) {
         PanelManager.openedPanel.hide()
diff --git a/Widgets/NToggle.qml b/Widgets/NToggle.qml
index 9073f7c..28c766c 100644
--- a/Widgets/NToggle.qml
+++ b/Widgets/NToggle.qml
@@ -14,6 +14,8 @@ RowLayout {
   property int baseSize: Style.baseWidgetSize
 
   signal toggled(bool balue)
+  signal entered
+  signal exited
 
   Layout.fillWidth: true
 
@@ -69,8 +71,14 @@ RowLayout {
       anchors.fill: parent
       cursorShape: Qt.PointingHandCursor
       hoverEnabled: true
-      onEntered: hovering = true
-      onExited: hovering = false
+      onEntered: {
+        hovering = true
+        root.entered()
+      }
+      onExited: {
+        hovering = false
+        root.exited()
+      }
       onClicked: {
         value = !value
         root.toggled(value)
diff --git a/Widgets/NTooltip.qml b/Widgets/NTooltip.qml
index 9ced0b8..361b2ce 100644
--- a/Widgets/NTooltip.qml
+++ b/Widgets/NTooltip.qml
@@ -101,15 +101,15 @@ Window {
     anchors.fill: parent
     radius: Style.radiusMedium * scaling
     gradient: Gradient {
-          GradientStop {
-            position: 0.0
-            color: Colors.backgroundTertiary
-          }
-          GradientStop {
-            position: 1.0
-            color: Colors.backgroundSecondary
-          }
-        }
+      GradientStop {
+        position: 0.0
+        color: Colors.backgroundTertiary
+      }
+      GradientStop {
+        position: 1.0
+        color: Colors.backgroundSecondary
+      }
+    }
     border.color: Colors.outline
     border.width: Math.max(1, Style.borderThin * scaling)
     z: 1