diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini
index d7743e41dc..e6e48f3d34 100644
--- a/firmware/tunerstudio/tunerstudio.template.ini
+++ b/firmware/tunerstudio/tunerstudio.template.ini
@@ -1231,7 +1231,7 @@ curve = 32Curve, "3-2 Shift Solenoid Percent by Speed"
 		yBins	= hpfpCompensationLoadBins, running_fuel
 		zBins	= hpfpCompensation
 
-	table = postCrankingEnrichmentTable, postCrankingEnrichmentTableId, "", 1
+	table = postCrankingEnrichmentTable, postCrankingEnrichmentTableId, "Enrichment Multiplier Table", 1
 		xBins = postCrankingEnrichRuntimeBins, running_timeSinceCrankingInSecs
 		yBins = postCrankingEnrichTempBins, coolant
 		zBins = postCrankingEnrichTable
@@ -1764,7 +1764,6 @@ menuDialog = main
 		subMenu = iatFuelCorrCurve,			"IAT multiplier", 0, {isInjectionEnabled}
 		subMenu = fuelClosedLoopDialog,	"Closed loop fuel correction", 0, {isInjectionEnabled}
 		subMenu = coastingFuelCutControl,	"Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled}
-		subMenu = dfcoMapRpmCorrection,	"DFCO MAP to RPM threshold", 0, {isInjectionEnabled && useTableForDfcoMap }
 		subMenu = std_separator
 
 		# Injector model
@@ -1773,8 +1772,6 @@ menuDialog = main
 
 		# Accel enrichment
 		subMenu = AccelEnrich,				"Acceleration enrichment", 0, {isInjectionEnabled}
-		subMenu = tpsTpsAccelTbl,			"TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled}
-		subMenu = tpsTspRpmCorrection,      "TPS/TPS AE RPM correction", 0, {isInjectionEnabled}
 
 		groupMenu = "Wall wetting AE"
 		groupChildMenu = wwTauCurves, "Evap time", 0, { complexWallModel != 0 }
@@ -1822,8 +1819,6 @@ menuDialog = main
 	menu = "&Cranking"
 		subMenu = crankingDialog,			"Cranking settings"
 		subMenu = postCrankingEnrichment,	"After-start enrichment"
-		subMenu = postCrankingEnrichmentTable, "After-start enrichment table", 0, {postCrankingFuelUseTable}
-		subMenu = primingFuelPulsePanel,	"Priming pulse"
 		subMenu = std_separator
 
 		subMenu = crankingCltCurve,			"Fuel CLT multiplier"
@@ -3905,11 +3900,15 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 		field = "Fixed cranking advance",	crankingTimingAngle, {useSeparateAdvanceForCranking == 0}
 		field = "Fixed Cranking Dwell",						ignitionDwellForCrankingMs
 
-	dialog = postCrankingEnrichment, "After start enrichment"
+	dialog = postCrankingEnrichmentText, ""
 		field = "After start enrichment mode",		postCrankingFuelUseTable
 		field = "Post-Cranking factor",				postCrankingFactor, {postCrankingFuelUseTable == 0}
 		field = "Duration",							postCrankingDurationSec, {postCrankingFuelUseTable == 0}
 
+	dialog = postCrankingEnrichment, "After start enrichment", border
+		panel = postCrankingEnrichmentText, North
+		panel = postCrankingEnrichmentTable, 0, {postCrankingFuelUseTable}
+
 	dialog = primingFuelPulsePanel, "Priming fuel pulse"
 		field = "Priming delay",	primingDelay
 		panel = primingPulse
@@ -3921,13 +3920,17 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 		field = "Use Flex Fuel cranking table",			flexCranking, { flexSensorPin != @@ADC_CHANNEL_NONE@@ }
 
 ;			Cranking->Cranking Settings
-	dialog = crankingDialog, "Cranking Settings"
+	dialog = crankingDialogLeft, "Cranking Settings"
 		field = "Cranking RPM limit",						cranking_rpm
 		panel = crankingFuel
 		panel = crankingIgnition
 		panel = crankingIAC
 		panel = crankingAdv
 
+	dialog = crankingDialog, "", xAxis
+		panel = crankingDialogLeft
+		panel = primingFuelPulsePanel
+
 	dialog = TpsAccelPanel, "TPS"
 		field = "Set 'Debug Mode' to see detailed 'TPS acceleration enrichment' diagnostics"
 			field = "Length",						tpsAccelLookback
@@ -3945,10 +3948,18 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 
 
 ;			Tuning->AccelEnrichment
-	dialog = AccelEnrich,	"Accel/Decel Enrichment"
+	dialog = AccelEnrichText ""
 		panel = TpsAccelPanel
 		panel = WallWettingAccelPanel
 
+	dialog = TpsTpsAeTables,	"TPS Acceleration Enrichment"
+		panel = tpsTpsAccelTbl
+		panel = tpsTspRpmCorrection
+
+	dialog = AccelEnrich,	"", border
+		panel = AccelEnrichText, West
+		panel = TpsTpsAeTables, Center
+
 	dialog = wwTauCurves, "Wall wetting AE evaporation time"
 		field = "#Set a base evaporation time based on coolant temperature, and a multiplier based on MAP."
 		panel = wwTauCltCurve
@@ -4478,7 +4489,7 @@ dialog = tcuControls, "Transmission Settings"
 		panel = IgnRetardTableALS
 
 
-	dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings"
+	dialog = coastingFuelCutControlText, ""
 		field = "Enable Coasting Fuel Cutoff",			coastingFuelCutEnabled
 		field = ""
 		field = "Disable fuel cut on clutch",			disableFuelCutOnClutch, {coastingFuelCutEnabled && clutchUpPin != @@ADC_CHANNEL_NONE@@}
@@ -4488,10 +4499,14 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Vehicle speed cut above",		coastingFuelCutVssHigh, {coastingFuelCutEnabled}
 		field = "Vehicle speed restore below",	coastingFuelCutVssLow, {coastingFuelCutEnabled}
 		field = "Cut fuel below TPS",			coastingFuelCutTps, {coastingFuelCutEnabled}
-		field = "Cut fuel below MAP mode",		useTableForDfcoMap, {coastingFuelCutEnabled}
-		field = "Cut fuel below MAP",		coastingFuelCutMap, {coastingFuelCutEnabled  && !useTableForDfcoMap}
 		field = "Fuel cut delay", dfcoDelay, {coastingFuelCutEnabled}
 		field = "Inhibit closed loop fuel after cut", noFuelTrimAfterDfcoTime, {coastingFuelCutEnabled}
+		field = "Cut fuel below MAP mode",		useTableForDfcoMap, {coastingFuelCutEnabled}
+		field = "Cut fuel below MAP",		coastingFuelCutMap, {coastingFuelCutEnabled  && !useTableForDfcoMap}
+
+	dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings", xAxis
+		panel = coastingFuelCutControlText
+		panel = dfcoMapRpmCorrection, {coastingFuelCutEnabled  && useTableForDfcoMap}
 
 	dialog = rotaryDialog, "Rotary"
 		field = "Enable Trailing Sparks", enableTrailingSparks