Combine AE setting menu with TPS tables/curve

firmware/tunerstudio/tunerstudio.template.ini

@@ -1770,8 +1770,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 }
@@ -3913,8 +3911,8 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 		field = "Post-Cranking factor",				postCrankingFactor, {postCrankingFuelUseTable == 0}
 		field = "Duration",							postCrankingDurationSec, {postCrankingFuelUseTable == 0}
 
-	dialog = postCrankingEnrichment, "After start enrichment", yAxis
-		panel = postCrankingEnrichmentText
+	dialog = postCrankingEnrichment, "After start enrichment", border
+		panel = postCrankingEnrichmentText, North
 		panel = postCrankingEnrichmentTable, 0, {postCrankingFuelUseTable}
 
 	dialog = primingFuelPulsePanel, "Priming fuel pulse"
@@ -3952,10 +3950,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,	"Accel/Decel Enrichment", 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