Further layout work.