More layout refinements