More sensible layout