More layout refinement.