Minor layout refinement