diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini
index 2b5855227e..07959064f7 100644
--- a/firmware/tunerstudio/tunerstudio.template.ini
+++ b/firmware/tunerstudio/tunerstudio.template.ini
@@ -2046,7 +2046,7 @@ menuDialog = main
 
 	menu = "&Advanced"
 		subMenu = smLaunchControl,			@@smLaunchControl_NAME@@
-		subMenu = FlatShiftSettingsDialog,	"Shift Torque Reduction (Flat Shift)"
+		subMenu = ShiftTorqueReductionSettingsDialog,	"Shift Torque Reduction (Flat Shift)"
 		subMenu = ignitionCylExtra,			"Cylinder offsets", 0@@if_ts_show_odd_fire
 
 		subMenu = std_separator
@@ -4982,23 +4982,32 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Final Ignition Cut % Before launch",   finalIgnitionCutPercentBeforeLaunch,    {launchSparkCutEnable == 1}
 		field = "Fuel Cut",								launchFuelCutEnable,  {launchControlEnabled == 1}
 
-	dialog = TorqueReductionSettings, "Torque Reduction"
-		field = "Enable",			torqueReductionEnabled
-		field = "Activation Mode",	torqueReductionActivationMode,				{torqueReductionEnabled == 1}
-		field = "Button"			torqueReductionTriggerPin,			{torqueReductionEnabled == 1 && torqueReductionActivationMode == @@torqueReductionActivationMode_e_TORQUE_REDUCTION_BUTTON@@}
-		field = "Button inverted",	torqueReductionTriggerPinInverted,	{torqueReductionEnabled == 1 && torqueReductionActivationMode == @@torqueReductionActivationMode_e_TORQUE_REDUCTION_BUTTON@@ && torqueReductionTriggerPin != 0}
-		field = "Button mode",		torqueReductionTriggerPinMode,		{torqueReductionEnabled == 1 && torqueReductionActivationMode == @@torqueReductionActivationMode_e_TORQUE_REDUCTION_BUTTON@@ && torqueReductionTriggerPin != 0}
-		field = "Time",				torqueReductionTime,				{torqueReductionEnabled == 1}
-		field = "Arming RPM",		torqueReductionArmingRpm,			{torqueReductionEnabled == 1}
-		field = "Arming APP",		torqueReductionArmingApp,			{torqueReductionEnabled == 1}
-		field = "Ignition Retard",	torqueReductionIgnitionRetard,		{torqueReductionEnabled == 1}
-		field = "Ignition Cut",		torqueReductionIgnitionCut,			{torqueReductionEnabled == 1}
+	dialog = TorqueReductionButtonDialog, "Torque Reduction Button"
+		field = "Torque Reduction Button",		torqueReductionTriggerPin
+		field = "Torque Reduction Inverted",	torqueReductionTriggerPinInverted,	{torqueReductionTriggerPin != 0}
+		field = "Torque Reduction Mode",		torqueReductionTriggerPinMode,		{torqueReductionTriggerPin != 0}
 
-	dialog = FlatShiftSettingsDialog, "", border
-		panel = TorqueReductionSettings, West
-		field = "Launch Button",			 launchActivatePin,		{torqueReductionEnabled == 1 && torqueReductionActivationMode == @@torqueReductionActivationMode_e_LAUNCH_BUTTON@@}
-		field = "Launch Button inverted",	launchActivateInverted,	{torqueReductionEnabled == 1 && torqueReductionActivationMode == @@torqueReductionActivationMode_e_LAUNCH_BUTTON@@ && launchActivatePin != 0}
-		field = "Launch Button mode",		launchActivatePinMode,	{torqueReductionEnabled == 1 && torqueReductionActivationMode == @@torqueReductionActivationMode_e_LAUNCH_BUTTON@@ && launchActivatePin != 0}
+	dialog = LaunchButtonDialog, "Launch Button"
+		field = "Launch Button",			launchActivatePin
+		field = "Launch Button Inverted",	launchActivateInverted,	{launchActivatePin != 0}
+		field = "Launch Button Mode",		launchActivatePinMode,	{launchActivatePin != 0}
+
+	dialog = TorqueReductionActivationModeDialog, "Activation", yAxis
+		field = "Activation Mode",	torqueReductionActivationMode
+		panel = TorqueReductionButtonDialog,	{torqueReductionActivationMode == @@torqueReductionActivationMode_e_TORQUE_REDUCTION_BUTTON@@}
+		panel = LaunchButtonDialog,				{torqueReductionActivationMode == @@torqueReductionActivationMode_e_LAUNCH_BUTTON@@}
+
+	dialog = TorqueReductionSettings, "Settings"
+		field = "Torque Reduction Time",			torqueReductionTime
+		field = "Torque Reduction Arming RPM",		torqueReductionArmingRpm
+		field = "Torque Reduction Arming APP",		torqueReductionArmingApp
+		field = "Torque Reduction Ignition Retard",	torqueReductionIgnitionRetard
+		field = "Torque Reduction Ignition Cut",	torqueReductionIgnitionCut
+
+	dialog = ShiftTorqueReductionSettingsDialog, "", yAxis
+		field = "Enable Shift Torque Reduction",	torqueReductionEnabled
+		panel = TorqueReductionActivationModeDialog,	{torqueReductionEnabled == 1}
+		panel = TorqueReductionSettings,				{torqueReductionEnabled == 1 && ((torqueReductionActivationMode == @@torqueReductionActivationMode_e_TORQUE_REDUCTION_BUTTON@@ && torqueReductionTriggerPin != 0) || (torqueReductionActivationMode == @@torqueReductionActivationMode_e_LAUNCH_BUTTON@@ && launchActivatePin != 0))}
 
 	dialog = smLaunchControl, "", border
 		panel = smLaunchControlWest, West