Switch to two placeholders. Rationalise layout.