More fixes to Main menu and Play Again buttons