Separate layouts.

Now the layouts are independent.

/CC @mdo