Add some layout stuff.
Some progress made...