Fix #51 Game layout improvements