update layout
merge legacy content