Bug fixes, game play and layout tweaks