Fix #51 Game layout improvements

:ice_cream: