Perfect the layout