Working with the layout

This gets us closer to what we want