update layouts
merge master