Fix and improve menus

This changes the game lifecycle a bit.