Rework some of the main menu options.