diff --git a/src/app.rs b/src/app.rs
index 43b9965..5b4bf5e 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -49,7 +49,7 @@ pub fn send_song_op(op: SongOperation) {
 
 pub enum GlobalEvent {
     OpenDialog(Box<dyn FnOnce() -> Box<dyn Dialog> + Send>),
-    PageEvent(PageEvent),
+    Page(PageEvent),
     Header(HeaderEvent),
     /// also closes all dialogs
     GoToPage(PagesEnum),
@@ -60,21 +60,17 @@ pub enum GlobalEvent {
 
 impl Debug for GlobalEvent {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let mut debug = f.debug_struct("GlobalEvent");
         match self {
-            GlobalEvent::OpenDialog(_) => write!(f, "GlobalEvent {{ OpenDialog }}"),
-            GlobalEvent::PageEvent(page_event) => {
-                write!(f, "GlobalEvent {{ PageEvent: {page_event:?} }}")
-            }
-            GlobalEvent::Header(header_event) => {
-                write!(f, "GlobalEvent {{ Header: {header_event:?} }}")
-            }
-            GlobalEvent::GoToPage(pages_enum) => {
-                write!(f, "GlobalEvent {{ GoToPage: {pages_enum:?} }}")
-            }
-            GlobalEvent::CloseApp => write!(f, "GlobalEvent {{ CloseApp }}"),
-            GlobalEvent::CloseRequested => write!(f, "GlobalEvent {{ CloseRequested }}"),
-            GlobalEvent::ConstRedraw => write!(f, "GlobalEvent {{ ConstRedraw }}"),
-        }
+            GlobalEvent::OpenDialog(_) => debug.field("OpenDialog", &"closure"),
+            GlobalEvent::Page(page_event) => debug.field("Page", page_event),
+            GlobalEvent::Header(header_event) => debug.field("Header", header_event),
+            GlobalEvent::GoToPage(pages_enum) => debug.field("GoToPage", pages_enum),
+            GlobalEvent::CloseRequested => debug.field("CloseRequested", &""),
+            GlobalEvent::CloseApp => debug.field("CloseApp", &""),
+            GlobalEvent::ConstRedraw => debug.field("ConstRedraw", &""),
+        };
+        debug.finish()
     }
 }
 
@@ -292,7 +288,7 @@ impl ApplicationHandler<GlobalEvent> for App {
                 self.dialog_manager.open_dialog(dialog());
                 _ = self.try_request_redraw();
             }
-            GlobalEvent::PageEvent(c) => {
+            GlobalEvent::Page(c) => {
                 match self.ui_pages.process_page_event(c, &mut self.event_queue) {
                     PageResponse::RequestRedraw => _ = self.try_request_redraw(),
                     PageResponse::None => (),
diff --git a/src/ui/pages/order_list.rs b/src/ui/pages/order_list.rs
index 7c1d88d..5da4f9d 100644
--- a/src/ui/pages/order_list.rs
+++ b/src/ui/pages/order_list.rs
@@ -73,7 +73,7 @@ impl OrderListPage {
                     8,
                     NextWidget::default(),
                     |value| {
-                        GlobalEvent::PageEvent(PageEvent::OrderList(
+                        GlobalEvent::Page(PageEvent::OrderList(
                             OrderListPageEvent::SetVolumeCurrent(value),
                         ))
                     },
@@ -96,9 +96,9 @@ impl OrderListPage {
                     8,
                     NextWidget::default(),
                     |value| {
-                        GlobalEvent::PageEvent(PageEvent::OrderList(
-                            OrderListPageEvent::SetPanCurrent(value),
-                        ))
+                        GlobalEvent::Page(PageEvent::OrderList(OrderListPageEvent::SetPanCurrent(
+                            value,
+                        )))
                     },
                     move |pan| {
                         // surround and disabled not supported yet
diff --git a/src/ui/pages/pattern.rs b/src/ui/pages/pattern.rs
index de12908..1eae795 100644
--- a/src/ui/pages/pattern.rs
+++ b/src/ui/pages/pattern.rs
@@ -185,7 +185,7 @@ impl PatternPage {
                 let pattern = lock.get_song().patterns[idx].clone();
                 drop(lock);
                 proxy
-                    .send_event(GlobalEvent::PageEvent(super::PageEvent::Pattern(
+                    .send_event(GlobalEvent::Page(super::PageEvent::Pattern(
                         PatternPageEvent::Loaded(pattern, idx),
                     )))
                     .unwrap();
@@ -213,7 +213,7 @@ impl PatternPage {
 
     pub fn set_sample(&mut self, sample: u8, events: &mut VecDeque<GlobalEvent>) {
         self.selected_sample_instr = sample;
-        events.push_back(GlobalEvent::PageEvent(super::PageEvent::SampleList(
+        events.push_back(GlobalEvent::Page(super::PageEvent::SampleList(
             super::sample_list::SampleListEvent::SelectSample(sample),
         )));
     }
diff --git a/src/ui/pages/sample_list.rs b/src/ui/pages/sample_list.rs
index 4129ad7..560f9f6 100644
--- a/src/ui/pages/sample_list.rs
+++ b/src/ui/pages/sample_list.rs
@@ -94,7 +94,7 @@ impl SampleList {
     }
 
     fn send_to_pattern(&self, events: &mut VecDeque<GlobalEvent>) {
-        events.push_back(GlobalEvent::PageEvent(PageEvent::Pattern(
+        events.push_back(GlobalEvent::Page(PageEvent::Pattern(
             PatternPageEvent::SetSampleInstr(self.selected),
         )));
     }
@@ -349,7 +349,7 @@ impl Page for SampleList {
                     };
                     // send to UI
                     proxy
-                        .send_event(GlobalEvent::PageEvent(PageEvent::SampleList(
+                        .send_event(GlobalEvent::Page(PageEvent::SampleList(
                             SampleListEvent::SetSample(idx, file_name, meta),
                         )))
                         .unwrap();
diff --git a/src/ui/pages/song_directory_config_page.rs b/src/ui/pages/song_directory_config_page.rs
index d0c2f5e..67fd249 100644
--- a/src/ui/pages/song_directory_config_page.rs
+++ b/src/ui/pages/song_directory_config_page.rs
@@ -217,7 +217,7 @@ impl SongDirectoryConfigPage {
                 tab: Some(WidgetList::INITIAL_SPEED),
                 ..Default::default()
             },
-            |n| GlobalEvent::PageEvent(super::PageEvent::Sdc(SDCChange::InitialTempo(n))),
+            |n| GlobalEvent::Page(super::PageEvent::Sdc(SDCChange::InitialTempo(n))),
             |value| {
                 send_song_op(SongOperation::SetInitialTempo(
                     NonZero::new(u8::try_from(value).unwrap()).unwrap(),
@@ -235,7 +235,7 @@ impl SongDirectoryConfigPage {
                 tab: Some(WidgetList::GLOBAL_VOLUME),
                 ..Default::default()
             },
-            |n| GlobalEvent::PageEvent(super::PageEvent::Sdc(SDCChange::InitialSpeed(n))),
+            |n| GlobalEvent::Page(super::PageEvent::Sdc(SDCChange::InitialSpeed(n))),
             |value| {
                 send_song_op(SongOperation::SetInitialSpeed(
                     NonZero::new(u8::try_from(value).unwrap()).unwrap(),
@@ -253,7 +253,7 @@ impl SongDirectoryConfigPage {
                 tab: Some(WidgetList::MIXING_VOLUME),
                 ..Default::default()
             },
-            |n| GlobalEvent::PageEvent(super::PageEvent::Sdc(SDCChange::GlobalVolume(n))),
+            |n| GlobalEvent::Page(super::PageEvent::Sdc(SDCChange::GlobalVolume(n))),
             |value| send_song_op(SongOperation::SetGlobalVol(u8::try_from(value).unwrap())),
         );
         let mixing_volume = Slider::new(
@@ -267,7 +267,7 @@ impl SongDirectoryConfigPage {
                 tab: Some(WidgetList::SEPERATION),
                 ..Default::default()
             },
-            |n| GlobalEvent::PageEvent(super::PageEvent::Sdc(SDCChange::MixingVolume(n))),
+            |n| GlobalEvent::Page(super::PageEvent::Sdc(SDCChange::MixingVolume(n))),
             |value| println!("mixing volume set to: {}", value),
         );
         let seperation = Slider::new(
@@ -281,7 +281,7 @@ impl SongDirectoryConfigPage {
                 tab: Some(WidgetList::OLD_EFFECTS),
                 ..Default::default()
             },
-            |n| GlobalEvent::PageEvent(super::PageEvent::Sdc(SDCChange::Seperation(n))),
+            |n| GlobalEvent::Page(super::PageEvent::Sdc(SDCChange::Seperation(n))),
             |value| println!("seperation set to: {}", value),
         );