improve nation and player
Push
Fix conflict layout