add layouts
fix merge