More sensible layout.