Menu upgrades to support Sim speed UI

Reconfigured much of the code to make it easier to add in the sim-speed
UI.