More work on the main menu