Lay out changes + game logic update