diff --git a/cosmic-settings/src/pages/accessibility/mod.rs b/cosmic-settings/src/pages/accessibility/mod.rs
index 51cee65..f8a8e4a 100644
--- a/cosmic-settings/src/pages/accessibility/mod.rs
+++ b/cosmic-settings/src/pages/accessibility/mod.rs
@@ -17,7 +17,6 @@ use slotmap::SlotMap;
 
 pub mod magnifier;
 mod wayland;
-use tokio::task::spawn_blocking;
 pub use wayland::{AccessibilityEvent, AccessibilityRequest};
 
 #[derive(Debug, Default)]
diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs
index e8e1956..f9c24f8 100644
--- a/cosmic-settings/src/pages/desktop/panel/inner.rs
+++ b/cosmic-settings/src/pages/desktop/panel/inner.rs
@@ -94,7 +94,7 @@ pub trait PanelPage {
 
 pub(crate) fn behavior_and_position<
     P: page::Page<crate::pages::Message> + PanelPage,
-    T: Fn(Message) -> crate::pages::Message + Copy + 'static,
+    T: Fn(Message) -> crate::pages::Message + Copy + Send + Sync + 'static,
 >(
     p: &P,
     msg_map: T,
@@ -128,11 +128,7 @@ pub(crate) fn behavior_and_position<
                         Message::PanelAnchor,
                         cosmic::iced::window::Id::RESERVED,
                         Message::Surface,
-                        |a| {
-                            crate::app::Message::PageMessage(crate::pages::Message::Panel(
-                                super::Message(a),
-                            ))
-                        },
+                        move |a| crate::app::Message::PageMessage(msg_map(a)),
                     ),
                 ))
                 .add(settings::item(
@@ -147,11 +143,7 @@ pub(crate) fn behavior_and_position<
                         Message::Output,
                         cosmic::iced::window::Id::RESERVED,
                         Message::Surface,
-                        |a| {
-                            crate::app::Message::PageMessage(crate::pages::Message::Panel(
-                                super::Message(a),
-                            ))
-                        },
+                        move |a| crate::app::Message::PageMessage(msg_map(a)),
                     ),
                 ))
                 .apply(Element::from)
@@ -161,7 +153,7 @@ pub(crate) fn behavior_and_position<
 
 pub(crate) fn style<
     P: page::Page<crate::pages::Message> + PanelPage,
-    T: Fn(Message) -> crate::pages::Message + Copy + 'static,
+    T: Fn(Message) -> crate::pages::Message + Copy + Send + Sync + 'static,
 >(
     p: &P,
     msg_map: T,
@@ -206,11 +198,7 @@ pub(crate) fn style<
                         Message::Appearance,
                         cosmic::iced::window::Id::RESERVED,
                         Message::Surface,
-                        |a| {
-                            crate::app::Message::PageMessage(crate::pages::Message::Panel(
-                                super::Message(a),
-                            ))
-                        },
+                        move |a| crate::app::Message::PageMessage(msg_map(a)),
                     ),
                 ))
                 .add(settings::flex_item(
@@ -592,7 +580,7 @@ impl PageInner {
                 return Task::none();
             }
             Message::ResetPanel | Message::FullReset => {}
-            Message::Surface(a) => {
+            Message::Surface(_) => {
                 unimplemented!()
             }
         }
diff --git a/cosmic-settings/src/pages/desktop/window_management.rs b/cosmic-settings/src/pages/desktop/window_management.rs
index 2089d3e..9083113 100644
--- a/cosmic-settings/src/pages/desktop/window_management.rs
+++ b/cosmic-settings/src/pages/desktop/window_management.rs
@@ -5,7 +5,7 @@ use cosmic::{
     iced::Length,
     surface,
     widget::{self, settings, toggler},
-    Apply, Element, Task,
+    Apply, Element,
 };
 
 use cosmic_config::{ConfigGet, ConfigSet};
diff --git a/cosmic-settings/src/pages/sound.rs b/cosmic-settings/src/pages/sound.rs
index 83f92d6..a3dbcd4 100644
--- a/cosmic-settings/src/pages/sound.rs
+++ b/cosmic-settings/src/pages/sound.rs
@@ -615,7 +615,7 @@ fn input() -> Section<crate::pages::Message> {
                     widget::slider(0..=150, page.source_volume, Message::SourceVolumeChanged)
                         .breakpoints(&[100]),
                 );
-            let mut devices = widget::dropdown::popup_dropdown(
+            let devices = widget::dropdown::popup_dropdown(
                 &page.sources,
                 Some(page.active_source.unwrap_or(0)),
                 Message::SourceChanged,
@@ -633,7 +633,7 @@ fn input() -> Section<crate::pages::Message> {
                 .add(settings::item(&*section.descriptions[device], devices));
 
             if !page.source_profiles.is_empty() {
-                let mut dropdown = widget::dropdown::popup_dropdown(
+                let dropdown = widget::dropdown::popup_dropdown(
                     &page.source_profiles,
                     page.active_source_profile,
                     Message::SourceProfileChanged,