Game view part 2

@IanMayo Please check this out and merge