diff --git a/src/SaveTool/SaveTool_MainManager.cpp b/src/SaveTool/SaveTool_MainManager.cpp
index 2882741..b715f48 100644
--- a/src/SaveTool/SaveTool_MainManager.cpp
+++ b/src/SaveTool/SaveTool_MainManager.cpp
@@ -404,6 +404,7 @@ void SaveTool::drawMaterialRow(Containers::StringView name, Int tier, Getter get
                 (var) = getter();
                 ImGui::OpenPopup("int_edit");
             }
+            drawTooltip("Edit");
             if(drawIntEditPopup(&(var), 9999)) {
                 if(!setter(var)) {
                     _queue.addToast(Toast::Type::Error, _currentProfile->lastError());
@@ -532,17 +533,19 @@ void SaveTool::drawMassManager() {
                         _currentMass = &_massManager->hangar(i);
                         _uiState = UiState::MassViewer;
                     }
-                    ImGui::SameLine(0.0f, 2.0f);
+                    drawTooltip("Open in M.A.S.S. editor");
                 }
                 else{
                     ImGui::PushStyleVar(ImGuiStyleVar_Alpha, 0.0f);
                     ImGui::SmallButton(ICON_FA_SEARCH);
                     ImGui::PopStyleVar();
                 }
+                ImGui::SameLine(0.0f, 2.0f);
                 if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_TRASH_ALT)) {
                     mass_to_delete = i;
                     ImGui::OpenPopup(mass_deletion_popup_ID);
                 }
+                drawTooltip("Delete");
                 ImGui::PopID();
             }
         }
@@ -594,6 +597,7 @@ void SaveTool::drawMassManager() {
                 staged_mass_to_delete = pair.first;
                 ImGui::OpenPopup(staged_mass_deletion_popup_ID);
             }
+            drawTooltip("Delete");
             ImGui::PopID();
         }
 
diff --git a/src/SaveTool/SaveTool_MassViewer_Armour.cpp b/src/SaveTool/SaveTool_MassViewer_Armour.cpp
index 9ff5dc3..74616b5 100644
--- a/src/SaveTool/SaveTool_MassViewer_Armour.cpp
+++ b/src/SaveTool/SaveTool_MassViewer_Armour.cpp
@@ -30,7 +30,7 @@ void SaveTool::drawArmour() {
         _currentMass->getArmourParts();
     }
 
-    if(!ImGui::BeginChild("##ArmourParts")) {
+    if(!ImGui::BeginChild("##ArmourParts", {0.0f, 0.0f}, true)) {
         ImGui::EndChild();
         return;
     }
diff --git a/src/SaveTool/SaveTool_ProfileManager.cpp b/src/SaveTool/SaveTool_ProfileManager.cpp
index 2ce1f0d..b52555a 100644
--- a/src/SaveTool/SaveTool_ProfileManager.cpp
+++ b/src/SaveTool/SaveTool_ProfileManager.cpp
@@ -101,11 +101,13 @@ void SaveTool::drawProfileManager() {
                     profile_index = i;
                     ImGui::OpenPopup(backup_popup_id);
                 }
+                drawTooltip("Backup");
                 ImGui::SameLine(0.0f, 2.0f);
                 if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_TRASH_ALT)) {
                     profile_index = i;
                     ImGui::OpenPopup(delete_popup_id);
                 }
+                drawTooltip("Delete");
                 ImGui::PopID();
             }
             ImGui::EndTable();
@@ -283,11 +285,13 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
                 backup_index = i;
                 ImGui::OpenPopup(restore_backup_popup_id);
             }
+            drawTooltip("Restore");
             ImGui::SameLine(0.0f, 2.0f);
             if(ImGui::SmallButton(ICON_FA_TRASH_ALT)) {
                 backup_index = i;
                 ImGui::OpenPopup(delete_backup_popup_id);
             }
+            drawTooltip("Delete");
             ImGui::PopID();
         }
         ImGui::EndTable();
diff --git a/src/SaveTool/SaveTool_drawMainMenu.cpp b/src/SaveTool/SaveTool_drawMainMenu.cpp
index ac0d5f6..3250be4 100644
--- a/src/SaveTool/SaveTool_drawMainMenu.cpp
+++ b/src/SaveTool/SaveTool_drawMainMenu.cpp
@@ -179,7 +179,7 @@ void SaveTool::drawMainMenu() {
 #endif
 
         if(ImGui::BeginMenu("Help")) {
-            if(ImGui::BeginMenu(ICON_FA_BOOK " ImGui user guide")) {
+            if(ImGui::BeginMenu(ICON_FA_KEYBOARD " Keyboard shortcuts")) {
                 ImGui::BulletText("CTRL+Click on a slider or drag box to input value as text.");
                 ImGui::BulletText("TAB/SHIFT+TAB to cycle through keyboard editable fields.");
                 ImGui::BulletText("While inputing text:\n");