[In progress: 4] Main menu fix