Fixes to the main menu