update layout structure

update layout structure