layout in-game change
Merge remote-tracking branch 'origin/master'
in-game layout change