Bring the working main menu into the main branch.