Layout

Moved some layout stuff to Container.
Put arrangement information in its own class.