some layout refinement