Add a menu to main game screen, fix bugs in screen transitions and other issues