Update layout play screen
Merge branch 'origin/master'