Main menu fixes