diff --git a/src/AudioOutput.qml b/src/AudioOutput.qml
index c63b2f9..230f02e 100644
--- a/src/AudioOutput.qml
+++ b/src/AudioOutput.qml
@@ -10,8 +10,6 @@ import "windows"
 // - adjust sink & source volume
 // - mute sinks & sources
 
-// BUG: When controlling audio from outside of QS, the change is reflected, but if audio in pavucontrol is not 100%
-// QS can only change from 0 to whatever is set in pavucontrol
 Rectangle {
     id: aoutput
     width: parent.width
@@ -65,6 +63,7 @@ Rectangle {
                 anchors.horizontalCenter: parent.horizontalCenter
                 fillMode: Image.PreserveAspectFit
             }
+
             Slider {
                 id: slider
                 anchors.top: icon.bottom
@@ -72,9 +71,8 @@ Rectangle {
                 height: background.height
                 width: parent.width * 0.75
                 enabled: false
-                value: sink.audio.volume
+                value: sink?.audio.volume ?? 0
                 stepSize: 0.01
-                wheelEnabled: true
 
                 contentItem: Rectangle {
                     color: "#3191CD" // Change color based on value
@@ -92,7 +90,6 @@ Rectangle {
                 }
 
                 handle: Rectangle {}
-                onMoved: sink.audio.volume = value
             }
         }
     }
diff --git a/src/windows/AudioEntry.qml b/src/windows/AudioEntry.qml
index ef1f1d2..164ad6e 100644
--- a/src/windows/AudioEntry.qml
+++ b/src/windows/AudioEntry.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 import Quickshell.Services.Pipewire
+import Quickshell
 
 RowLayout {
     required property PwNode node
@@ -33,11 +34,14 @@ RowLayout {
             spacing: 6
             Layout.preferredHeight: 30
 
-            Text {
+            Label {
+                id: name
                 text: {
                     const app = node.isStream ? `[${node.properties["application.name"]}] ` : "";
                     return app + (node.properties["media.name"] ?? node.description);
                 }
+                // Cede space to other elements -> don't have stupidly long names detroying the layout
+                Layout.maximumWidth: 0
             }
 
             Item {
@@ -61,6 +65,7 @@ RowLayout {
             }
 
             Button {
+                // TODO: setting a default sink is not implemented yet in QS
                 visible: node.isSink
                 text: "default"
             }
diff --git a/src/windows/AudioManager.qml b/src/windows/AudioManager.qml
index 4948da3..14630ad 100644
--- a/src/windows/AudioManager.qml
+++ b/src/windows/AudioManager.qml
@@ -26,16 +26,17 @@ PopupWindow {
             contentWidth: availableWidth
 
             ColumnLayout {
+                // BUG: We access nodes before they are initialized
                 anchors.fill: parent
                 anchors.margins: 10
 
-                PwNodeLinkTracker {
-                    id: linkTracker
-                    node: Pipewire.defaultAudioSink
-                }
+                Repeater {
+                    model: Pipewire.nodes.values.filter(e => e.isSink)
 
-                AudioEntry {
-                    node: Pipewire.defaultAudioSink
+                    AudioEntry {
+                        required property PwNode modelData
+                        node: modelData
+                    }
                 }
 
                 Rectangle {
@@ -46,12 +47,11 @@ PopupWindow {
                 }
 
                 Repeater {
-                    // Show all sources, regardless of what sink they are assigned to
-                    model: Pipewire.linkGroups
+                    model: Pipewire.nodes.values.filter(e => e.isStream)
 
                     AudioEntry {
-                        required property PwLinkGroup modelData
-                        node: modelData.source
+                        required property PwNode modelData
+                        node: modelData
                     }
                 }
             }