[improvement] layout improve