Game logic working. UI tweaks left