Add more layouts

We were lacking a 2-element layout, and a 3-element layout.