Layout changes, used session cookies for game
Merging