updated layout
merge