One way of the layout construction was added.
The Layout class was reimplemented as a map.