further layout refinement