added some layouts
added some layouts
fix merge