Further refinement of layout