added v1.01
change some layouts
merge
change some layouts