revise layout
fixed merge conflict