MainMenu and small fixes