Layout refinements.
Layout refinements round 2.