Save and load game (in server)
Refactored Do Layout in Server
Added some tests