diff --git a/src/core/CV_MIDI.cpp b/src/core/CV_MIDI.cpp
index 0329ebd0..55a37e32 100644
--- a/src/core/CV_MIDI.cpp
+++ b/src/core/CV_MIDI.cpp
@@ -184,7 +184,7 @@ struct CV_MIDIWidget : ModuleWidget {
 
 		menu->addChild(new MenuSeparator);
 
-		menu->addChild(createMenuItem("Panic", "",
+		menu->addChild(createMenuItem("Reset MIDI (Panic)", "",
 			[=]() {module->midiOutput.panic();}
 		));
 	}
diff --git a/src/core/Gate_MIDI.cpp b/src/core/Gate_MIDI.cpp
index 4c0c045c..80496a24 100644
--- a/src/core/Gate_MIDI.cpp
+++ b/src/core/Gate_MIDI.cpp
@@ -216,9 +216,9 @@ struct Gate_MIDIWidget : ModuleWidget {
 
 		menu->addChild(new MenuSeparator);
 
-		menu->addChild(createBoolPtrMenuItem("Velocity mode", "", &module->velocityMode));
+		menu->addChild(createBoolPtrMenuItem("Velocity from gate amplitude", "", &module->velocityMode));
 
-		menu->addChild(createMenuItem("Panic", "",
+		menu->addChild(createMenuItem("Reset MIDI (Panic)", "",
 			[=]() {module->midiOutput.panic();}
 		));
 	}
diff --git a/src/core/MIDI_CV.cpp b/src/core/MIDI_CV.cpp
index 8cc2ebdb..37c208b3 100644
--- a/src/core/MIDI_CV.cpp
+++ b/src/core/MIDI_CV.cpp
@@ -177,9 +177,7 @@ struct MIDI_CVWidget : ModuleWidget {
 			module->midiParser.setMonoMode(decltype(module->midiParser)::MonoMode(monoMode));
 		}));
 
-		menu->addChild(createBoolPtrMenuItem("Retrigger on release", "", &module->midiParser.retriggerOnResume));
-
-		menu->addChild(createIndexSubmenuItem("Polyphony mode", {
+		menu->addChild(createIndexSubmenuItem("Polyphony allocation", {
 			"Rotate",
 			"Reuse",
 			"Reset",
@@ -190,6 +188,8 @@ struct MIDI_CVWidget : ModuleWidget {
 			module->midiParser.setPolyMode(decltype(module->midiParser)::PolyMode(polyMode));
 		}));
 
+		menu->addChild(createBoolPtrMenuItem("Retrigger on legato release", "", &module->midiParser.retriggerOnResume));
+
 		menu->addChild(new MenuSeparator);
 
 		menu->addChild(createBoolPtrMenuItem("Use release velocity", "", &module->midiParser.releaseVelocityEnabled));
@@ -229,7 +229,7 @@ struct MIDI_CVWidget : ModuleWidget {
 
 		menu->addChild(new MenuSeparator);
 
-		menu->addChild(createMenuItem("Panic", "",
+		menu->addChild(createMenuItem("Reset MIDI (Panic)", "",
 			[=]() {module->midiParser.panic();}
 		));
 
diff --git a/src/core/MIDI_Gate.cpp b/src/core/MIDI_Gate.cpp
index d4bf1a0e..8e353fd6 100644
--- a/src/core/MIDI_Gate.cpp
+++ b/src/core/MIDI_Gate.cpp
@@ -272,7 +272,12 @@ struct MIDI_GateWidget : ModuleWidget {
 
 		menu->addChild(new MenuSeparator);
 
-		menu->addChild(createIndexPtrSubmenuItem("Gate amplitude", {
+		menu->addChild(createIndexPtrSubmenuItem("Output type", {
+			"Gates",
+			"Triggers",
+		}, &module->trigMode));
+
+		menu->addChild(createIndexPtrSubmenuItem("Output amplitude", {
 			"10V",
 			"Velocity",
 			"Aftertouch",
@@ -280,11 +285,9 @@ struct MIDI_GateWidget : ModuleWidget {
 
 		menu->addChild(createBoolPtrMenuItem("MPE mode", "", &module->mpeMode));
 
-		menu->addChild(createBoolPtrMenuItem("Trigger mode", "", &module->trigMode));
-
 		menu->addChild(new MenuSeparator);
 
-		menu->addChild(createMenuItem("Panic", "", [=]() {
+		menu->addChild(createMenuItem("Reset MIDI (Panic)", "", [=]() {
 			module->panic();
 		}));
 	}