MainMenu improvments