Added GameScreen and setup buttons
GameScreen buttons
merged