diff --git a/boot_diags/src/app.rs b/boot_diags/src/app.rs
index 1ac444d..7e2cbea 100644
--- a/boot_diags/src/app.rs
+++ b/boot_diags/src/app.rs
@@ -687,7 +687,7 @@ fn get_chunks(r: Rect) -> Vec<Rect> {
 fn build_footer_string(cur_mode: Mode) -> String {
     match cur_mode {
         Mode::BootDiags => String::from("(r) to refresh / (q) to quit"),
-        Mode::BootScan | Mode::BootSetup | Mode::Home | Mode::PEMenu | Mode::ScanDisks => {
+        Mode::BootScan | Mode::BootSetup | Mode::Home | Mode::ScanDisks => {
             String::from("(q) to quit")
         }
         Mode::InstallDrivers | Mode::InjectDrivers | Mode::SetBootMode => {
@@ -702,7 +702,12 @@ fn build_footer_string(cur_mode: Mode) -> String {
         ),
         Mode::Failed => String::from("(Enter) or (q) to quit"),
         // Invalid states
-        Mode::Confirm | Mode::Clone | Mode::PreClone | Mode::PostClone | Mode::SelectTableType => {
+        Mode::Confirm
+        | Mode::Clone
+        | Mode::PEMenu
+        | Mode::PreClone
+        | Mode::PostClone
+        | Mode::SelectTableType => {
             panic!("This shouldn't happen?")
         }
     }
diff --git a/include/menu_entries/01_deja-vu.toml b/include/menu_entries/10_deja-vu.toml
similarity index 100%
rename from include/menu_entries/01_deja-vu.toml
rename to include/menu_entries/10_deja-vu.toml
diff --git a/include/menu_entries/11_boot-diags.toml b/include/menu_entries/11_boot-diags.toml
new file mode 100644
index 0000000..1f30f6f
--- /dev/null
+++ b/include/menu_entries/11_boot-diags.toml
@@ -0,0 +1,5 @@
+name = 'Boot-Diagnostics'
+command = 'X:\tools\boot-diags.exe'
+description = "Boot issue assessment tool"
+use_conemu = true
+separator = false
diff --git a/include/menu_entries/02_separator.toml b/include/menu_entries/20_separator.toml
similarity index 100%
rename from include/menu_entries/02_separator.toml
rename to include/menu_entries/20_separator.toml
diff --git a/include/menu_entries/03_ntpwedit.toml b/include/menu_entries/30_ntpwedit.toml
similarity index 100%
rename from include/menu_entries/03_ntpwedit.toml
rename to include/menu_entries/30_ntpwedit.toml
diff --git a/include/menu_entries/04_clone-tool.toml b/include/menu_entries/31_clone-tool.toml
similarity index 100%
rename from include/menu_entries/04_clone-tool.toml
rename to include/menu_entries/31_clone-tool.toml
diff --git a/include/menu_entries/05_taskmgr.toml b/include/menu_entries/32_taskmgr.toml
similarity index 100%
rename from include/menu_entries/05_taskmgr.toml
rename to include/menu_entries/32_taskmgr.toml
diff --git a/pe_menu/src/app.rs b/pe_menu/src/app.rs
index c8d4389..0e5345c 100644
--- a/pe_menu/src/app.rs
+++ b/pe_menu/src/app.rs
@@ -237,8 +237,9 @@ impl App {
                 Action::Render => self.render(tui)?,
                 Action::SetMode(mode) => {
                     self.mode = mode;
-                    self.action_tx
-                        .send(Action::UpdateFooter(String::from("(Enter) to select")))?;
+                    self.action_tx.send(Action::UpdateFooter(String::from(
+                        "(Enter) to select / (t) for terminal / (p) to power off / (r) to restart",
+                    )))?;
                     self.action_tx.send(build_left_items(self))?;
                     self.action_tx.send(build_right_items(self))?;
                     self.action_tx.send(Action::Select(None, None))?;
@@ -376,8 +377,9 @@ pub fn build_command(app: &App, tool: &Tool) -> TaskType {
     let start_index: usize;
     if tool.use_conemu {
         cmd_path = app.config.conemu_path.clone();
-        cmd_args.push(String::from("-new_console:n"));
+        cmd_args.push(String::from("-run"));
         cmd_args.push(tool.command.clone());
+        cmd_args.push(String::from("-new_console:n"));
         start_index = 1;
     } else {
         cmd_path = PathBuf::from(tool.command.clone());