Revise layout structure