Layout revise