Fixed game layout somewhat
Merge branch 'jon'