add layouts
merge master