Updated handling for main menu buttons