fixed layout, improved game