add more layout refinements