Fixed bugs in Menu

Change-Id: 606c065191fb69af85302f60aa8815b149bcef51
Merge branch 'master' of https://github.com/SmallWorldEGaDSGameJam/MainGame