Little more sensible layout