diff --git a/src/app/top_bar.rs b/src/app/top_bar.rs
index 4cc7f5f5..47269b70 100644
--- a/src/app/top_bar.rs
+++ b/src/app/top_bar.rs
@@ -80,12 +80,6 @@ impl TopBar {
             ui.separator();
 
             ui.add_enabled_ui(update_state.filesystem.project_loaded(), |ui| {
-                if ui.button("Project Config").clicked() {
-                    update_state
-                        .edit_windows
-                        .add_window(luminol_ui::windows::config_window::Window {});
-                }
-
                 if ui.button("Close Project").clicked() {
                     update_state
                         .edit_windows
@@ -102,14 +96,6 @@ impl TopBar {
 
             ui.separator();
 
-            ui.add_enabled_ui(update_state.filesystem.project_loaded(), |ui| {
-                if ui.button("Command Maker").clicked() {
-                    // update_state.windows.add_window(
-                    //     luminol_ui::windows::command_gen::CommandGeneratorWindow::default(),
-                    // );
-                }
-            });
-
             #[cfg(not(target_arch = "wasm32"))]
             {
                 ui.separator();
@@ -123,7 +109,18 @@ impl TopBar {
         ui.separator();
 
         ui.menu_button("Edit", |ui| {
-            //
+            ui.add_enabled_ui(update_state.filesystem.project_loaded(), |ui| {
+                if ui.button("Project Config").clicked() {
+                    update_state
+                        .edit_windows
+                        .add_window(luminol_ui::windows::config_window::Window {});
+                }
+                if ui.button("Event Commands").clicked() {
+                    // update_state.windows.add_window(
+                    //     luminol_ui::windows::command_gen::CommandGeneratorWindow::default(),
+                    // );
+                }
+            });
             if ui.button("Preferences").clicked() {
                 update_state
                     .edit_windows
@@ -179,6 +176,9 @@ impl TopBar {
             };
         });
 
+        #[cfg(debug_assertions)]
+        ui.separator();
+        #[cfg(debug_assertions)]
         ui.menu_button("Debug", |ui| {
             if ui.button("Egui Inspection").clicked() {
                 update_state
@@ -192,12 +192,9 @@ impl TopBar {
                     .add_window(luminol_ui::windows::misc::EguiMemory::default());
             }
 
-            #[cfg(debug_assertions)]
-            {
-                let mut debug_on_hover = ui.ctx().debug_on_hover();
-                ui.toggle_value(&mut debug_on_hover, "Debug on hover");
-                ui.ctx().set_debug_on_hover(debug_on_hover);
-            }
+            let mut debug_on_hover = ui.ctx().debug_on_hover();
+            ui.toggle_value(&mut debug_on_hover, "Debug on hover");
+            ui.ctx().set_debug_on_hover(debug_on_hover);
 
             ui.separator();