added checking to new game
updated some views
Merge remote-tracking branch 'origin/master'