Further layout and design work.