diff --git a/source/storage/nx_sd.c b/source/storage/nx_sd.c
index 5529884..8e4eb56 100644
--- a/source/storage/nx_sd.c
+++ b/source/storage/nx_sd.c
@@ -177,6 +177,7 @@ static void _sd_deinit()
 		f_mount(NULL, "", 1);
 		sdmmc_storage_end(&sd_storage);
 		sd_mounted = false;
+		is_sd_inited = false;
 	}
 }
 
diff --git a/source/tegraexplorer/mainmenu.c b/source/tegraexplorer/mainmenu.c
index c7ab7e2..1198126 100644
--- a/source/tegraexplorer/mainmenu.c
+++ b/source/tegraexplorer/mainmenu.c
@@ -13,19 +13,42 @@
 #include "../storage/gptmenu.h"
 #include "../storage/emummc.h"
 #include <utils/util.h>
+#include "../fs/fsutils.h"
+
+enum {
+    MainExplore = 0,
+    MainBrowseSd,
+    MainMountSd,
+    MainBrowseEmmc,
+    MainBrowseEmummc,
+    MainTools,
+    MainCauseException,
+    MainPartitionSd,
+    MainDumpFw,
+    MainViewKeys,
+    MainExit,
+    MainRebootAMS,
+    MainRebootHekate,
+    MainRebootRCM,
+    MainPowerOff
+};
 
 MenuEntry_t mainMenuEntries[] = {
-    {.R = 255, .G = 255, .B = 255, .skip = 1, .name = "-- Main Menu --"},
-    {.G = 255, .name = "SD:/"},
-    {.optionUnion = COLORTORGB(COLOR_YELLOW), .name = "Emmc"},
-    {.optionUnion = COLORTORGB(COLOR_YELLOW), .name = "Emummc"},
-    {.R = 255, .name = "Cause an exception"},
-    {.R = 255, .name = "Partition the sd"},
-    {.optionUnion = COLORTORGB(COLOR_BLUE), .name = "Dump Firmware"},
-    {.optionUnion = COLORTORGB(COLOR_ORANGE), .name = "View dumped keys"},
-    {.optionUnion = COLORTORGB(COLOR_ORANGE)},
-    {.R = 255, .name = "Reboot to payload"},
-    {.R = 255, .name = "Reboot to RCM"}
+    [MainExplore] = {.optionUnion = COLORTORGB(COLOR_WHITE) | SKIPBIT, .name = "-- Explore --"},
+    [MainBrowseSd] = {.optionUnion = COLORTORGB(COLOR_GREEN), .name = "Browse SD"},
+    [MainMountSd] = {.optionUnion = COLORTORGB(COLOR_YELLOW)}, // To mount/unmount the SD
+    [MainBrowseEmmc] = {.optionUnion = COLORTORGB(COLOR_BLUE), .name = "Browse EMMC"},
+    [MainBrowseEmummc] = {.optionUnion = COLORTORGB(COLOR_BLUE), .name = "Browse EMUMMC"},
+    [MainTools] = {.optionUnion = COLORTORGB(COLOR_WHITE) | SKIPBIT, .name = "\n-- Tools --"},
+    [MainCauseException] = {.optionUnion = COLORTORGB(COLOR_RED), .name = "Cause an exception"},
+    [MainPartitionSd] = {.optionUnion = COLORTORGB(COLOR_ORANGE), .name = "Partition the sd"},
+    [MainDumpFw] = {.optionUnion = COLORTORGB(COLOR_BLUE), .name = "Dump Firmware"},
+    [MainViewKeys] = {.optionUnion = COLORTORGB(COLOR_YELLOW), .name = "View dumped keys"},
+    [MainExit] = {.optionUnion = COLORTORGB(COLOR_WHITE) | SKIPBIT, .name = "\n-- Exit --"},
+    [MainRebootAMS] = {.optionUnion = COLORTORGB(COLOR_VIOLET), .name = "Reboot to atmosphere/reboot_payload.bin"},
+    [MainRebootHekate] = {.optionUnion = COLORTORGB(COLOR_VIOLET), .name = "Reboot to bootloader/update.bin"},
+    [MainRebootRCM] = {.optionUnion = COLORTORGB(COLOR_VIOLET), .name = "Reboot to RCM"},
+    [MainPowerOff] = {.optionUnion = COLORTORGB(COLOR_VIOLET), .name = "Power off"}
 };
 
 void HandleSD(){
@@ -72,23 +95,33 @@ void ViewKeys(){
 
 extern bool sd_mounted;
 extern bool is_sd_inited;
+extern int launch_payload(char *path);
+
+void RebootToAMS(){
+    launch_payload("sd:/atmosphere/reboot_payload.bin");
+}
+
+void RebootToHekate(){
+    launch_payload("sd:/bootloader/update.bin");
+}
 
 void MountOrUnmountSD(){
     (sd_mounted) ? sd_unmount() : sd_mount();
 }
 
 menuPaths mainMenuPaths[] = {
-    NULL,
-    HandleSD,
-    HandleEMMC,
-    HandleEMUMMC,
-    CrashTE,
-    FormatSD,
-    DumpSysFw,
-    ViewKeys,
-    MountOrUnmountSD,
-    RebootToPayload,
-    reboot_rcm
+    [MainBrowseSd] = HandleSD,
+    [MainMountSd] = MountOrUnmountSD,
+    [MainBrowseEmmc] = HandleEMMC,
+    [MainBrowseEmummc] = HandleEMUMMC,
+    [MainCauseException] = CrashTE,
+    [MainPartitionSd] = FormatSD,
+    [MainDumpFw] = DumpSysFw,
+    [MainViewKeys] = ViewKeys,
+    [MainRebootAMS] = RebootToAMS,
+    [MainRebootHekate] = RebootToHekate,
+    [MainRebootRCM] = reboot_rcm,
+    [MainPowerOff] = power_off,
 };
 
 void EnterMainMenu(){
@@ -96,12 +129,21 @@ void EnterMainMenu(){
         if (sd_get_card_removed())
             sd_unmount();
 
-        mainMenuEntries[1].hide = !sd_mounted;
-        mainMenuEntries[2].hide = !TConf.keysDumped;
-        mainMenuEntries[3].hide = (!TConf.keysDumped || !emu_cfg.enabled || !sd_mounted);
-        mainMenuEntries[5].hide = (!is_sd_inited || sd_get_card_removed());
-        mainMenuEntries[6].hide = !TConf.keysDumped;
-        mainMenuEntries[8].name = (sd_mounted) ? "Unmount SD" : "Mount SD";
+        // -- Explore --
+        mainMenuEntries[MainBrowseSd].hide = !sd_mounted;
+        mainMenuEntries[MainMountSd].name = (sd_mounted) ? "Unmount SD" : "Mount SD";
+        mainMenuEntries[MainBrowseEmmc].hide = !TConf.keysDumped;
+        mainMenuEntries[MainBrowseEmummc].hide = (!TConf.keysDumped || !emu_cfg.enabled || !sd_mounted);
+
+        // -- Tools --
+        mainMenuEntries[MainPartitionSd].hide = (!is_sd_inited || sd_get_card_removed());
+        mainMenuEntries[MainDumpFw].hide = (!TConf.keysDumped || !sd_mounted);
+        mainMenuEntries[MainViewKeys].hide = !TConf.keysDumped;
+
+        // -- Exit --
+        mainMenuEntries[MainRebootAMS].hide = (!sd_mounted || !FileExists("sd:/atmosphere/reboot_payload.bin"));
+        mainMenuEntries[MainRebootHekate].hide = (!sd_mounted || !FileExists("sd:/bootloader/update.bin"));
+
         FunctionMenuHandler(mainMenuEntries, ARR_LEN(mainMenuEntries), mainMenuPaths, ALWAYSREDRAW);
     }
 }
diff --git a/source/tegraexplorer/tools.c b/source/tegraexplorer/tools.c
index 50270e9..761749d 100644
--- a/source/tegraexplorer/tools.c
+++ b/source/tegraexplorer/tools.c
@@ -19,12 +19,6 @@
 #include "../fs/fscopy.h"
 #include "../utils/utils.h"
 
-extern int launch_payload(char *path);
-
-void RebootToPayload(){
-    launch_payload("atmosphere/reboot_payload.bin");
-}
-
 void DumpSysFw(){
 	char sysPath[25 + 36 + 3 + 1]; // 24 for "bis:/Contents/registered", 36 for ncaName.nca, 3 for /00, and 1 to make sure :)
 	char *baseSdPath;
diff --git a/source/tegraexplorer/tools.h b/source/tegraexplorer/tools.h
index 252d2ff..ae09b61 100644
--- a/source/tegraexplorer/tools.h
+++ b/source/tegraexplorer/tools.h
@@ -1,5 +1,4 @@
 #pragma once
 
-void RebootToPayload();
 void DumpSysFw();
 void FormatSD();
\ No newline at end of file