Increase Game Menu Limits (Laps, Opponents)

[KcRobin9]

The picture below shows the current game menu limits.
10 for Laps and Blitz Waypoints, and 8 for Opponents.

Increasing the opponent list and the opponent count in the .AIMAP_(P) file, as well as increasing values of relevant variables in the MM_DATA.CSV file does not solve the problem.

I have looked into various Menu functions, but was unable to locate the origin of the limit.