refine layout [#84689140]