Fixed logic in GUI, also initialize the game in the right spot
Merged with Sarah's code