improved layout, added game logic