Updating how main menu is handled