Did some tidying up of the Main Menu Controller
Some more ever so slight cleanup of the Pkmn UI and menu controllers