Improved main menu