Move layout stuff where it belongs.