Little Layout refinements.