New layout refinements