modify setting layout --yxc
modify the sub setting layout --yxc
Merge branch 'yxc-master'