diff --git a/src/app/mod.rs b/src/app/mod.rs
index e40a29c..b81edcf 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -6737,14 +6737,6 @@ fn view(state: &AppState) -> Element<'_, AppMessage> {
         };
         let music_panel: Element<'_, AppMessage> = {
             let music_status = status_snapshot(&state.music_status);
-            let music_playing = music_status.playing_id.is_some();
-            let play_label = if music_playing && music_status.paused {
-                "▶"
-            } else if music_playing {
-                "⏸"
-            } else {
-                "▶"
-            };
             let personal_selected = state.music_tab == MusicTab::Personal;
             let public_selected = state.music_tab == MusicTab::Public;
             let tab_row = row![
@@ -6863,22 +6855,6 @@ fn view(state: &AppState) -> Element<'_, AppMessage> {
                         .map(format_clip_time)
                         .unwrap_or_else(|| "--:--".to_string());
                     column![
-                        row![
-                            button(text("|◀").size(13))
-                                .on_press(AppMessage::MusicPrev)
-                                .style(b_style(color_surface, color_blue, color_text, 6.0))
-                                .padding(7),
-                            button(text(play_label).size(13))
-                                .on_press(AppMessage::MusicPlayPause)
-                                .style(b_style(color_blue, color_lavender, color_crust, 6.0))
-                                .padding(7),
-                            button(text("▶|").size(13))
-                                .on_press(AppMessage::MusicNext)
-                                .style(b_style(color_surface, color_blue, color_text, 6.0))
-                                .padding(7),
-                        ]
-                        .spacing(8)
-                        .align_y(iced::alignment::Vertical::Center),
                         slider(
                             0.0..=1.0,
                             clip_progress(music_status.position, music_status.total),
@@ -6909,10 +6885,11 @@ fn view(state: &AppState) -> Element<'_, AppMessage> {
                             .text_size(12)
                             .on_toggle(AppMessage::MusicToggleBroadcast),
                         scrollable(tracks)
-                            .height(iced::Length::Fixed(160.0))
+                            .height(iced::Length::Fill)
                             .width(iced::Length::Fill),
                     ]
                     .spacing(8)
+                    .height(iced::Length::Fill)
                     .into()
                 }
                 MusicTab::Public => {
@@ -6999,19 +6976,25 @@ fn view(state: &AppState) -> Element<'_, AppMessage> {
                         listen_block,
                         text("Broadcasting now").size(12).color(color_blue),
                         scrollable(broadcast_rows)
-                            .height(iced::Length::Fixed(160.0))
+                            .height(iced::Length::Fill)
                             .width(iced::Length::Fill),
                     ]
                     .spacing(8)
+                    .height(iced::Length::Fill)
                     .into()
                 }
             };
 
-            container(column![tab_row, content,].spacing(10))
-                .style(c_style(color_mantle, color_surface, 6.0))
-                .padding(10)
-                .width(iced::Length::Fill)
-                .into()
+            container(
+                column![tab_row, content,]
+                    .spacing(10)
+                    .height(iced::Length::Fill),
+            )
+            .style(c_style(color_mantle, color_surface, 6.0))
+            .padding(10)
+            .width(iced::Length::Fill)
+            .height(iced::Length::Fill)
+            .into()
         };
         let music_bar_status = status_snapshot(&state.music_status);
         let music_bar_playing = music_bar_status.playing_id.is_some();
@@ -7604,9 +7587,7 @@ fn view(state: &AppState) -> Element<'_, AppMessage> {
             column![
                 text("Playlist").size(18).color(color_blue),
                 vertical_space(8.0),
-                scrollable(music_panel)
-                    .width(iced::Length::Fill)
-                    .height(iced::Length::Fill),
+                music_panel,
             ]
             .spacing(0),
         )