Pushed changes to some main menu elements to their "new" position in the GUI code to save mess.